summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1308 from asaadmahmoodspin/plt-960Christopher Speller2015-11-056-106/+97
|\
| * Updating UI for access history and access log modalsAsaad Mahmood2015-11-051-1/+1
| * Updating code themesAsaad Mahmood2015-11-051-4/+6
| * Merge branch 'plt-960' of https://github.com/rgarmsen2295/platform into PLT-960Asaad Mahmood2015-11-055-105/+94
| |\
| | * Removed old code theme selector and fixed some issuesReed Garmsen2015-11-045-99/+20
| | * Moved code theme picker into custom theme subareaReed Garmsen2015-11-043-24/+92
* | | Merge pull request #1298 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-046-16/+35
|\ \ \ | |/ / |/| |
| * | Binding handleShown to constructorAsaad Mahmood2015-11-042-0/+2
| * | Making tutorial buttons and tutorial circles consistentAsaad Mahmood2015-11-042-2/+2
| * | Fixing issues with memberList modalAsaad Mahmood2015-11-041-14/+14
| * | Adding focus for channel modalsAsaad Mahmood2015-11-043-0/+17
* | | Merge pull request #1303 from mattermost/plt-516-2Christopher Speller2015-11-046-341/+325
|\ \ \
| * | | Convert channel_members and channel_invite modals to react boostrap to fix pe...JoramWilander2015-11-046-341/+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-0423-448/+632
|\ \ \ | |_|/ |/| |
| * | 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-027-48/+74
| * | 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-048-36/+39
|\ \ \
| * | | Updating prop for direct messages modalAsaad Mahmood2015-11-041-1/+1
| * | | UI Improvements for multiple ticketsAsaad Mahmood2015-11-048-36/+39
* | | | 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-032-2/+22
|\ \ \ \
| * | | | Fixing height of embeded imagesChristopher Speller2015-11-032-2/+22
| |/ / /
* | | | 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-035-40/+61
|/ / /
* | | Merge pull request #1275 from mattermost/PLT-951Joram Wilander2015-11-023-46/+73
|\ \ \
| * | | PLT-951 PLT-972 fixing issues with team directory=Corey Hulen2015-11-023-46/+73