Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #1287 from hmhealey/plt382 | Christopher Speller | 2015-11-04 | 24 | -448/+636 |
|\ | | | | | 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 | 8 | -48/+78 |
| | | |||||
| * | 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 |
| | | |||||
* | | Merge pull request #1297 from hmhealey/plt761 | Joram Wilander | 2015-11-04 | 1 | -19/+7 |
|\ \ | | | | | | | PLT-761 Allowed @mentions to follow any non-alphanumeric character instead of just following whitespace | ||||
| * | | 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 #1292 from mattermost/upgrade-guide | Corey Hulen | 2015-11-04 | 1 | -12/+41 |
|\ \ \ | | | | | | | | | Added post-1.1 install instructions | ||||
| * | | | Update Upgrade-Guide.md | it33 | 2015-11-04 | 1 | -6/+6 |
| | | | | | | | | | | | | Removing periods at the end of bullet points | ||||
| * | | | Update Upgrade-Guide.md | it33 | 2015-11-03 | 1 | -3/+8 |
| | | | | |||||
| * | | | Added post 1.1 install instructions | it33 | 2015-11-03 | 1 | -7/+31 |
| | | | | |||||
* | | | | Merge pull request #1293 from mattermost/lfbrock-patch-1 | it33 | 2015-11-04 | 1 | -0/+26 |
|\ \ \ \ | |_|/ / |/| | | | Update CHANGELOG.md | ||||
| * | | | Update | lfbrock | 2015-11-03 | 1 | -0/+26 |
| |/ / | |||||
* | | | Merge pull request #1289 from mattermost/plt-516-2 | Joram Wilander | 2015-11-04 | 9 | -84/+95 |
|\ \ \ | | | | | | | | | PLT-516 Part 1 of performance fixes for large teams | ||||
| * | | | Revert model/version.go | JoramWilander | 2015-11-03 | 1 | -4/+4 |
| | | | | |||||
| * | | | Updated getStatuses unit testgs | JoramWilander | 2015-11-03 | 3 | -7/+13 |
| | | | | |||||
| * | | | 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 | 7 | -78/+83 |
| | | | | |||||
* | | | | Merge pull request #1288 from asaadmahmoodspin/plt-945 | Harrison Healey | 2015-11-04 | 12 | -73/+88 |
|\ \ \ \ | | | | | | | | | | | UI Improvements for multiple tickets | ||||
| * | | | | Updating prop for direct messages modal | Asaad Mahmood | 2015-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updating modal-body max-height if it exceeds more than 1200px | Asaad Mahmood | 2015-11-04 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | UI Improvements for multiple tickets | Asaad Mahmood | 2015-11-04 | 11 | -72/+82 |
| | | | | | |||||
* | | | | | 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 #1285 from mattermost/plt-824 | Joram Wilander | 2015-11-04 | 6 | -0/+366 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-824 Adding ability to fetch posts around a specifc post | ||||
| * | | | | | Adding ability to fetch posts around a specifc post | Christopher Speller | 2015-11-03 | 6 | -0/+366 |
| | | | | | | |||||
* | | | | | | Merge pull request #1294 from mattermost/Gitlab-SSO | Joram Wilander | 2015-11-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update to reflect setting change | ||||
| * | | | | | | Update to reflect setting change | it33 | 2015-11-03 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | 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 | 5 | -3/+34 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-991 Fixing height of embeded images | ||||
| * | | | | | | Fixing height of embeded images | Christopher Speller | 2015-11-03 | 5 | -3/+34 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1284 from trashcan/PLT-834-add-more-text-parsing-tests | Corey Hulen | 2015-11-03 | 1 | -1/+26 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | More markdown tests | ||||
| * | | | | | | | Two more additional types of horizontal rules I missed | Pat Lathem | 2015-11-03 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | Make go format happy | Pat Lathem | 2015-11-03 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Some more markdown tests. Emoji in a code block, and italics/bold not at ↵ | Pat Lathem | 2015-11-03 | 1 | -0/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the beginning of the sentence |