summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | PLT-7: Refactoring api to use translations (chunk 4)Elias Nahum2016-01-2430-138/+187
* | | | | PLT-7: Refactoring api to use translations (chunk 3)Elias Nahum2016-01-235-20/+24
* | | | | Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-223-8/+87
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added unit test and fixed errorsJoramWilander2016-01-221-7/+63
| * | | | Add create_at back to profile fields to fix analyticsJoramWilander2016-01-221-0/+13
| * | | | Generalize analytics server functions and begin componentizing client analyti...JoramWilander2016-01-211-1/+11
* | | | | Updating favicon stuffAsaad Mahmood2016-01-221-2/+2
* | | | | PLT-7 fixing unit test for chunk 2 server=Corey Hulen2016-01-221-8/+6
* | | | | Merge pull request #1952 from ZBoxApp/PLT-7-goCorey Hulen2016-01-2211-249/+273
|\ \ \ \ \
| * | | | | PLT-7: Change post CreatePost back to model.NewAppErrorElias Nahum2016-01-221-3/+7
| * | | | | Refactoring api to use translations (chunk 2)Elias Nahum2016-01-2211-252/+272
* | | | | | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-221-8/+11
|\ \ \ \ \ \
| * | | | | | Added download param to getFile api callhmhealey2016-01-211-8/+11
| | |/ / / / | |/| | | |
* | | | | | PLT-7 client side infra=Corey Hulen2016-01-212-2/+3
* | | | | | Merge branch 'master' into PLT-7-client-infra=Corey Hulen2016-01-216-121/+122
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1940 from ZBoxApp/PLT-7-goCorey Hulen2016-01-216-121/+122
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Refactoring api to use translations (chunk 1)Elias Nahum2016-01-216-121/+122
* | | | | | PLT-7 Adding react-intl libs=Corey Hulen2016-01-212-0/+2
|/ / / / /
* | | | | Merge pull request #1891 from trashcan/PLT-1515-password-change-wordingJoram Wilander2016-01-212-2/+2
|\ \ \ \ \
| * | | | | Improve wording of password change email to indicate that it might not have b...Pat Lathem2016-01-142-2/+2
* | | | | | Merge pull request #1867 from apskim/patch-1Joram Wilander2016-01-211-0/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Parse Slack links in the attachment fieldsAlex Polozov2016-01-111-0/+16
| * | | | | Parse Slack links in the attachment pretextAlex Polozov2016-01-111-0/+6
* | | | | | PLT-7-server-db=Corey Hulen2016-01-203-2/+4
* | | | | | Revert " PLT-7 adding loc for db calls"Corey Hulen2016-01-2029-479/+463
* | | | | | PLT-7 adding loc db calls for users table=Corey Hulen2016-01-2024-196/+197
* | | | | | PLT-7 adding loc db calls for posts table=Corey Hulen2016-01-206-28/+28
* | | | | | PLT-7 adding loc db calls for session table=Corey Hulen2016-01-206-22/+22
* | | | | | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-2012-103/+109
* | | | | | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-203-15/+17
* | | | | | PLT-7 adding loc db calls for webhooks table=Corey Hulen2016-01-204-17/+17
* | | | | | PLT-7 adding loc db calls for team table=Corey Hulen2016-01-205-37/+39
* | | | | | PLT-7 adding loc for db calls audits and prefs=Corey Hulen2016-01-207-45/+50
* | | | | | PLT-7 Adding translation function to context=Corey Hulen2016-01-194-7/+9
* | | | | | PLT-7 adding server side libraries=Corey Hulen2016-01-191-0/+3
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' into fix-droid=Corey Hulen2016-01-141-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix old l4g referencesJoramWilander2016-01-141-1/+1
* | | | | Fixing android push=Corey Hulen2016-01-141-3/+10
|/ / / /
* | | | Final updatesJoramWilander2016-01-142-7/+16
* | | | Add some unit testsJoramWilander2016-01-141-9/+20
* | | | Added license validation and settingsJoramWilander2016-01-144-6/+111
| |/ / |/| |
* | | Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-121-1/+1
|\ \ \
| * | | Support old oauth routesJoramWilander2016-01-121-1/+1
| |/ /
* / / Upgrade logging package=Corey Hulen2016-01-1119-19/+19
|/ /
* | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-113-10/+61
|\ \ | |/ |/|
| * Added the ability to get more channel members from getChannelExtraInfohmhealey2016-01-063-10/+61
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-062-5/+12
|\ \ | |/ |/|
| * PLT-1558 adding session length to config file=Corey Hulen2016-01-052-5/+12
* | Merge pull request #1816 from mattermost/PLT-1607Christopher Speller2016-01-061-0/+1
|\ \
| * | PLT-1607 adding more debugging info for email and push notifications=Corey Hulen2016-01-051-0/+1