Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #135 from asaadmahmoodspin/master | Corey Hulen | 2015-07-06 | 7 | -43/+92 |
|\ | | | | | MM-1461 - Updating Mattermost UI | ||||
| * | MM-1461 - Updating Mattermost UI | Asaad Mahmood | 2015-07-06 | 7 | -43/+92 |
| | | |||||
* | | Merge pull request #133 from nickago/MM-794 | Corey Hulen | 2015-07-06 | 1 | -0/+7 |
|\ \ | | | | | | | MM-794 Force the extra info to update asych on user creation | ||||
| * | | Force the extra info to update asych | nickago | 2015-07-06 | 1 | -0/+7 |
| | | | |||||
* | | | Merge pull request #132 from mattermost/mm-1250 | Corey Hulen | 2015-07-06 | 2 | -2/+6 |
|\ \ \ | | | | | | | | | fixes mm-1250 mention highlights should now align in textbox | ||||
| * | | | fixes mm-1250 mention highlights should now align in textbox | JoramWilander | 2015-06-17 | 2 | -2/+6 |
| | | | | |||||
* | | | | Merge pull request #131 from mattermost/mm-1391 | Corey Hulen | 2015-07-06 | 42 | -5017/+794 |
|\ \ \ \ | |_|_|/ |/| | | | Fixes mm-1391 adding travis CI | ||||
| * | | | Fixing unit tests | =Corey Hulen | 2015-07-06 | 18 | -154/+173 |
| | | | | |||||
| * | | | adding debugging | =Corey Hulen | 2015-07-06 | 1 | -2/+4 |
| | | | | |||||
| * | | | adding debugging | =Corey Hulen | 2015-07-05 | 1 | -7/+8 |
| | | | | |||||
| * | | | adding debugging | =Corey Hulen | 2015-07-05 | 1 | -6/+7 |
| | | | | |||||
| * | | | adding debugging | =Corey Hulen | 2015-07-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | adding debugging | =Corey Hulen | 2015-07-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -0/+3 |
| | | | | |||||
| * | | | fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -0/+3 |
| | | | | |||||
| * | | | fixing unit test | =Corey Hulen | 2015-07-05 | 2 | -2/+7 |
| | | | | |||||
| * | | | fixing unit tests | =Corey Hulen | 2015-07-05 | 2 | -0/+4 |
| | | | | |||||
| * | | | fixing timming test | =Corey Hulen | 2015-07-05 | 1 | -0/+7 |
| | | | | |||||
| * | | | Fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fixing unit test | =Corey Hulen | 2015-07-05 | 1 | -3/+3 |
| | | | | |||||
| * | | | fixing unit tests | =Corey Hulen | 2015-07-05 | 2 | -2/+2 |
| | | | | |||||
| * | | | fixing race condition in unit tests | =Corey Hulen | 2015-07-05 | 9 | -70/+70 |
| | | | | |||||
| * | | | Merge branch 'master' into mm-1391 | =Corey Hulen | 2015-07-05 | 77 | -394/+940 |
| |\ \ \ | |||||
| * | | | | adding mysql 5.6.17 | =Corey Hulen | 2015-07-05 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | adding mysql 5.6 | =Corey Hulen | 2015-07-05 | 1 | -2/+14 |
| | | | | | |||||
| * | | | | adding sql 5.6 | =Corey Hulen | 2015-07-05 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | adding sql 5.6 | =Corey Hulen | 2015-07-05 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | adding more unit tests | =Corey Hulen | 2015-07-05 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | adding mysql 5.6 | =Corey Hulen | 2015-06-25 | 1 | -12/+1 |
| | | | | | |||||
| * | | | | adding mysql 5.6 | =Corey Hulen | 2015-06-25 | 1 | -1/+15 |
| | | | | | |||||
| * | | | | adding api unit tests | =Corey Hulen | 2015-06-25 | 3 | -2/+7 |
| | | | | | |||||
| * | | | | adding servies | =Corey Hulen | 2015-06-25 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | updating build script | =Corey Hulen | 2015-06-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | updating services | =Corey Hulen | 2015-06-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | adding services to build | =Corey Hulen | 2015-06-25 | 1 | -1/+11 |
| | | | | | |||||
| * | | | | updating build | =Corey Hulen | 2015-06-25 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | updating build | =Corey Hulen | 2015-06-25 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | adding the missing package | =Corey Hulen | 2015-06-25 | 4 | -0/+531 |
| | | | | | |||||
| * | | | | updating make | =Corey Hulen | 2015-06-25 | 17 | -4856/+10 |
| | | | | | |||||
| * | | | | inital travis file | =Corey Hulen | 2015-06-25 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge pull request #128 from rgarmsen2295/mm-832 | Christopher Speller | 2015-07-06 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | MM-832 Fixed not being able to open channel notifications settings menu in IE10 | ||||
| * | | | | Fixed copy-paste error in code | Reed Garmsen | 2015-07-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed not being able to open channel notifications settings menu in IE10 | Reed Garmsen | 2015-07-06 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #127 from rgarmsen2295/mm-1047 | Joram Wilander | 2015-07-06 | 1 | -3/+6 |
|\ \ \ \ | |_|/ / |/| | | | MM-1047 Error code 200 IE 10 & 11 suppression within getMeSynchronous method | ||||
| * | | | Added comment for later reference | Reed Garmsen | 2015-07-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Implemented IE10 & 11 specific error suppression when a 200 status (aka OK) ↵ | Reed Garmsen | 2015-07-02 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | error is thrown | ||||
| * | | | Removed option that does not work | Reed Garmsen | 2015-07-02 | 2 | -3/+3 |
| | | | | |||||
| * | | | Added two possible options for removing blue bar error, will choose one later | Reed Garmsen | 2015-07-02 | 2 | -2/+2 |
| | | | | |||||
| * | | | Added line that disables caching with a ajax client call that was causing ↵ | Reed Garmsen | 2015-07-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | errors to be thrown in IE10 |