summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1298 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-049-24/+45
|\
| * Adding legacy pie clear fix instead of just clear fix to container-fluidAsaad Mahmood2015-11-041-1/+1
| * Binding handleShown to constructorAsaad Mahmood2015-11-042-0/+2
| * Making tutorial buttons and tutorial circles consistentAsaad Mahmood2015-11-043-7/+2
| * Fixing tutorial next button to be fixed at the bottomAsaad Mahmood2015-11-041-1/+8
| * Fixing issues with memberList modalAsaad Mahmood2015-11-042-15/+15
| * Adding focus for channel modalsAsaad Mahmood2015-11-043-0/+17
* | Merge pull request #1303 from mattermost/plt-516-2Christopher Speller2015-11-047-343/+325
|\ \
| * | Convert channel_members and channel_invite modals to react boostrap to fix pe...JoramWilander2015-11-047-343/+325
* | | 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 #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
* | | 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 #1289 from mattermost/plt-516-2Joram Wilander2015-11-046-79/+69
|\ \
| * | Minor changes to statuses client codeJoramWilander2015-11-033-8/+8
| * | Multiple fixes to major performance issues with teams with 50+ usersJoramWilander2015-11-036-76/+66
* | | 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 #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 #1282 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-0310-53/+106
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Adding browser functions in utilis and calling them in settings_sidebarAsaad Mahmood2015-11-032-1/+16
| * | | | Updating height code for tutorial screens.Asaad Mahmood2015-11-031-3/+5
| * | | | Multiple UI changesAsaad Mahmood2015-11-0310-53/+89
| |/ / /
* | | | Merge pull request #1278 from mattermost/PLT-968Christopher Speller2015-11-031-8/+7
|\ \ \ \ | |/ / / |/| | |
| * | | PLT-968 fixing console error=Corey Hulen2015-11-021-8/+7
| | |/ | |/|
* | | Merge pull request #1275 from mattermost/PLT-951Joram Wilander2015-11-025-48/+75
|\ \ \
| * | | PLT-951 PLT-972 fixing issues with team directory=Corey Hulen2015-11-025-48/+75