Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleaned up textbox focus code | hmhealey | 2016-02-04 | 3 | -42/+18 |
| | |||||
* | Merge pull request #2072 from ZBoxApp/command-loc | Corey Hulen | 2016-02-04 | 2 | -108/+312 |
|\ | | | | | Add spanish translations for commands | ||||
| * | Add spanish translations for commands | Elias Nahum | 2016-02-04 | 2 | -108/+312 |
|/ | |||||
* | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 44 | -979/+3453 |
|\ | | | | | PLT-1429 adding user created slash commands | ||||
| * | PLT-1429 Fixing code review comments | =Corey Hulen | 2016-02-04 | 5 | -8/+6 |
| | | |||||
| * | Fixing build | =Corey Hulen | 2016-02-03 | 1 | -2/+2 |
| | | |||||
| * | Fixing based on feedback | =Corey Hulen | 2016-02-03 | 2 | -3/+3 |
| | | |||||
| * | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 28 | -329/+798 |
| |\ | |||||
| * \ | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 74 | -864/+2922 |
| |\ \ | |||||
| * | | | Fixing version | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixing console | =Corey Hulen | 2016-02-02 | 2 | -6/+6 |
| | | | | |||||
| * | | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 3 | -12/+108 |
| | | | | |||||
| * | | | Fixing unit test | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 4 | -57/+308 |
| | | | | |||||
| * | | | Switching defaults | =Corey Hulen | 2016-02-01 | 2 | -2/+2 |
| | | | | |||||
| * | | | Adding loc to new command backend | =Corey Hulen | 2016-02-01 | 12 | -259/+280 |
| | | | | |||||
| * | | | Fixing merge | =Corey Hulen | 2016-02-01 | 201 | -2301/+12602 |
| |\ \ \ | |||||
| * \ \ \ | merging | =Corey Hulen | 2016-01-25 | 91 | -708/+3640 |
| |\ \ \ \ | |||||
| * | | | | | Merging | =Corey Hulen | 2016-01-22 | 2 | -3/+4 |
| | | | | | | |||||
| * | | | | | merging | =Corey Hulen | 2016-01-22 | 1772 | -517/+1556760 |
| |\ \ \ \ \ | |||||
| * | | | | | | Adding test command | =Corey Hulen | 2016-01-15 | 2 | -16/+201 |
| | | | | | | | |||||
| * | | | | | | merging | =Corey Hulen | 2016-01-15 | 4 | -31/+15 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 4 | -70/+310 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 104 | -847/+1940 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Adding UI | =Corey Hulen | 2016-01-11 | 2 | -0/+295 |
| | | | | | | | | | |||||
| * | | | | | | | | Chaning webhooks to be team wide | =Corey Hulen | 2016-01-11 | 4 | -59/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Switching to enable integrations for testing | =Corey Hulen | 2016-01-11 | 2 | -8/+73 |
| | | | | | | | | | |||||
| * | | | | | | | | Adding loading testing commands | =Corey Hulen | 2016-01-10 | 5 | -395/+578 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-09 | 4 | -12/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | adding different commands | =Corey Hulen | 2016-01-09 | 12 | -439/+347 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-08 | 1 | -0/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixing unit tests | =Corey Hulen | 2016-01-08 | 1 | -0/+28 |
| | | | | | | | | | |||||
| * | | | | | | | | Adding web service methods | =Corey Hulen | 2016-01-08 | 6 | -18/+303 |
| | | | | | | | | | |||||
| * | | | | | | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 17 | -79/+579 |
| | | | | | | | | | |||||
| * | | | | | | | | PLT-1429 adding sql storage for slash commands | =Corey Hulen | 2016-01-06 | 8 | -859/+1359 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #2070 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-02-04 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixing center channel icon position in IE | ||||
| * | | | | | | | | | Fixing center channel icon position in IE | Asaad Mahmood | 2016-02-04 | 1 | -0/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #2068 from hmhealey/plt1767 | Corey Hulen | 2016-02-04 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | PLT-1767 Fixed editing your last comment in the RHS | ||||
| * | | | | | | | | | Fixed editing your last comment in the RHS | hmhealey | 2016-02-04 | 1 | -3/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #2069 from hmhealey/localization | Corey Hulen | 2016-02-04 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Fixed localization issues in file_upload.jsx | ||||
| * | | | | | | | | | Fixed localization issues in file_upload.jsx | hmhealey | 2016-02-04 | 1 | -3/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #2059 from mattermost/plt-1732 | Harrison Healey | 2016-02-04 | 4 | -6/+26 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | PLT-1732 Update user email when switching to SSO | ||||
| * | | | | | | | | | Fix auth data unit test | JoramWilander | 2016-02-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Update user email when switching to SSO | JoramWilander | 2016-02-03 | 3 | -5/+25 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-02-04 | 5 | -65/+90 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements | ||||
| * | | | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2016-02-03 | 5 | -65/+90 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #2065 from ZBoxApp/PLT-7-fix | Corey Hulen | 2016-02-03 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix claim translations | ||||
| * | | | | | | | | | | Fix claim translations | Elias Nahum | 2016-02-03 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #2063 from mattermost/fix-loc | Corey Hulen | 2016-02-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Fixing loc error | ||||
| * | | | | | | | | | Fixing loc error | =Corey Hulen | 2016-02-03 | 1 | -1/+1 |
| |/ / / / / / / / |