Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge pull request #1984 from hmhealey/plt1103 | Joram Wilander | 2016-01-27 | 4 | -25/+54 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | PLT-1103 Updated serverside hashtag regex to ignore more punctuation around words | |||||
| | * | | | Updated serverside hashtag regex to ignore more punctuation around words | hmhealey | 2016-01-26 | 4 | -25/+54 | |
| | | | | | ||||||
| * | | | | Merge pull request #1989 from mattermost/plt-1373 | Harrison Healey | 2016-01-26 | 1 | -28/+28 | |
| |\ \ \ \ | | | | | | | | | | | | | PLT-1373 Renamed all functions starting with p in client channel store | |||||
| | * | | | | Renamed all functions starting with p in client channel store | JoramWilander | 2016-01-26 | 1 | -28/+28 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge pull request #1978 from hmhealey/plt1484 | Corey Hulen | 2016-01-26 | 6 | -26/+29 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | PLT-1484 Changed first preference load to be done synchronously | |||||
| | * | | | Moved PreferenceStore initialization into head.html | hmhealey | 2016-01-26 | 3 | -6/+7 | |
| | | | | | ||||||
| | * | | | Changed first preference load to be done synchronously | hmhealey | 2016-01-26 | 5 | -24/+26 | |
| |/ / / | ||||||
| * / / | Tweaking build | Christopher Speller | 2016-01-26 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #1987 from mattermost/PLT-7-fix | Corey Hulen | 2016-01-26 | 1 | -8/+5 | |
| |\ \ | | |/ | |/| | PLT-7 fixing loc on safari | |||||
| | * | PLT-7 fixing loc on safari | =Corey Hulen | 2016-01-26 | 1 | -8/+5 | |
| | | | ||||||
| * | | Merge pull request #1986 from mattermost/PLT-7-fix | Corey Hulen | 2016-01-26 | 1 | -5/+8 | |
| |\| | | | | | | | Fixing safari | |||||
| | * | Fixing safari | =Corey Hulen | 2016-01-26 | 1 | -5/+8 | |
| |/ | ||||||
| * | Merge pull request #1985 from mattermost/PLT-7-client-infra5 | Corey Hulen | 2016-01-25 | 5 | -10/+29 | |
| |\ | | | | | | | PLT-7 fixing error bar msg | |||||
| | * | Cleaning up | =Corey Hulen | 2016-01-25 | 1 | -1/+2 | |
| | | | ||||||
| | * | Cleaning up | =Corey Hulen | 2016-01-25 | 1 | -1/+5 | |
| | | | ||||||
| | * | Cleaning up a little | =Corey Hulen | 2016-01-25 | 1 | -15/+3 | |
| | | | ||||||
| | * | Fixing eslint error | =Corey Hulen | 2016-01-25 | 1 | -1/+0 | |
| | | | ||||||
| | * | PLT-7 fixing error bar msg | =Corey Hulen | 2016-01-25 | 5 | -9/+36 | |
| | | | ||||||
| * | | Merge pull request #1980 from ZBoxApp/PLT-7-web | Corey Hulen | 2016-01-25 | 4 | -78/+638 | |
| |\ \ | | | | | | | | | PLT-7: Refactoring entry point and web to use translations (chunk 8) | |||||
| | * | | PLT-7: Refactoring entry point and web to use translations (chunk 8) | Elias Nahum | 2016-01-25 | 4 | -78/+638 | |
| | | | | | | | | | | | | | | | | - Add spanish translations | |||||
| * | | | Merge pull request #1979 from ZBoxApp/PLT-7-stores | Joram Wilander | 2016-01-25 | 16 | -247/+1931 | |
| |\| | | | |/ | |/| | PLT-7: Refactoring stores to use translations (chunk 7) | |||||
| | * | PLT-7: Refactoring stores to use translations (chunk 7) | Elias Nahum | 2016-01-25 | 16 | -247/+1931 | |
| |/ | | | | | | | - Add spanish translations | |||||
| * | Merge pull request #1976 from mattermost/PLT-7-client-infra4 | Corey Hulen | 2016-01-25 | 2 | -93/+71 | |
| |\ | | | | | | | PLT-7 client side infra | |||||
| | * | PLT-7 client side infra | =Corey Hulen | 2016-01-25 | 2 | -93/+71 | |
| | | | ||||||
* | | | merging | =Corey Hulen | 2016-01-25 | 91 | -708/+3640 | |
|\| | | ||||||
| * | | Merge pull request #1977 from hmhealey/plt1685 | Corey Hulen | 2016-01-25 | 3 | -8/+32 | |
| |\ \ | | | | | | | | | PLT-1685 Fixed handling of files with no extension | |||||
| | * | | Fixed info displayed for files with 0 size or with no extension | hmhealey | 2016-01-25 | 1 | -3/+8 | |
| | | | | ||||||
| | * | | Fixed serverside errors occurring when getting files with no extension | hmhealey | 2016-01-25 | 2 | -5/+24 | |
| | |/ | ||||||
| * | | Merge pull request #1972 from mattermost/PLT-1576 | Christopher Speller | 2016-01-25 | 1 | -1/+5 | |
| |\ \ | | | | | | | | | PLT-1576 display iOS device in session history | |||||
| | * | | PLT-1576 display iOS device in session history | =Corey Hulen | 2016-01-24 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Merge pull request #1936 from rgarmsen2295/plt-1654 | Christopher Speller | 2016-01-25 | 1 | -2/+10 | |
| |\ \ \ | | |_|/ | |/| | | PLT-1654 Fixed issue with enter key not working in delete post modal | |||||
| | * | | Fixed issue with enter key not working in delete post modal | Reed Garmsen | 2016-01-21 | 1 | -2/+10 | |
| | | | | ||||||
| * | | | Merge pull request #1974 from ZBoxApp/PLT-7-models | Corey Hulen | 2016-01-25 | 17 | -127/+1089 | |
| |\ \ \ | | | | | | | | | | | PLT-7: Refactoring models to use translations (chunk 6) | |||||
| | * | | | PLT-7: Refactoring models to use translations (chunk 6) | Elias Nahum | 2016-01-25 | 17 | -127/+1089 | |
| | | | | | | | | | | | | | | | | | | | | - Add spanish translations | |||||
| * | | | | Merge pull request #1964 from hmhealey/plt1596 | Joram Wilander | 2016-01-25 | 2 | -1/+116 | |
| |\ \ \ \ | | | | | | | | | | | | | PLT-1596 Changed GetMemberCount to stop including inactive users | |||||
| | * | | | | Changed GetMemberCount to stop including inactive users | hmhealey | 2016-01-23 | 2 | -1/+116 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1963 from hmhealey/plt1670 | Joram Wilander | 2016-01-25 | 1 | -0/+6 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | PLT-1670 Added a limit to the number of suggestions when autocompleting at mentions | |||||
| | * | | | | | Added a limit to the number of suggestions when autocompleting at mentions | hmhealey | 2016-01-23 | 1 | -0/+6 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #1961 from rgarmsen2295/plt-1689 | Joram Wilander | 2016-01-25 | 1 | -1/+7 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | PLT-1689 Fixed duplicate email team sign-up error | |||||
| | * | | | | | Fixed duplicate email team signup error | Reed Garmsen | 2016-01-22 | 1 | -1/+7 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #1971 from ZBoxApp/PLT-7-utils | Corey Hulen | 2016-01-24 | 9 | -38/+302 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | / | | |_|_|_|/ | |/| | | | | PLT-7: Refactoring manuatesting & utils to use translations (chunk 5) | |||||
| | * | | | | PLT-7: Refactoring manuatesting & utils to use translations (chunk 5) | Elias Nahum | 2016-01-25 | 9 | -38/+302 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add spanish translations - Skip tests | |||||
| * | | | | | Merge pull request #1968 from ZBoxApp/PLT-7-templates | Corey Hulen | 2016-01-24 | 33 | -1547/+2084 | |
| |\| | | | | | | | | | | | | | | | | PLT-7: Refactoring api to use translations (chunk 4) | |||||
| | * | | | | Revert config.json | Elias Nahum | 2016-01-24 | 1 | -3/+1 | |
| | | | | | | ||||||
| | * | | | | Remove enterprise configs | Elias Nahum | 2016-01-24 | 1 | -23/+0 | |
| | | | | | | ||||||
| | * | | | | PLT-7: Refactoring api to use translations (chunk 4) | Elias Nahum | 2016-01-24 | 34 | -1548/+2110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | - Translation for api templates english and spanish | |||||
| * | | | | | Merge pull request #1970 from mattermost/PLT-7-client-infra3 | Corey Hulen | 2016-01-24 | 2 | -22/+61 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | PLT-7 client infra for loc | |||||
| | * | | | | | PLT-7 client infra for loc | =Corey Hulen | 2016-01-24 | 2 | -22/+61 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #1969 from mattermost/PLT-7-client-infa2 | Corey Hulen | 2016-01-24 | 8 | -76/+473 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | PLT-7 client side infra for loc | |||||
| | * | | | | | PLT-7 client side infra for loc | =Corey Hulen | 2016-01-24 | 8 | -76/+473 | |
| |/ / / / / |