summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2016-02-0121-149/+219
|\
| * Fixing email unit tests=Corey Hulen2016-02-0113-128/+128
| * Merge pull request #2013 from mattermost/plt-1749Christopher Speller2016-01-291-0/+1
| |\
| | * Return channel type in new post websocket eventsJoramWilander2016-01-281-0/+1
| * | Remove expiry from public linksJoramWilander2016-01-281-8/+0
| |/
| * Fixing build=Corey Hulen2016-01-271-3/+2
| * PLT-7 Removing AppError ctor=Corey Hulen2016-01-273-4/+6
| * Merge pull request #1988 from mattermost/plt-1475Christopher Speller2016-01-271-7/+11
| |\
| | * Updated search test casesJoramWilander2016-01-271-4/+10
| | * Update search query to ignore system messagesJoramWilander2016-01-261-8/+6
| * | Merge pull request #1993 from mattermost/PLT-1586Christopher Speller2016-01-272-1/+72
| |\ \
| | * | PLT-1586 adding attach device id method=Corey Hulen2016-01-262-1/+72
| | |/
| * / Changed first preference load to be done synchronouslyhmhealey2016-01-261-0/+1
| |/
| * PLT-7: Refactoring stores to use translations (chunk 7)Elias Nahum2016-01-252-2/+2
* | merging=Corey Hulen2016-01-2538-166/+298
|\|
| * 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
* | | Merging=Corey Hulen2016-01-222-3/+4
* | | merging=Corey Hulen2016-01-2219-352/+410
|\| |
| * | 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