summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merging=Corey Hulen2016-01-2591-708/+3640
|\
| * Merge pull request #1977 from hmhealey/plt1685Corey Hulen2016-01-253-8/+32
| |\
| | * Fixed info displayed for files with 0 size or with no extensionhmhealey2016-01-251-3/+8
| | * Fixed serverside errors occurring when getting files with no extensionhmhealey2016-01-252-5/+24
| * | Merge pull request #1972 from mattermost/PLT-1576Christopher Speller2016-01-251-1/+5
| |\ \
| | * | PLT-1576 display iOS device in session history=Corey Hulen2016-01-241-1/+5
| * | | Merge pull request #1936 from rgarmsen2295/plt-1654Christopher Speller2016-01-251-2/+10
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed issue with enter key not working in delete post modalReed Garmsen2016-01-211-2/+10
| * | | Merge pull request #1974 from ZBoxApp/PLT-7-modelsCorey Hulen2016-01-2517-127/+1089
| |\ \ \
| | * | | PLT-7: Refactoring models to use translations (chunk 6)Elias Nahum2016-01-2517-127/+1089
| * | | | Merge pull request #1964 from hmhealey/plt1596Joram Wilander2016-01-252-1/+116
| |\ \ \ \
| | * | | | Changed GetMemberCount to stop including inactive usershmhealey2016-01-232-1/+116
| * | | | | Merge pull request #1963 from hmhealey/plt1670Joram Wilander2016-01-251-0/+6
| |\ \ \ \ \
| | * | | | | Added a limit to the number of suggestions when autocompleting at mentionshmhealey2016-01-231-0/+6
| | |/ / / /
| * | | | | Merge pull request #1961 from rgarmsen2295/plt-1689Joram Wilander2016-01-251-1/+7
| |\ \ \ \ \
| | * | | | | Fixed duplicate email team signup errorReed Garmsen2016-01-221-1/+7
| * | | | | | Merge pull request #1971 from ZBoxApp/PLT-7-utilsCorey Hulen2016-01-249-38/+302
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | PLT-7: Refactoring manuatesting & utils to use translations (chunk 5)Elias Nahum2016-01-259-38/+302
| * | | | | Merge pull request #1968 from ZBoxApp/PLT-7-templatesCorey Hulen2016-01-2433-1547/+2084
| |\| | | |
| | * | | | Revert config.jsonElias Nahum2016-01-241-3/+1
| | * | | | Remove enterprise configsElias Nahum2016-01-241-23/+0
| | * | | | PLT-7: Refactoring api to use translations (chunk 4)Elias Nahum2016-01-2434-1548/+2110
| * | | | | Merge pull request #1970 from mattermost/PLT-7-client-infra3Corey Hulen2016-01-242-22/+61
| |\ \ \ \ \
| | * | | | | PLT-7 client infra for loc=Corey Hulen2016-01-242-22/+61
| * | | | | | Merge pull request #1969 from mattermost/PLT-7-client-infa2Corey Hulen2016-01-248-76/+473
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | PLT-7 client side infra for loc=Corey Hulen2016-01-248-76/+473
| |/ / / / /
| * | | / / Merge pull request #1962 from ZBoxApp/PLT-7-goCorey Hulen2016-01-247-1348/+1504
| |\| | | | | | |_|/ / | |/| | |
| | * | | PLT-7: Refactoring api to use translations (chunk 3)Elias Nahum2016-01-237-1348/+1504
| |/ / /
| * | | Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-2217-268/+686
| |\ \ \
| | * | | Change default system console page to statisticsJoramWilander2016-01-221-1/+1
| | * | | Added unit test and fixed errorsJoramWilander2016-01-224-11/+76
| | * | | Add create_at back to profile fields to fix analyticsJoramWilander2016-01-225-3/+20
| | * | | Add system analytics pageJoramWilander2016-01-215-81/+266
| | * | | Generalize analytics server functions and begin componentizing client analyti...JoramWilander2016-01-219-256/+407
* | | | | Merging=Corey Hulen2016-01-222-3/+4
* | | | | merging=Corey Hulen2016-01-221772-517/+1556760
|\| | | |
| * | | | Merge pull request #1959 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-223-4/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Updating favicon stuffAsaad Mahmood2016-01-223-4/+4
| * | | | Merge pull request #1958 from mattermost/PLT-7-client-cookieCorey Hulen2016-01-222-77/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | PLT-7 adding loc header=Corey Hulen2016-01-221-1/+1
| | * | | PLT-7 adding loc header=Corey Hulen2016-01-221-1/+1
| | * | | PLT-7 adding loc header=Corey Hulen2016-01-222-77/+15
| |/ / /
| * | | Merge pull request #1955 from mattermost/PLT-7-client-user-locCorey Hulen2016-01-221399-1/+1536141
| |\ \ \
| | * | | tweaking=Corey Hulen2016-01-221-1/+1
| | * | | PLT-7 fixing issues with safari=Corey Hulen2016-01-221395-1/+1535975
| | * | | PLT-7 adding loc feature to preview=Corey Hulen2016-01-222-2/+1
| | * | | PLT-7 adding loc feature to preview=Corey Hulen2016-01-222-37/+43
| | * | | PLT-7 adding lang selector=Corey Hulen2016-01-224-0/+161
| * | | | Merge pull request #1929 from esethna/patch-54Joram Wilander2016-01-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update team_general_tab.jsxEric Sethna2016-01-211-1/+1