summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* PLT-1851 fixing websocket reconnect error=Corey Hulen2016-02-041-6/+12
* Merge branch 'master' into PLT-1851=Corey Hulen2016-02-0454-1005/+3728
|\
| * Merge pull request #2072 from ZBoxApp/command-locCorey Hulen2016-02-042-108/+312
| |\
| | * Add spanish translations for commandsElias Nahum2016-02-042-108/+312
| |/
| * Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-0444-979/+3453
| |\
| | * PLT-1429 Fixing code review comments=Corey Hulen2016-02-045-8/+6
| | * Fixing build=Corey Hulen2016-02-031-2/+2
| | * Fixing based on feedback=Corey Hulen2016-02-032-3/+3
| | * Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0328-329/+798
| | |\
| | * \ Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0374-864/+2922
| | |\ \
| | * | | Fixing version=Corey Hulen2016-02-021-1/+1
| | * | | Fixing console=Corey Hulen2016-02-022-6/+6
| | * | | Adding props to admin console=Corey Hulen2016-02-023-12/+108
| | * | | Fixing unit test=Corey Hulen2016-02-021-1/+1
| | * | | Adding loc to front-end=Corey Hulen2016-02-024-57/+308
| | * | | Switching defaults=Corey Hulen2016-02-012-2/+2
| | * | | Adding loc to new command backend=Corey Hulen2016-02-0112-259/+280
| | * | | Fixing merge=Corey Hulen2016-02-01201-2301/+12602
| | |\ \ \
| | * \ \ \ merging=Corey Hulen2016-01-2591-708/+3640
| | |\ \ \ \
| | * | | | | Merging=Corey Hulen2016-01-222-3/+4
| | * | | | | merging=Corey Hulen2016-01-221772-517/+1556760
| | |\ \ \ \ \
| | * | | | | | Adding test command=Corey Hulen2016-01-152-16/+201
| | * | | | | | merging=Corey Hulen2016-01-154-31/+15
| | |\ \ \ \ \ \
| | * | | | | | | finishing up commands UI=Corey Hulen2016-01-144-70/+310
| | * | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-14104-847/+1940
| | |\ \ \ \ \ \ \
| | * | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| | * | | | | | | | Chaning webhooks to be team wide=Corey Hulen2016-01-114-59/+9
| | * | | | | | | | Switching to enable integrations for testing=Corey Hulen2016-01-112-8/+73
| | * | | | | | | | Adding loading testing commands=Corey Hulen2016-01-105-395/+578
| | * | | | | | | | Fixing unit tests=Corey Hulen2016-01-094-12/+8
| | * | | | | | | | adding different commands=Corey Hulen2016-01-0912-439/+347
| | * | | | | | | | Fixing unit tests=Corey Hulen2016-01-081-0/+4
| | * | | | | | | | Fixing unit tests=Corey Hulen2016-01-081-0/+28
| | * | | | | | | | Adding web service methods=Corey Hulen2016-01-086-18/+303
| | * | | | | | | | partial fix for UI=Corey Hulen2016-01-0817-79/+579
| | * | | | | | | | PLT-1429 adding sql storage for slash commands=Corey Hulen2016-01-068-859/+1359
| * | | | | | | | | Merge pull request #2070 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-041-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixing center channel icon position in IEAsaad Mahmood2016-02-041-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2068 from hmhealey/plt1767Corey Hulen2016-02-041-3/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed editing your last comment in the RHShmhealey2016-02-041-3/+2
| * | | | | | | | | | Merge pull request #2069 from hmhealey/localizationCorey Hulen2016-02-041-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixed localization issues in file_upload.jsxhmhealey2016-02-041-3/+3
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2059 from mattermost/plt-1732Harrison Healey2016-02-044-6/+26
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix auth data unit testJoramWilander2016-02-031-1/+1
| | * | | | | | | | | Update user email when switching to SSOJoramWilander2016-02-033-5/+25
| * | | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-045-65/+90
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2016-02-035-65/+90
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #2065 from ZBoxApp/PLT-7-fixCorey Hulen2016-02-031-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix claim translationsElias Nahum2016-02-031-2/+2
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #2063 from mattermost/fix-locCorey Hulen2016-02-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |