Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |||||
* | | | | | 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 | |
| | | | | | | ||||||
* | | | | | | Revert " PLT-7 adding loc for db calls" | Corey Hulen | 2016-01-20 | 29 | -479/+463 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for users table | =Corey Hulen | 2016-01-20 | 24 | -196/+197 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for posts table | =Corey Hulen | 2016-01-20 | 6 | -28/+28 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for session table | =Corey Hulen | 2016-01-20 | 6 | -22/+22 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 12 | -103/+109 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 3 | -15/+17 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for webhooks table | =Corey Hulen | 2016-01-20 | 4 | -17/+17 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for team table | =Corey Hulen | 2016-01-20 | 5 | -37/+39 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 7 | -45/+50 | |
| | | | | | | ||||||
* | | | | | | PLT-7 Adding translation function to context | =Corey Hulen | 2016-01-19 | 4 | -7/+9 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding server side libraries | =Corey Hulen | 2016-01-19 | 1 | -0/+3 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge branch 'master' into fix-droid | =Corey Hulen | 2016-01-14 | 1 | -1/+1 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Fix old l4g references | JoramWilander | 2016-01-14 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fixing android push | =Corey Hulen | 2016-01-14 | 1 | -3/+10 | |
|/ / / / | ||||||
* | | | | Final updates | JoramWilander | 2016-01-14 | 2 | -7/+16 | |
| | | | | ||||||
* | | | | Add some unit tests | JoramWilander | 2016-01-14 | 1 | -9/+20 | |
| | | | | ||||||
* | | | | Added license validation and settings | JoramWilander | 2016-01-14 | 4 | -6/+111 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Release 1.4 RC2 | |||||
| * | | | Support old oauth routes | JoramWilander | 2016-01-12 | 1 | -1/+1 | |
| |/ / | ||||||
* / / | Upgrade logging package | =Corey Hulen | 2016-01-11 | 19 | -19/+19 | |
|/ / | ||||||
* | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 3 | -10/+61 | |
|\ \ | |/ |/| | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | |||||
| * | Added the ability to get more channel members from getChannelExtraInfo | hmhealey | 2016-01-06 | 3 | -10/+61 | |
| | | ||||||
* | | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 2 | -5/+12 | |
|\ \ | |/ |/| | PLT-1558 adding session length to config file | |||||
| * | PLT-1558 adding session length to config file | =Corey Hulen | 2016-01-05 | 2 | -5/+12 | |
| | | ||||||
* | | Merge pull request #1816 from mattermost/PLT-1607 | Christopher Speller | 2016-01-06 | 1 | -0/+1 | |
|\ \ | | | | | | | PLT-1607 adding more debugging info for email and push notifications | |||||
| * | | PLT-1607 adding more debugging info for email and push notifications | =Corey Hulen | 2016-01-05 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #1814 from mattermost/PLT-1485a | Christopher Speller | 2016-01-06 | 1 | -0/+9 | |
|\ \ \ | | | | | | | | | PLT-1485 Adding last view channel sticky | |||||
| * | | | PLT-1485 Adding last view channel sticky | =Corey Hulen | 2016-01-05 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | Merge pull request #1809 from mattermost/PLT-1557 | Christopher Speller | 2016-01-06 | 2 | -7/+56 | |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | PLT-1557 revoking sessions from same device |