Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Minor fix to let Sign-in Method settings show up when ldap is enabled | JoramWilander | 2016-03-24 | 1 | -0/+1 |
| | |||||
* | Merge pull request #2523 from hmhealey/plt2351 | Joram Wilander | 2016-03-24 | 4 | -21/+23 |
|\ | | | | | PLT-2351 Switch to Apple emoji set | ||||
| * | Change emoticon rendering code to use image files with unicode names | Harrison Healey | 2016-03-23 | 1 | -14/+14 |
| | | |||||
| * | Fixed unicode emoji not having a consistent size | Harrison Healey | 2016-03-23 | 3 | -7/+9 |
| | | |||||
* | | Multiple UI Improvements | Asaad Mahmood | 2016-03-24 | 4 | -231/+248 |
| | | |||||
* | | Merge pull request #2520 from hmhealey/prefs | Christopher Speller | 2016-03-23 | 2 | -7/+11 |
|\ \ | | | | | | | Fixed tutorial step preferences to be saved as strings | ||||
| * | | Fixed tutorial step preferences to be saved as strings | Harrison Healey | 2016-03-23 | 2 | -7/+11 |
| |/ | |||||
* | | Merge pull request #2465 from mattermost/plt-2260 | Christopher Speller | 2016-03-23 | 6 | -132/+427 |
|\ \ | | | | | | | PLT-2260 Add the ability to switch from email to ldap and back | ||||
| * | | Fix imports and change ldap function name | JoramWilander | 2016-03-23 | 5 | -9/+9 |
| | | | |||||
| * | | Add the ability to switch from email to ldap and back | JoramWilander | 2016-03-23 | 6 | -137/+432 |
| |/ | |||||
* | | Merge pull request #2494 from hmhealey/plt2190 | Christopher Speller | 2016-03-23 | 3 | -64/+51 |
|\ \ | | | | | | | PLT-2190 Switched Textbox to use a TextareaAutosize and removed custom resizing code | ||||
| * | | Switched Textbox to use a TextareaAutosize and removed custom resizing code | Harrison Healey | 2016-03-21 | 3 | -64/+51 |
| | | | |||||
* | | | Merge pull request #2517 from mattermost/plt-2379 | Joram Wilander | 2016-03-23 | 1 | -2/+3 |
|\ \ \ | | | | | | | | | PLT-2379, PLT-2432 Fixing browser store issue. | ||||
| * | | | Fixing browser store issue. | Christopher Speller | 2016-03-23 | 1 | -2/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #2509 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-03-23 | 11 | -39/+45 |
|\ \ \ | |/ / |/| | | Multiple UI improvements | ||||
| * | | Multiple UI improvements | Asaad Mahmood | 2016-03-23 | 11 | -39/+45 |
| | | | |||||
* | | | Merge pull request #2515 from hmhealey/prefs | Joram Wilander | 2016-03-23 | 5 | -54/+77 |
|\ \ \ | | | | | | | | | Changed PreferenceStore to store data in memory | ||||
| * | | | Changed PreferenceStore to store data in memory | Harrison Healey | 2016-03-23 | 5 | -54/+77 |
| |/ / | |||||
* / / | Fixing websocket connection issue. Refactoring websockets into an action ↵ | Christopher Speller | 2016-03-23 | 4 | -81/+25 |
|/ / | | | | | | | creator. | ||||
* | | Added SpinnerButton component to handle buttons that are also spinners | Harrison Healey | 2016-03-22 | 3 | -31/+57 |
| | | |||||
* | | Adding loading indicator after clicking invite channel member button | Harrison Healey | 2016-03-22 | 5 | -40/+123 |
| | | |||||
* | | Merge pull request #2495 from hmhealey/plt2317a | Joram Wilander | 2016-03-22 | 4 | -53/+68 |
|\ \ | | | | | | | PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props | ||||
| * | | Changed RhsComment to receive the current user through props | Harrison Healey | 2016-03-21 | 2 | -6/+7 |
| | | | |||||
| * | | Passed currentUser into RhsRootPost | Harrison Healey | 2016-03-21 | 3 | -47/+61 |
| |/ | |||||
* | | Re-added ChannelMembersModal on mobile | Harrison Healey | 2016-03-21 | 1 | -0/+11 |
| | | |||||
* | | Merge release branch commits | Christopher Speller | 2016-03-21 | 2 | -42/+28 |
|/ | |||||
* | Merge pull request #2481 from khoa-le/PLT-2018 | Christopher Speller | 2016-03-21 | 1 | -1/+5 |
|\ | | | | | PLT-2018 After clicking "Use a different address" hitting enter should submit … | ||||
| * | After clicking "Use a different address" hitting enter should submit the ↵ | Khoa, Le Ngoc | 2016-03-19 | 1 | -1/+5 |
| | | | | | | | | "Use this instead" button | ||||
* | | System Console > Legal and Support Settings: If a link does not include http ↵ | Khoa, Le Ngoc | 2016-03-19 | 1 | -1/+16 |
|/ | | | | or https, it does not open properly | ||||
* | Revert "PLT-2183 Slash command auto-complete" | Christopher Speller | 2016-03-18 | 5 | -202/+123 |
| | |||||
* | PLT-2368: Fix for Date of last profile picture update is showing ↵ | Elias Nahum | 2016-03-18 | 1 | -14/+16 |
| | | | | [object][object] | ||||
* | Merge pull request #2442 from mattermost/PLT-2115 | Corey Hulen | 2016-03-17 | 6 | -26/+706 |
|\ | | | | | PLT-2115 adding compliance feature | ||||
| * | Fixing localization stuff | =Corey Hulen | 2016-03-17 | 1 | -3/+0 |
| | | |||||
| * | Fixing localization stuff | =Corey Hulen | 2016-03-17 | 1 | -20/+8 |
| | | |||||
| * | Fixing merge | =Corey Hulen | 2016-03-17 | 12 | -130/+325 |
| |\ | |||||
| | * | Fixing style issue caused by build changes | Christopher Speller | 2016-03-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fixing webpack | =Corey Hulen | 2016-03-16 | 2 | -0/+3 |
| | | | |||||
| * | | Fixing merge | =Corey Hulen | 2016-03-16 | 2 | -0/+660 |
| | | | |||||
| * | | merging files | =Corey Hulen | 2016-03-16 | 4 | -26/+58 |
| | | | |||||
* | | | Fix ESLint for code_preview.jsx | Elias Nahum | 2016-03-17 | 1 | -1/+1 |
| | | | |||||
* | | | Option to enable full snippets in push notifications | Elias Nahum | 2016-03-17 | 1 | -1/+43 |
| |/ |/| | |||||
* | | Merge pull request #2380 from rodrigocorsi2/code_preview | Christopher Speller | 2016-03-17 | 2 | -0/+112 |
|\ \ | | | | | | | Created component CodePreview | ||||
| * | | Created component CodePreview | Rodrigo Corsi | 2016-03-17 | 2 | -0/+112 |
| | | | |||||
* | | | Merge pull request #2461 from hmhealey/teamdefault | Christopher Speller | 2016-03-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Changed 'show username' display text to be more accurate | ||||
| * | | Changed 'show username' display text to be more accurate | Harrison Healey | 2016-03-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2169 from kernicPanel/external-slashcommands-management | Christopher Speller | 2016-03-17 | 5 | -123/+202 |
|\ \ \ | |/ / |/| | | PLT-2183 Slash command auto-complete | ||||
| * | | toggle incompatible settings views | Nicolas Clerc | 2016-03-17 | 1 | -119/+135 |
| | | | |||||
| * | | wording + localization | Nicolas Clerc | 2016-03-17 | 1 | -2/+2 |
| | | | |||||
| * | | use pre-released features | Nicolas Clerc | 2016-03-17 | 2 | -29/+51 |
| | | | |||||
| * | | eslint error: validate suggestion_box channelId prop | Nicolas Clerc | 2016-03-17 | 1 | -0/+1 |
| | | |