summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* merging=Corey Hulen2016-01-2522-338/+1085
|\
| * Merge pull request #1977 from hmhealey/plt1685Corey Hulen2016-01-251-3/+8
| |\
| | * Fixed info displayed for files with 0 size or with no extensionhmhealey2016-01-251-3/+8
| * | 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 #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 #1968 from ZBoxApp/PLT-7-templatesCorey Hulen2016-01-241-2/+2
| |\ \ \ \
| | * | | | PLT-7: Refactoring api to use translations (chunk 4)Elias Nahum2016-01-241-2/+2
| | | |/ / | | |/| |
| * | | | 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
| | |/ / /
| * / / / PLT-7 client side infra for loc=Corey Hulen2016-01-248-76/+473
| |/ / /
| * | | Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-226-231/+513
| |\ \ \
| | * | | Change default system console page to statisticsJoramWilander2016-01-221-1/+1
| | * | | Added unit test and fixed errorsJoramWilander2016-01-222-3/+3
| | * | | Add create_at back to profile fields to fix analyticsJoramWilander2016-01-222-1/+5
| | * | | Add system analytics pageJoramWilander2016-01-215-81/+266
| | * | | Generalize analytics server functions and begin componentizing client analyti...JoramWilander2016-01-213-229/+322
* | | | | merging=Corey Hulen2016-01-221694-147/+1541284
|\| | | |
| * | | | Merge pull request #1959 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-222-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Updating favicon stuffAsaad Mahmood2016-01-222-2/+2
| * | | | PLT-7 adding loc header=Corey Hulen2016-01-221-1/+10
| |/ / /
| * | | Merge pull request #1955 from mattermost/PLT-7-client-user-locCorey Hulen2016-01-221398-0/+1536138
| |\ \ \
| | * | | PLT-7 fixing issues with safari=Corey Hulen2016-01-221394-0/+1535972
| | * | | PLT-7 adding loc feature to preview=Corey Hulen2016-01-221-1/+0
| | * | | 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
| * | | | PLT-7 fixing unit test for chunk 2 server=Corey Hulen2016-01-222-2/+2
| * | | | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-222-3/+5
| |\ \ \ \
| | * | | | Added download param to getFile api callhmhealey2016-01-212-3/+5
| * | | | | PLT-7 fixing dist build=Corey Hulen2016-01-213-2/+4
| * | | | | PLT-7 client side infra=Corey Hulen2016-01-211-6/+3
| * | | | | PLT-7 client side infra=Corey Hulen2016-01-214-23/+36
| * | | | | Merge branch 'master' into PLT-7-client-infra=Corey Hulen2016-01-211-0/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #1940 from ZBoxApp/PLT-7-goCorey Hulen2016-01-211-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Refactoring api to use translations (chunk 1)Elias Nahum2016-01-211-0/+1
| * | | | | PLT-7 Adding react-intl libs=Corey Hulen2016-01-21246-10/+4906
| |/ / / /
| * | | | Merge pull request #1937 from hmhealey/plt1695Corey Hulen2016-01-211-1/+5
| |\ \ \ \
| | * | | | Completely disabled broken pasting of images on IE11hmhealey2016-01-201-1/+5
| | |/ / /
| * | | | Merge pull request #1935 from hmhealey/plt1664Corey Hulen2016-01-211-1/+1
| |\ \ \ \
| | * | | | Changed UnreadChannelIndicator display style so that it uses a value that IE1...hmhealey2016-01-201-1/+1
| | |/ / /
| * | | | Merge pull request #1933 from hmhealey/plt1661Corey Hulen2016-01-213-42/+32
| |\ \ \ \
| | * | | | Added a small margin where the PostsView will be considered to be at the bott...hmhealey2016-01-201-1/+4