summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | PLT-1586 adding LDAP/OAuth to iOS=Corey Hulen2016-01-268-43/+49
| | | |/ / | | |/| |
| * | | | Merge pull request #1984 from hmhealey/plt1103Joram Wilander2016-01-274-25/+54
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Updated serverside hashtag regex to ignore more punctuation around wordshmhealey2016-01-264-25/+54
| * | | | Merge pull request #1989 from mattermost/plt-1373Harrison Healey2016-01-261-28/+28
| |\ \ \ \
| | * | | | Renamed all functions starting with p in client channel storeJoramWilander2016-01-261-28/+28
| | | |/ / | | |/| |
| * | | | Merge pull request #1978 from hmhealey/plt1484Corey Hulen2016-01-266-26/+29
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Moved PreferenceStore initialization into head.htmlhmhealey2016-01-263-6/+7
| | * | | Changed first preference load to be done synchronouslyhmhealey2016-01-265-24/+26
| |/ / /
| * / / Tweaking buildChristopher Speller2016-01-261-1/+1
| |/ /
| * | Merge pull request #1987 from mattermost/PLT-7-fixCorey Hulen2016-01-261-8/+5
| |\ \ | | |/ | |/|
| | * PLT-7 fixing loc on safari=Corey Hulen2016-01-261-8/+5
| * | Merge pull request #1986 from mattermost/PLT-7-fixCorey Hulen2016-01-261-5/+8
| |\|
| | * Fixing safari=Corey Hulen2016-01-261-5/+8
| |/
| * Merge pull request #1985 from mattermost/PLT-7-client-infra5Corey Hulen2016-01-255-10/+29
| |\
| | * Cleaning up=Corey Hulen2016-01-251-1/+2
| | * Cleaning up=Corey Hulen2016-01-251-1/+5
| | * Cleaning up a little=Corey Hulen2016-01-251-15/+3
| | * Fixing eslint error=Corey Hulen2016-01-251-1/+0
| | * PLT-7 fixing error bar msg=Corey Hulen2016-01-255-9/+36
| * | Merge pull request #1980 from ZBoxApp/PLT-7-webCorey Hulen2016-01-254-78/+638
| |\ \
| | * | PLT-7: Refactoring entry point and web to use translations (chunk 8)Elias Nahum2016-01-254-78/+638
| * | | Merge pull request #1979 from ZBoxApp/PLT-7-storesJoram Wilander2016-01-2516-247/+1931
| |\| | | | |/ | |/|
| | * PLT-7: Refactoring stores to use translations (chunk 7)Elias Nahum2016-01-2516-247/+1931
| |/
| * Merge pull request #1976 from mattermost/PLT-7-client-infra4Corey Hulen2016-01-252-93/+71
| |\
| | * PLT-7 client side infra=Corey Hulen2016-01-252-93/+71
* | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |