summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Only set store preferences if not null in head.htmlJoramWilander2016-01-271-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #1995 from mattermost/PLT-1586bChristopher Speller2016-01-273-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing small issue with displaying activity log=Corey Hulen2016-01-273-2/+7
| |/ / / / / / /
* | | | | | | | Merge pull request #1992 from ZBoxApp/PLT-7-reactCorey Hulen2016-01-2710-105/+651
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update mm-intl referenceElias Nahum2016-01-271-1/+1
| * | | | | | | PLT-7: Refactoring frontend (chunk 1)Elias Nahum2016-01-2610-105/+651
* | | | | | | | Merge pull request #1988 from mattermost/plt-1475Christopher Speller2016-01-273-7/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated search test casesJoramWilander2016-01-271-4/+10
| * | | | | | | | Update search query to ignore system messagesJoramWilander2016-01-263-8/+14
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1990 from hmhealey/plt1722Christopher Speller2016-01-271-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed page to just reload when another tab logs inhmhealey2016-01-261-3/+3
* | | | | | | | | Merge pull request #1993 from mattermost/PLT-1586Christopher Speller2016-01-2716-56/+199
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixing naming=Corey Hulen2016-01-262-2/+2
| * | | | | | | | | Fixing version=Corey Hulen2016-01-261-1/+1
| * | | | | | | | | PLT-1586 Changing session reporting=Corey Hulen2016-01-261-3/+6
| * | | | | | | | | PLT-1586 adding attach device id method=Corey Hulen2016-01-269-11/+145
| * | | | | | | | | 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
* | | | | | 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