summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
* | | | 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
| * | | Update team_general_tab.jsxEric Sethna2016-01-201-1/+1
* | | | Merge pull request #1954 from mattermost/PLT-7-c2-fixCorey Hulen2016-01-223-10/+8
|\ \ \ \
| * | | | PLT-7 fixing unit test for chunk 2 server=Corey Hulen2016-01-223-10/+8
|/ / / /
* | | | Merge pull request #1952 from ZBoxApp/PLT-7-goCorey Hulen2016-01-2214-649/+2538
|\ \ \ \
| * | | | PLT-7: Change post CreatePost back to model.NewAppErrorElias Nahum2016-01-221-3/+7
| * | | | Refactoring api to use translations (chunk 2)Elias Nahum2016-01-2214-652/+2537
* | | | | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-223-11/+16
|\ \ \ \ \
| * | | | | Added download param to getFile api callhmhealey2016-01-213-11/+16
* | | | | | Merge pull request #1951 from mattermost/PLT-7-client-infra-fixCorey Hulen2016-01-211-0/+1
|\ \ \ \ \ \
| * | | | | | PLT-7 switching dist to min=Corey Hulen2016-01-211-0/+1
* | | | | | | Merge pull request #1950 from mattermost/PLT-7-client-infra-fixCorey Hulen2016-01-214-2/+6
|\| | | | | |
| * | | | | | PLT-7 fixing dist build=Corey Hulen2016-01-214-2/+6
|/ / / / / /
* | | | | | Merge pull request #1949 from mattermost/PLT-7-client-infraCorey Hulen2016-01-21252-40/+4951
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | PLT-7 client side infra=Corey Hulen2016-01-211-6/+3
| * | | | | PLT-7 client side infra=Corey Hulen2016-01-217-34/+48
| * | | | | Merge branch 'master' into PLT-7-client-infra=Corey Hulen2016-01-2113-147/+922
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | fixing cd errorChristopher Speller2016-01-211-1/+1