summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1304 from mattermost/leave-channel-fixCorey Hulen2015-11-041-3/+3
|\
| * Fixed leaving channels issueChristopher Speller2015-11-041-3/+3
* | Merge pull request #1299 from hmhealey/plt974Corey Hulen2015-11-042-1/+8
|\ \
| * | Changed post searching to ignore requests to return everything by searching f...hmhealey2015-11-042-1/+8
* | | Merge pull request #1287 from hmhealey/plt382Christopher Speller2015-11-0424-448/+636
|\ \ \
| * | | Fixed theme confirmation dialog to work in all cases and removed some jquery ...hmhealey2015-11-0310-53/+173
| * | | Changed TeamSettingsModal click handlers to not affect other modalshmhealey2015-11-031-2/+4
| * | | Moved InviteMemberModal to be controlled by a storehmhealey2015-11-029-47/+91
| * | | Added handling of keyboard focus to UserSettingsModal and its childrenhmhealey2015-11-025-12/+51
| * | | Added a confirmation dialog for unsaved theme changes and removed unnecessary...hmhealey2015-11-0210-118/+106
| * | | Ported UserSettingsModal to React-Bootstraphmhealey2015-11-028-48/+78
| * | | Ported AccessHistoryModal and ActivityLogModal to React-Bootstraphmhealey2015-11-024-108/+75
| * | | Ported ConfirmModal and InviteMemberModal to React-Bootstraphmhealey2015-11-026-144/+142
* | | | Merge pull request #1297 from hmhealey/plt761Joram Wilander2015-11-041-19/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Properly escaped mention keywords and search terms when formatting themhmhealey2015-11-041-2/+6
| * | | Allowed @mentions to follow any non-alphanumeric character instead of just wh...hmhealey2015-11-041-1/+1
| * | | Removed unused text formatting functionshmhealey2015-11-041-16/+0
| | |/ | |/|
* | | Merge pull request #1292 from mattermost/upgrade-guideCorey Hulen2015-11-041-12/+41
|\ \ \
| * | | Update Upgrade-Guide.mdit332015-11-041-6/+6
| * | | Update Upgrade-Guide.mdit332015-11-031-3/+8
| * | | Added post 1.1 install instructionsit332015-11-031-7/+31
* | | | Merge pull request #1293 from mattermost/lfbrock-patch-1it332015-11-041-0/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | Updatelfbrock2015-11-031-0/+26
| |/ /
* | | Merge pull request #1289 from mattermost/plt-516-2Joram Wilander2015-11-049-84/+95
|\ \ \
| * | | Revert model/version.goJoramWilander2015-11-031-4/+4
| * | | Updated getStatuses unit testgsJoramWilander2015-11-033-7/+13
| * | | Minor changes to statuses client codeJoramWilander2015-11-033-8/+8
| * | | Multiple fixes to major performance issues with teams with 50+ usersJoramWilander2015-11-037-78/+83
* | | | Merge pull request #1288 from asaadmahmoodspin/plt-945Harrison Healey2015-11-0412-73/+88
|\ \ \ \
| * | | | Updating prop for direct messages modalAsaad Mahmood2015-11-041-1/+1
| * | | | Updating modal-body max-height if it exceeds more than 1200pxAsaad Mahmood2015-11-041-1/+6
| * | | | UI Improvements for multiple ticketsAsaad Mahmood2015-11-0411-72/+82
* | | | | Merge pull request #1286 from hmhealey/plt973Christopher Speller2015-11-041-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Re-enabled Markdown tableshmhealey2015-11-031-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #1279 from rgarmsen2295/plt-743Joram Wilander2015-11-043-22/+31
|\ \ \ \
| * | | | Functionalized codeReed Garmsen2015-11-023-36/+27
| * | | | Added additional checks to channel sorting that sorts by display_nameReed Garmsen2015-11-022-9/+27
* | | | | Merge pull request #1285 from mattermost/plt-824Joram Wilander2015-11-046-0/+366
|\ \ \ \ \
| * | | | | Adding ability to fetch posts around a specifc postChristopher Speller2015-11-036-0/+366
* | | | | | Merge pull request #1294 from mattermost/Gitlab-SSOJoram Wilander2015-11-041-1/+1
|\ \ \ \ \ \
| * | | | | | Update to reflect setting changeit332015-11-031-1/+1
|/ / / / / /
* | | | | | Merge pull request #1291 from mattermost/tutorial-tweaksCorey Hulen2015-11-032-3/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Update tutorial_intro_screens.jsxit332015-11-031-1/+1
| * | | | | Update sidebar_header.jsxit332015-11-031-0/+3
| * | | | | Update tutorial_intro_screens.jsxit332015-11-031-2/+2
| * | | | | Update tutorial_intro_screens.jsxit332015-11-031-1/+1
* | | | | | Merge pull request #1290 from mattermost/fixed-embed-heightCorey Hulen2015-11-035-3/+34
|\ \ \ \ \ \
| * | | | | | Fixing height of embeded imagesChristopher Speller2015-11-035-3/+34
* | | | | | | Merge pull request #1284 from trashcan/PLT-834-add-more-text-parsing-testsCorey Hulen2015-11-031-1/+26
|\ \ \ \ \ \ \
| * | | | | | | Two more additional types of horizontal rules I missedPat Lathem2015-11-031-1/+3