Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | Merge pull request #1310 from mattermost/plt-697 | Christopher Speller | 2015-11-05 | 3 | -7/+12 |
|\ \ \ | | | | | | | | | PLT-697 Don't send welcome emails for users signing up from an email invite and update email content | ||||
| * | | | Update email css | JoramWilander | 2015-11-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Don't send welcome emails for users signing up from an email invite, update ↵ | JoramWilander | 2015-11-05 | 3 | -7/+12 |
| | | | | | | | | | | | | | | | | email content | ||||
* | | | | Merge pull request #1311 from mattermost/plt-981 | Christopher Speller | 2015-11-05 | 2 | -1/+7 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-981 Only show * in tab title when a channel is marked unread | ||||
| * | | | 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 #1301 from mishimi/patch-9 | Corey Hulen | 2015-11-05 | 1 | -5/+7 |
|\ \ \ \ | | | | | | | | | | | Added documentation on search modifiers and two character search limi… | ||||
| * | | | | Update Search.md | mishimi | 2015-11-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update Search.md | mishimi | 2015-11-04 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Update Search.md | mishimi | 2015-11-04 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Update Search.md | mishimi | 2015-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Made updates more concise | mishimi | 2015-11-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added documentation on search modifiers and two character search limitations | mishimi | 2015-11-04 | 1 | -2/+4 |
| | | | | | |||||
* | | | | | Merge pull request #1312 from hmhealey/plt592 | Joram Wilander | 2015-11-05 | 6 | -12/+18 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-592 Correctly measure the length of unicode strings | ||||
| * | | | | Fixed string length checks for fields that can contain unicode characters | hmhealey | 2015-11-05 | 6 | -12/+18 |
|/ / / / | |||||
* | | | | Merge pull request #1309 from mattermost/analytics-fix | Harrison Healey | 2015-11-05 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | Fix user reference in head.html | ||||
| * | | | 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 #1305 from esethna/patch-11 | Corey Hulen | 2015-11-04 | 1 | -0/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | Create Team-Statistics.md | ||||
| * | | | | | Create Team-Statistics.md | esethna | 2015-11-04 | 1 | -0/+24 |
| | |/ / / | |/| | | | | | | | | Reviewed by Corey | ||||
* | | | | | 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 #1299 from hmhealey/plt974 | Corey Hulen | 2015-11-04 | 2 | -1/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-974 Prevented searching for "*" | ||||
| * | | | | Changed post searching to ignore requests to return everything by searching ↵ | hmhealey | 2015-11-04 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | for * | ||||
* | | | | | 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 |
| | | | | |