Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed old code theme selector and fixed some issues | Reed Garmsen | 2015-11-04 | 3 | -83/+6 |
| | |||||
* | Moved code theme picker into custom theme subarea | Reed Garmsen | 2015-11-04 | 2 | -23/+69 |
| | |||||
* | Fixed theme confirmation dialog to work in all cases and removed some jquery ↵ | hmhealey | 2015-11-03 | 10 | -53/+173 |
| | | | | magic related to it | ||||
* | Moved InviteMemberModal to be controlled by a store | hmhealey | 2015-11-02 | 1 | -2/+3 |
| | |||||
* | Added handling of keyboard focus to UserSettingsModal and its children | hmhealey | 2015-11-02 | 4 | -11/+51 |
| | |||||
* | Added a confirmation dialog for unsaved theme changes and removed ↵ | hmhealey | 2015-11-02 | 9 | -115/+105 |
| | | | | unnecessary dialog close handling | ||||
* | Ported UserSettingsModal to React-Bootstrap | hmhealey | 2015-11-02 | 4 | -37/+56 |
| | |||||
* | Ported AccessHistoryModal and ActivityLogModal to React-Bootstrap | hmhealey | 2015-11-02 | 1 | -13/+16 |
| | |||||
* | Merge pull request #1268 from mattermost/plt-514 | Christopher Speller | 2015-11-02 | 2 | -16/+25 |
|\ | | | | | PLT-514 Validate callback urls on the server and add help text to outgoing webhooks | ||||
| * | Validate callback urls on the server and add help text to outgoing webhooks | JoramWilander | 2015-11-02 | 2 | -16/+25 |
| | | |||||
* | | display full name, nickname or username in direct messages | Stas Vovk | 2015-11-01 | 1 | -3/+97 |
|/ | |||||
* | Fixing eslint not recursing | Christopher Speller | 2015-10-30 | 2 | -7/+6 |
| | |||||
* | allow code theme to be shareable | Florian Orben | 2015-10-29 | 2 | -2/+7 |
| | |||||
* | code style theme chooser | Florian Orben | 2015-10-29 | 2 | -1/+77 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-29 | 6 | -77/+184 |
|\ | | | | | | | ui-improvements | ||||
| * | Merge pull request #1196 from florianorben/send-on-ctrl | Joram Wilander | 2015-10-28 | 4 | -0/+183 |
| |\ | | | | | | | allow messages to be send on ctrl+enter | ||||
| | * | add new user-setting section 'advanced' and remove ctrl-send setting from ↵ | Florian Orben | 2015-10-28 | 4 | -87/+183 |
| | | | | | | | | | | | | general tab | ||||
| | * | allow messages to be send on ctrl+enter | Florian Orben | 2015-10-28 | 1 | -1/+88 |
| | | | |||||
| * | | Revert "PLT-395: Add syntax highlighting to Markdown code blocks" | Christopher Speller | 2015-10-28 | 2 | -77/+1 |
| |/ | |||||
* | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-27 | 3 | -2/+78 |
|\| | | | | | | | ui-improvements | ||||
| * | Fixed file upload and profile picture upload error display to work for ↵ | hmhealey | 2015-10-26 | 1 | -1/+1 |
| | | | | | | | | serverside errors | ||||
| * | code style theme chooser | Florian Orben | 2015-10-24 | 2 | -1/+77 |
| | | |||||
* | | Oauth UI Improvements and settings improvement | Asaad Mahmood | 2015-10-23 | 2 | -0/+5 |
|/ | |||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-10-23 | 3 | -76/+87 |
| | |||||
* | Merge pull request #1149 from mattermost/plt-808 | Christopher Speller | 2015-10-23 | 3 | -26/+62 |
|\ | | | | | PLT-808 Fix deleting channels breaking the webhook UI | ||||
| * | In webhooks UI handle error if channel can't be found, also use display name ↵ | JoramWilander | 2015-10-22 | 3 | -26/+62 |
| | | | | | | | | over url name, plus warning fixes | ||||
* | | Multi-session login | =Corey Hulen | 2015-10-20 | 1 | -1/+1 |
| | | |||||
* | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 3 | -27/+327 |
|\| | |||||
| * | Show/hide integrations properly based off config settings. | JoramWilander | 2015-10-19 | 2 | -51/+55 |
| | | |||||
| * | Fix postgres query and minor UI updates for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -9/+6 |
| | | |||||
| * | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -4/+302 |
| | | |||||
* | | Merging from master | =Corey Hulen | 2015-10-19 | 3 | -57/+39 |
|\| | |||||
| * | Fixing some client warnings | Christopher Speller | 2015-10-16 | 3 | -57/+39 |
| | | |||||
* | | Fixing merge | =Corey Hulen | 2015-10-16 | 3 | -0/+181 |
|\| | |||||
| * | Merge remote-tracking branch 'upstream/master' into PLT-637 | Stas Vovk | 2015-10-16 | 5 | -12/+12 |
| |\ | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx | ||||
| * | | added file with display settings | Stas Vovk | 2015-10-14 | 1 | -0/+168 |
| | | | |||||
| * | | added display tab under account settings. added 24h time option | Stas Vovk | 2015-10-14 | 2 | -0/+13 |
| | | | |||||
* | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 3 | -6/+6 |
| |/ |/| | |||||
* | | Fixing most deprication warnings | Christopher Speller | 2015-10-15 | 5 | -12/+12 |
|/ | |||||
* | Merge release branch 'release-1.1.0' | Christopher Speller | 2015-10-14 | 2 | -11/+12 |
|\ | |||||
| * | Fix webhook name not overriding in LHS and update webhook help text. | JoramWilander | 2015-10-13 | 1 | -1/+2 |
| | | |||||
| * | Fixing user settings dialog so it desn't ask you to check your email unless ↵ | Christopher Speller | 2015-10-13 | 1 | -10/+10 |
| | | | | | | | | you changed it | ||||
* | | Multiple Ui Improvements | Asaad Mahmood | 2015-10-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1018 from asaadmahmoodspin/ui-fixes | Corey Hulen | 2015-10-12 | 1 | -0/+2 |
|\ \ | | | | | | | Other UI Improvements | ||||
| * | | Other UI Improvements | Asaad Mahmood | 2015-10-12 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'master' into typos | Joram Wilander | 2015-10-12 | 2 | -2/+2 |
|\| | |||||
| * | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Update user_settings_integrations.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
* | | Fixed typos | it33 | 2015-10-08 | 1 | -2/+1 |
|/ | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username" |