summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #150 from mattermost/mm-895Joram Wilander2015-07-0816-124/+234
|\ \ \ \
| * | | | Adding comments to change versions in syncChristopher Speller2015-07-082-0/+3
| * | | | Finishing centralization of BrowserStoreChristopher Speller2015-07-086-31/+46
| * | | | Modifying all storage to use session storage. Also adding an abstraction laye...Christopher Speller2015-07-0811-100/+192
| | |/ / | |/| |
* | | | Merge pull request #146 from nickago/MM-1284Joram Wilander2015-07-082-14/+27
|\ \ \ \
| * \ \ \ Merge branch 'MM-1284' of https://github.com/nickago/platform into MM-1284nickago2015-07-080-0/+0
| |\ \ \ \
| | * | | | Add ALL the semicolonsnickago2015-07-081-3/+3
| | * | | | Changed linkify to autolinker and wrote gap-bridging codenickago2015-07-072-12/+25
| | |/ / /
| * | | | Semicolons and a bug fixnickago2015-07-081-5/+5
| * | | | Changed linkify to autolinker and wrote gap-bridging codenickago2015-07-082-12/+25
| | | | * MM-1444 - Fixing text selection issueAsaad Mahmood2015-07-091-2/+1
| | | | * MM-1469 - Loading message in more channel modalAsaad Mahmood2015-07-084-63/+12
| | | | * Merge branch 'master' of https://github.com/asaadmahmoodspin/platformAsaad Mahmood2015-07-084-21/+91
| |_|_|/| |/| | | |
| | | | * Merge pull request #1 from rgarmsen2295/mm-1469asaadmahmoodspin2015-07-085-22/+92
| | | | |\
| | | | | * Small changes and code clean-upReed Garmsen2015-07-072-4/+2
| | | | | * Changed loading logic for retrieving more channels to allow for loading anima...Reed Garmsen2015-07-075-22/+94
* | | | | | Merge pull request #130 from hmhealey/staticjsCorey Hulen2015-07-0817-6/+42313
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use correctly minified and unminified js libraries for JQuery, Bootstrap, and...hmhealey2015-07-085-4/+1473
| * | | | | Copied Bootstrap, jQuery and React libraries and resources into repositoryhmhealey2015-07-0813-4/+40842
| * | | | | Moved minified javascript out of min directoryhmhealey2015-07-082-1/+1
* | | | | | Corrected release numbering in README.mdit332015-07-081-3/+3
|/ / / / /
* | | | | Merge pull request #136 from mattermost/code-reviewJoram Wilander2015-07-084-8/+10
|\ \ \ \ \
| * | | | | team code review=Corey Hulen2015-07-064-8/+10
* | | | | | Merge pull request #148 from hmhealey/mm1488Christopher Speller2015-07-081-2/+3
|\ \ \ \ \ \
| * | | | | | Changed code to dismiss mention list to not trigger when you click on the lis...hmhealey2015-07-071-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #147 from rgarmsen2295/mm-934Corey Hulen2015-07-073-3/+3
|\ \ \ \ \ \
| * | | | | | Changed textarea resizeability from being a blanket statement to everything t...Reed Garmsen2015-07-074-4/+3
| * | | | | | Prevent text areas from being resizeableReed Garmsen2015-07-071-0/+1
* | | | | | | Merge pull request #143 from rgarmsen2295/mm-1416Corey Hulen2015-07-072-2/+23
|\ \ \ \ \ \ \
| * | | | | | | Added new error message when trying to add a channel that was previously dele...Reed Garmsen2015-07-062-2/+23
* | | | | | | | Merge pull request #137 from nickago/MM-1417Corey Hulen2015-07-071-1/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | redirected channel name 404's to town squarenickago2015-07-061-1/+4
* | | | | | | | Merge pull request #142 from asaadmahmoodspin/masterJoram Wilander2015-07-074-31/+23
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | MM-1221 - Fixing scrolling issue in the RHSAsaad Mahmood2015-07-071-1/+2
| * | | | | | Updating backgroundAsaad Mahmood2015-07-072-24/+12
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-073-8/+15
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-072-1/+9
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fixing code error in cssAsaad Mahmood2015-07-071-1/+0
| * | | | | | Fixing before after hover for date/new separatorAsaad Mahmood2015-07-071-2/+6
| * | | | | | Files img filesAsaad Mahmood2015-07-071-2/+5
| * | | | | | Fixing background hoversAsaad Mahmood2015-07-072-11/+8
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #139 from hmhealey/makefilegodepsJoram Wilander2015-07-071-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Change Makefile to look for godep in GOPATH instead of using a relative pathhmhealey2015-07-061-1/+1
* | | | | | Merge pull request #138 from hmhealey/mm756Christopher Speller2015-07-073-8/+15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add a post type for user joined/left messages and don't flag a channel as unr...hmhealey2015-07-073-8/+15
| |/ / / /
* | | | | Merge pull request #141 from hmhealey/profilepicture32bitChristopher Speller2015-07-071-1/+1
|\ \ \ \ \
| * | | | | Explicitly cast to an int64 when selecting a random profile picture colour to...hmhealey2015-07-061-1/+1
| |/ / / /
* | | | | Merge pull request #134 from nickago/MM-1313Christopher Speller2015-07-071-0/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Changed socket event to a props based changenickago2015-07-062-20/+9
| * | | | Typing notification disappears when message is sentnickago2015-07-062-3/+4