Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 4 | -4/+263 |
|\ | |||||
| * | Merge pull request #2049 from mattermost/plt-1856 | Christopher Speller | 2016-02-03 | 2 | -1/+58 |
| |\ | | | | | | | PLT-1856 Add basic server audit tab to system console for EE | ||||
| | * | Add basic server audit tab to system console for EE | JoramWilander | 2016-02-02 | 2 | -1/+58 |
| | | | |||||
| * | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 2 | -1/+153 |
| |\ \ | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE | ||||
| | * | | Added extra system-wide statistics for EE | JoramWilander | 2016-02-02 | 2 | -1/+153 |
| | |/ | |||||
| * / | Added ability to sign in via username; separated email sign in and sign up ↵ | Reed Garmsen | 2016-02-02 | 2 | -2/+52 |
| |/ | | | | | | | config settings | ||||
* | | Fixing unit test | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
| | | |||||
* | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 1 | -6/+6 |
| | | |||||
* | | Adding loc to new command backend | =Corey Hulen | 2016-02-01 | 8 | -67/+117 |
| | | |||||
* | | Fixing merge | =Corey Hulen | 2016-02-01 | 21 | -149/+219 |
|\| | |||||
| * | Fixing email unit tests | =Corey Hulen | 2016-02-01 | 13 | -128/+128 |
| | | |||||
| * | Merge pull request #2013 from mattermost/plt-1749 | Christopher Speller | 2016-01-29 | 1 | -0/+1 |
| |\ | | | | | | | PLT-1749 Return channel type in new post websocket events | ||||
| | * | Return channel type in new post websocket events | JoramWilander | 2016-01-28 | 1 | -0/+1 |
| | | | |||||
| * | | Remove expiry from public links | JoramWilander | 2016-01-28 | 1 | -8/+0 |
| |/ | |||||
| * | Fixing build | =Corey Hulen | 2016-01-27 | 1 | -3/+2 |
| | | |||||
| * | PLT-7 Removing AppError ctor | =Corey Hulen | 2016-01-27 | 3 | -4/+6 |
| | | |||||
| * | Merge pull request #1988 from mattermost/plt-1475 | Christopher Speller | 2016-01-27 | 1 | -7/+11 |
| |\ | | | | | | | PLT-1475 Update search query to ignore system messages | ||||
| | * | Updated search test cases | JoramWilander | 2016-01-27 | 1 | -4/+10 |
| | | | |||||
| | * | Update search query to ignore system messages | JoramWilander | 2016-01-26 | 1 | -8/+6 |
| | | | |||||
| * | | Merge pull request #1993 from mattermost/PLT-1586 | Christopher Speller | 2016-01-27 | 2 | -1/+72 |
| |\ \ | | | | | | | | | PLT-1586 adding LDAP/OAuth to iOS | ||||
| | * | | PLT-1586 adding attach device id method | =Corey Hulen | 2016-01-26 | 2 | -1/+72 |
| | |/ | |||||
| * / | Changed first preference load to be done synchronously | hmhealey | 2016-01-26 | 1 | -0/+1 |
| |/ | |||||
| * | PLT-7: Refactoring stores to use translations (chunk 7) | Elias Nahum | 2016-01-25 | 2 | -2/+2 |
| | | | | | | | | - Add spanish translations | ||||
* | | merging | =Corey Hulen | 2016-01-25 | 38 | -166/+298 |
|\| | |||||
| * | PLT-7: Refactoring api to use translations (chunk 4) | Elias Nahum | 2016-01-24 | 30 | -138/+187 |
| | | | | | | | | - Translation for api templates english and spanish | ||||
| * | PLT-7: Refactoring api to use translations (chunk 3) | Elias Nahum | 2016-01-23 | 5 | -20/+24 |
| | | | | | | | | | | - Add spanish translations - Not included tests and templates | ||||
| * | Merge pull request #1956 from mattermost/plt-1779 | Corey Hulen | 2016-01-22 | 3 | -8/+87 |
| |\ | | | | | | | PLT-1779 Add system-wide statistics page | ||||
| | * | Added unit test and fixed errors | JoramWilander | 2016-01-22 | 1 | -7/+63 |
| | | | |||||
| | * | Add create_at back to profile fields to fix analytics | JoramWilander | 2016-01-22 | 1 | -0/+13 |
| | | | |||||
| | * | Generalize analytics server functions and begin componentizing client ↵ | JoramWilander | 2016-01-21 | 1 | -1/+11 |
| | | | | | | | | | | | | analytics controls | ||||
* | | | Merging | =Corey Hulen | 2016-01-22 | 2 | -3/+4 |
| | | | |||||
* | | | merging | =Corey Hulen | 2016-01-22 | 19 | -352/+410 |
|\| | | |||||
| * | | Updating favicon stuff | Asaad Mahmood | 2016-01-22 | 1 | -2/+2 |
| | | | |||||
| * | | PLT-7 fixing unit test for chunk 2 server | =Corey Hulen | 2016-01-22 | 1 | -8/+6 |
| | | | |||||
| * | | Merge pull request #1952 from ZBoxApp/PLT-7-go | Corey Hulen | 2016-01-22 | 11 | -249/+273 |
| |\ \ | | | | | | | | | PLT-7: Refactoring api to use translations (chunk 2) | ||||
| | * | | PLT-7: Change post CreatePost back to model.NewAppError | Elias Nahum | 2016-01-22 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | - It was failing test using model.NewLocAppError | ||||
| | * | | Refactoring api to use translations (chunk 2) | Elias Nahum | 2016-01-22 | 11 | -252/+272 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Add spanish translations - Does not include tests - Add func to get the translations for a user locale | ||||
| * | | | Merge pull request #1948 from hmhealey/plt1652 | Christopher Speller | 2016-01-22 | 1 | -8/+11 |
| |\ \ \ | | | | | | | | | | | PLT-1652 Added download param to getFile api call | ||||
| | * | | | Added download param to getFile api call | hmhealey | 2016-01-21 | 1 | -8/+11 |
| | | |/ | | |/| | |||||
| * | | | PLT-7 client side infra | =Corey Hulen | 2016-01-21 | 2 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into PLT-7-client-infra | =Corey Hulen | 2016-01-21 | 6 | -121/+122 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #1940 from ZBoxApp/PLT-7-go | Corey Hulen | 2016-01-21 | 6 | -121/+122 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | Refactoring api to use translations (chunk 1) | ||||
| | | * | Refactoring api to use translations (chunk 1) | Elias Nahum | 2016-01-21 | 6 | -121/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add spanish translations - Files in order by name from admin to export - Does not include api templates and tests - Fix web_test to load translations - Fix i18n to fallback to DEFAULT_LOCALE if no system locale found | ||||
| * | | | PLT-7 Adding react-intl libs | =Corey Hulen | 2016-01-21 | 2 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #1891 from trashcan/PLT-1515-password-change-wording | Joram Wilander | 2016-01-21 | 2 | -2/+2 |
| |\ \ | | | | | | | | | Improve wording of password change email to indicate that it might not be user initiated | ||||
| | * | | Improve wording of password change email to indicate that it might not have ↵ | Pat Lathem | 2016-01-14 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | been user initiated | ||||
| * | | | Merge pull request #1867 from apskim/patch-1 | Joram Wilander | 2016-01-21 | 1 | -0/+22 |
| |\ \ \ | | |_|/ | |/| | | Parse Slack links in the attachment pretext and fields (Fix #1868) | ||||
| | * | | Parse Slack links in the attachment fields | Alex Polozov | 2016-01-11 | 1 | -0/+16 |
| | | | | |||||
| | * | | Parse Slack links in the attachment pretext | Alex Polozov | 2016-01-11 | 1 | -0/+6 |
| | | | | |||||
| * | | | PLT-7-server-db | =Corey Hulen | 2016-01-20 | 3 | -2/+4 |
| | | | |