Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-07 | 3 | -8/+15 |
|\ | |||||
| * | Merge pull request #138 from hmhealey/mm756 | Christopher Speller | 2015-07-07 | 3 | -8/+15 |
| |\ | | | | | | | MM-756 Don't mark channels as unread after user joined/left messages | ||||
| | * | Add a post type for user joined/left messages and don't flag a channel as ↵ | hmhealey | 2015-07-07 | 3 | -8/+15 |
| | | | | | | | | | | | | unread when one of those is automatically posted | ||||
* | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-07 | 2 | -1/+9 |
|\| | | |||||
| * | | Merge pull request #141 from hmhealey/profilepicture32bit | Christopher Speller | 2015-07-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix an out of bounds exception when generating profile pictures on 32 bit installations | ||||
| | * | | Explicitly cast to an int64 when selecting a random profile picture colour ↵ | hmhealey | 2015-07-06 | 1 | -1/+1 |
| | |/ | | | | | | | | | | to prevent overflow on 32-bit installations of Go | ||||
| * | | Merge pull request #134 from nickago/MM-1313 | Christopher Speller | 2015-07-07 | 1 | -0/+8 |
| |\ \ | | | | | | | | | Mm 1313 Made the typing notification more responsive/accurate | ||||
| | * | | Changed socket event to a props based change | nickago | 2015-07-06 | 2 | -20/+9 |
| | | | | |||||
| | * | | Typing notification disappears when message is sent | nickago | 2015-07-06 | 2 | -3/+4 |
| | | | | |||||
| | * | | Typing notifier resets on channel change | nickago | 2015-07-06 | 2 | -4/+22 |
| | | | | |||||
* | | | | Fixing code error in css | Asaad Mahmood | 2015-07-07 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fixing before after hover for date/new separator | Asaad Mahmood | 2015-07-07 | 1 | -2/+6 |
| | | | | |||||
* | | | | Files img files | Asaad Mahmood | 2015-07-07 | 1 | -2/+5 |
| | | | | |||||
* | | | | Fixing background hovers | Asaad Mahmood | 2015-07-07 | 2 | -11/+8 |
|/ / / | |||||
* | | | Merge pull request #140 from mattermost/fix-build | Corey Hulen | 2015-07-06 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | fixing build | ||||
| * | | | fixing build | =Corey Hulen | 2015-07-06 | 1 | -0/+3 |
|/ / / | |||||
* | | | 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 |
| | | | | |