Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1313 from mattermost/plt-992 | Joram Wilander | 2015-11-05 | 3 | -6/+2 |
|\ | | | | | PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial. | ||||
| * | Fixed center channel height magic. Fixes tutorial | Christopher Speller | 2015-11-05 | 3 | -6/+2 |
| | | |||||
* | | Add constant form 'mention' | JoramWilander | 2015-11-05 | 2 | -1/+5 |
| | | |||||
* | | Only show * in tab title when a channel is marked unread | JoramWilander | 2015-11-05 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #1308 from asaadmahmoodspin/plt-960 | Christopher Speller | 2015-11-05 | 6 | -106/+97 |
|\ \ | | | | | | | Plt 960 - Moving code themes into custom themes | ||||
| * | | Updating UI for access history and access log modals | Asaad Mahmood | 2015-11-05 | 1 | -1/+1 |
| | | | |||||
| * | | Updating code themes | Asaad Mahmood | 2015-11-05 | 1 | -4/+6 |
| | | | |||||
| * | | Merge branch 'plt-960' of https://github.com/rgarmsen2295/platform into PLT-960 | Asaad Mahmood | 2015-11-05 | 5 | -105/+94 |
| |\ \ | |||||
| | * | | Removed old code theme selector and fixed some issues | Reed Garmsen | 2015-11-04 | 5 | -99/+20 |
| | | | | |||||
| | * | | Moved code theme picker into custom theme subarea | Reed Garmsen | 2015-11-04 | 3 | -24/+92 |
| | | | | |||||
* | | | | Merge pull request #1298 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-04 | 6 | -16/+35 |
|\ \ \ \ | |/ / / |/| | | | Multiple UI Improvements | ||||
| * | | | Binding handleShown to constructor | Asaad Mahmood | 2015-11-04 | 2 | -0/+2 |
| | | | | |||||
| * | | | Making tutorial buttons and tutorial circles consistent | Asaad Mahmood | 2015-11-04 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fixing issues with memberList modal | Asaad Mahmood | 2015-11-04 | 1 | -14/+14 |
| | | | | |||||
| * | | | Adding focus for channel modals | Asaad Mahmood | 2015-11-04 | 3 | -0/+17 |
| | | | | |||||
* | | | | Merge pull request #1303 from mattermost/plt-516-2 | Christopher Speller | 2015-11-04 | 6 | -341/+325 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-516 Part 2 of fixing performance issues with large teams | ||||
| * | | | Convert channel_members and channel_invite modals to react boostrap to fix ↵ | JoramWilander | 2015-11-04 | 6 | -341/+325 |
| | | | | | | | | | | | | | | | | performance issues | ||||
* | | | | Merge pull request #1304 from mattermost/leave-channel-fix | Corey Hulen | 2015-11-04 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed leaving channels issue | ||||
| * | | | Fixed leaving channels issue | Christopher Speller | 2015-11-04 | 1 | -3/+3 |
| |/ / | |||||
* | | | Merge pull request #1287 from hmhealey/plt382 | Christopher Speller | 2015-11-04 | 23 | -448/+632 |
|\ \ \ | |_|/ |/| | | PLT-382 Refactored some modals to use React-Bootstrap and added a confirmation when discarding theme changes | ||||
| * | | Fixed theme confirmation dialog to work in all cases and removed some jquery ↵ | hmhealey | 2015-11-03 | 10 | -53/+173 |
| | | | | | | | | | | | | magic related to it | ||||
| * | | Changed TeamSettingsModal click handlers to not affect other modals | hmhealey | 2015-11-03 | 1 | -2/+4 |
| | | | |||||
| * | | Moved InviteMemberModal to be controlled by a store | hmhealey | 2015-11-02 | 9 | -47/+91 |
| | | | |||||
| * | | Added handling of keyboard focus to UserSettingsModal and its children | hmhealey | 2015-11-02 | 5 | -12/+51 |
| | | | |||||
| * | | Added a confirmation dialog for unsaved theme changes and removed ↵ | hmhealey | 2015-11-02 | 10 | -118/+106 |
| | | | | | | | | | | | | unnecessary dialog close handling | ||||
| * | | Ported UserSettingsModal to React-Bootstrap | hmhealey | 2015-11-02 | 7 | -48/+74 |
| | | | |||||
| * | | Ported AccessHistoryModal and ActivityLogModal to React-Bootstrap | hmhealey | 2015-11-02 | 4 | -108/+75 |
| | | | |||||
| * | | Ported ConfirmModal and InviteMemberModal to React-Bootstrap | hmhealey | 2015-11-02 | 6 | -144/+142 |
| | | | |||||
* | | | Properly escaped mention keywords and search terms when formatting them | hmhealey | 2015-11-04 | 1 | -2/+6 |
| | | | |||||
* | | | Allowed @mentions to follow any non-alphanumeric character instead of just ↵ | hmhealey | 2015-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | whitespace | ||||
* | | | Removed unused text formatting functions | hmhealey | 2015-11-04 | 1 | -16/+0 |
| |/ |/| | |||||
* | | Merge pull request #1289 from mattermost/plt-516-2 | Joram Wilander | 2015-11-04 | 6 | -79/+69 |
|\ \ | | | | | | | PLT-516 Part 1 of performance fixes for large teams | ||||
| * | | Minor changes to statuses client code | JoramWilander | 2015-11-03 | 3 | -8/+8 |
| | | | |||||
| * | | Multiple fixes to major performance issues with teams with 50+ users | JoramWilander | 2015-11-03 | 6 | -76/+66 |
| | | | |||||
* | | | Merge pull request #1288 from asaadmahmoodspin/plt-945 | Harrison Healey | 2015-11-04 | 8 | -36/+39 |
|\ \ \ | | | | | | | | | UI Improvements for multiple tickets | ||||
| * | | | Updating prop for direct messages modal | Asaad Mahmood | 2015-11-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | UI Improvements for multiple tickets | Asaad Mahmood | 2015-11-04 | 8 | -36/+39 |
| | | | | |||||
* | | | | Merge pull request #1286 from hmhealey/plt973 | Christopher Speller | 2015-11-04 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | PLT-973 Re-enabled Markdown tables | ||||
| * | | | Re-enabled Markdown tables | hmhealey | 2015-11-03 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #1279 from rgarmsen2295/plt-743 | Joram Wilander | 2015-11-04 | 3 | -22/+31 |
|\ \ \ | | | | | | | | | PLT-741/743 Adds additional checks when sorting channels/teams by display name | ||||
| * | | | Functionalized code | Reed Garmsen | 2015-11-02 | 3 | -36/+27 |
| | | | | |||||
| * | | | Added additional checks to channel sorting that sorts by display_name | Reed Garmsen | 2015-11-02 | 2 | -9/+27 |
| | | | | |||||
* | | | | Merge pull request #1291 from mattermost/tutorial-tweaks | Corey Hulen | 2015-11-03 | 2 | -3/+6 |
|\ \ \ \ | | | | | | | | | | | Tutorial tweaks | ||||
| * | | | | Update tutorial_intro_screens.jsx | it33 | 2015-11-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update sidebar_header.jsx | it33 | 2015-11-03 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Update tutorial_intro_screens.jsx | it33 | 2015-11-03 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Update tutorial_intro_screens.jsx | it33 | 2015-11-03 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1290 from mattermost/fixed-embed-height | Corey Hulen | 2015-11-03 | 2 | -2/+22 |
|\ \ \ \ | | | | | | | | | | | PLT-991 Fixing height of embeded images | ||||
| * | | | | Fixing height of embeded images | Christopher Speller | 2015-11-03 | 2 | -2/+22 |
| |/ / / | |||||
* | | | | Adding browser functions in utilis and calling them in settings_sidebar | Asaad Mahmood | 2015-11-03 | 2 | -1/+16 |
| | | | |