Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1329 from florianorben/no_panic_on_webhook_err | Joram Wilander | 2015-11-06 | 1 | -0/+5 |
|\ | | | | | don't panic if incoming webhook contains invalid json | ||||
| * | don't panic if incoming webhook contains invalid json | Florian Orben | 2015-11-06 | 1 | -0/+5 |
| | | |||||
* | | Revert 59581c38506acf267854f33af3c1d25e876dbb69 | Corey Hulen | 2015-11-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1320 from mattermost/PLT-1040 | Harrison Healey | 2015-11-05 | 2 | -1/+1 |
|\ | | | | | PLT-1040 changing ding | ||||
| * | Switching to mp3 | =Corey Hulen | 2015-11-05 | 3 | -1/+1 |
| | | |||||
| * | PLT-1040 changing ding | =Corey Hulen | 2015-11-05 | 2 | -1/+1 |
| | | |||||
* | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874) | Martin Fischer | 2015-11-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1319 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-05 | 3 | -21/+29 |
|\ \ | |/ |/| | UI Improvements for Slack and post dropdown | ||||
| * | UI Improvements for Slack and post dropdown | Asaad Mahmood | 2015-11-05 | 3 | -21/+29 |
| | | |||||
* | | Merge pull request #1317 from hmhealey/scroll | Corey Hulen | 2015-11-05 | 2 | -4/+7 |
|\ \ | | | | | | | Re-added changes made in ac052fb9 to perfect scrollbar | ||||
| * | | Re-added changes made in ac052fb9 to perfect scrollbar | hmhealey | 2015-11-05 | 2 | -4/+7 |
| | | | |||||
* | | | Merge pull request #1315 from mattermost/plt-996 | Corey Hulen | 2015-11-05 | 4 | -6/+6 |
|\ \ \ | | | | | | | | | PLT-996 Prevent tutorial showing up a second before post list loads | ||||
| * | | | Update tutorial to not show by default | JoramWilander | 2015-11-05 | 4 | -6/+6 |
| | | | | |||||
* | | | | Merge pull request #1314 from mattermost/plt-829 | Corey Hulen | 2015-11-05 | 1 | -1/+5 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-829 Only allow one ding every 3s | ||||
| * | | | Only allow one ding every 3s | JoramWilander | 2015-11-05 | 1 | -1/+5 |
| |/ / | |||||
* | | | Merge pull request #1316 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-11-05 | 7 | -96/+134 |
|\ \ \ | |_|/ |/| | | Modal improvements for members | ||||
| * | | Modal improvements for members | Asaad Mahmood | 2015-11-05 | 7 | -96/+134 |
| | | | |||||
* | | | Merge pull request #1313 from mattermost/plt-992 | Joram Wilander | 2015-11-05 | 8 | -11/+14 |
|\ \ \ | |_|/ |/| | | PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial. | ||||
| * | | Fixed center channel height magic. Fixes tutorial | Christopher Speller | 2015-11-05 | 8 | -11/+14 |
| | | | |||||
* | | | 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 |
| |/ |/| | |||||
* | | Fix abd user reference in head.html | JoramWilander | 2015-11-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1308 from asaadmahmoodspin/plt-960 | Christopher Speller | 2015-11-05 | 13 | -112/+108 |
|\ \ | | | | | | | Plt 960 - Moving code themes into custom themes | ||||
| * | | Updating UI for access history and access log modals | Asaad Mahmood | 2015-11-05 | 3 | -7/+3 |
| | | | |||||
| * | | Updating code themes | Asaad Mahmood | 2015-11-05 | 6 | -4/+15 |
| | | | |||||
| * | | 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 | 9 | -24/+45 |
|\ \ \ \ | |/ / / |/| | | | Multiple UI Improvements | ||||
| * | | | Adding legacy pie clear fix instead of just clear fix to container-fluid | Asaad Mahmood | 2015-11-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Binding handleShown to constructor | Asaad Mahmood | 2015-11-04 | 2 | -0/+2 |
| | | | | |||||
| * | | | Making tutorial buttons and tutorial circles consistent | Asaad Mahmood | 2015-11-04 | 3 | -7/+2 |
| | | | | |||||
| * | | | Fixing tutorial next button to be fixed at the bottom | Asaad Mahmood | 2015-11-04 | 1 | -1/+8 |
| | | | | |||||
| * | | | Fixing issues with memberList modal | Asaad Mahmood | 2015-11-04 | 2 | -15/+15 |
| | | | | |||||
| * | | | 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 | 7 | -343/+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 | 7 | -343/+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 | 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 |
| | | | |||||
* | | | 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 |