Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2155 from ZBoxApp/PLT-1948 | Christopher Speller | 2016-02-11 | 1 | -5/+3 |
|\ | | | | | PLT-1948: Fix duplicate am/pm on last password update | ||||
| * | eslint no-shadow resolved | Elias Nahum | 2016-02-11 | 1 | -1/+1 |
| | | |||||
| * | Fix duplicate am/pm on last password update | Elias Nahum | 2016-02-11 | 1 | -5/+3 |
| | | |||||
* | | Merge pull request #2150 from ZBoxApp/PLT-1963 | Christopher Speller | 2016-02-11 | 1 | -4/+5 |
|\ \ | | | | | | | PLT-1963: Fixing intl console error on Outgoing webhook edit | ||||
| * | | Fixing intl console error on Outgoing webhook edit | Elias Nahum | 2016-02-11 | 1 | -4/+5 |
| |/ | |||||
* | | Merge pull request #2145 from mattermost/PLT-1956 | Christopher Speller | 2016-02-11 | 1 | -1/+13 |
|\ \ | |/ |/| | PLT-1956 Infinite "Loading..." Animation for Webhooks/Slash Commands UI | ||||
| * | PLT-1956 | =Corey Hulen | 2016-02-10 | 1 | -1/+13 |
| | | |||||
* | | Improving UI for slash commands | Asaad Mahmood | 2016-02-10 | 1 | -2/+2 |
|/ | |||||
* | Fix canceling themes when user has no theme | JoramWilander | 2016-02-10 | 1 | -1/+4 |
| | |||||
* | Merge pull request #2120 from mattermost/slash-help | Christopher Speller | 2016-02-09 | 2 | -127/+143 |
|\ | | | | | Fixing slash command help | ||||
| * | Fixing slash command help | =Corey Hulen | 2016-02-09 | 2 | -127/+143 |
| | | |||||
* | | Reset theme on close of settings modal | JoramWilander | 2016-02-09 | 1 | -4/+9 |
|/ | |||||
* | Merge pull request #2113 from mattermost/slash-command-fixes | Christopher Speller | 2016-02-09 | 1 | -1/+1 |
|\ | | | | | Multiple minor slash command fixes | ||||
| * | Multiple minor slash command fixes | JoramWilander | 2016-02-09 | 1 | -1/+1 |
| | | |||||
* | | Multiple UI Improvements | Asaad Mahmood | 2016-02-09 | 1 | -3/+3 |
|/ | |||||
* | Fixing eslint error | =Corey Hulen | 2016-02-08 | 1 | -1/+0 |
| | |||||
* | PLT-1900 removing lang from preview and making spanish beta | =Corey Hulen | 2016-02-08 | 2 | -42/+36 |
| | |||||
* | Merge pull request #2101 from hmhealey/plt1415 | Christopher Speller | 2016-02-08 | 2 | -3/+3 |
|\ | | | | | PLT-1415 Renamed RECIEVED_* to RECEIVED_* | ||||
| * | Renamed RECIEVED_* to RECEIVED_* | hmhealey | 2016-02-08 | 2 | -3/+3 |
| | | |||||
* | | Multiple UI Improvements | Asaad Mahmood | 2016-02-08 | 1 | -12/+14 |
|/ | |||||
* | Merge pull request #2089 from mattermost/plt-1205 | Joram Wilander | 2016-02-08 | 6 | -142/+151 |
|\ | | | | | PLT-1205 Remove appearance settings tab and move theme management to display s… | ||||
| * | Fix cancel bug | JoramWilander | 2016-02-08 | 1 | -1/+3 |
| | | |||||
| * | Remove appearance settings tab and move theme management to display settings tab | JoramWilander | 2016-02-05 | 6 | -142/+149 |
| | | |||||
* | | Merge pull request #2092 from mattermost/fix-slash | Christopher Speller | 2016-02-08 | 1 | -14/+2 |
|\ \ | | | | | | | Fixing slash commands | ||||
| * | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -14/+2 |
| |/ | |||||
* | | Merge pull request #2091 from rgarmsen2295/plt-1797 | Corey Hulen | 2016-02-05 | 1 | -0/+1 |
|\ \ | |/ |/| | PLT-1797 Increased username max length | ||||
| * | Increased username max length | Reed Garmsen | 2016-02-05 | 1 | -0/+1 |
| | | |||||
* | | fix typos | Elias Nahum | 2016-02-04 | 1 | -2/+2 |
| | | |||||
* | | PLT-7: Fix and Add new loc strings | Elias Nahum | 2016-02-04 | 2 | -6/+27 |
| | | |||||
* | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 2 | -0/+695 |
|\ \ | | | | | | | PLT-1429 adding user created slash commands | ||||
| * | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 1 | -1/+2 |
| |\| | |||||
| * | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 2 | -51/+269 |
| | | | |||||
| * | | Fixing merge | =Corey Hulen | 2016-02-01 | 14 | -234/+1199 |
| |\ \ | |||||
| * \ \ | merging | =Corey Hulen | 2016-01-22 | 4 | -6/+153 |
| |\ \ \ | |||||
| * \ \ \ | merging | =Corey Hulen | 2016-01-15 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 1 | -67/+249 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Adding UI | =Corey Hulen | 2016-01-11 | 2 | -0/+295 |
| | | | | | | | |||||
* | | | | | | | Fixing loc error | =Corey Hulen | 2016-02-03 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Clear the password input boxes when user enter incorrect Retype New Password. | Khoa, Le Ngoc | 2016-02-03 | 1 | -1/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | PLT-7: Refactoring frontend (chunk 7) | Elias Nahum | 2016-01-31 | 1 | -14/+6 |
| | | | | | | | | | | | | | | | | | | | | - Elegant way to include react Component into FormattedMessage | ||||
* | | | | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-30 | 14 | -234/+1207 |
| |_|_|/ |/| | | | | | | | | | | | - User settings | ||||
* | | | | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 1 | -1/+0 |
| | | | | |||||
* | | | | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 1 | -37/+39 |
| | | | | |||||
* | | | | PLT-7 adding lang selector | =Corey Hulen | 2016-01-22 | 3 | -0/+146 |
| | | | | |||||
* | | | | Merge pull request #1927 from rgarmsen2295/plt-1668 | Christopher Speller | 2016-01-21 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | PLT-1668 Removes duplicate short username error message | ||||
| * | | | | Removed extraneous error when providing a short username | Reed Garmsen | 2016-01-20 | 2 | -4/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1922 from cloudron-io/check_auth_service | Harrison Healey | 2016-01-21 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Check auth_service when constructing messages | ||||
| * | | | Check auth_service for constructing message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Check auth_service to describe user login message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | |/ | |/| |