Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2531 from mattermost/websocket-fix | Harrison Healey | 2016-03-24 | 1 | -1/+1 |
|\ | | | | | Removing extranious this in websockets. | ||||
| * | Removing extranious this | Christopher Speller | 2016-03-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2529 from mattermost/plt-2383 | Harrison Healey | 2016-03-24 | 35 | -177/+152 |
|\ \ | | | | | | | PLT-2383 Fixed system console login page flash. | ||||
| * | | Modifying login not to display until it has finished checking. Caused admin ↵ | Christopher Speller | 2016-03-24 | 2 | -3/+6 |
| | | | | | | | | | | | | console to redirect to town-square. Will be changed after user model flip. | ||||
| * | | Moving all links and redirects to react-router | Christopher Speller | 2016-03-24 | 35 | -175/+147 |
| | | | |||||
* | | | Merge pull request #2530 from mattermost/i18n-consolidation | Christopher Speller | 2016-03-24 | 2 | -20/+29 |
|\ \ \ | |_|/ |/| | | Consolidating i18n into i18n.jsx | ||||
| * | | Consolidating i18n stuff into i18n.jsx | Christopher Speller | 2016-03-24 | 2 | -20/+29 |
| |/ | |||||
* | | Merge pull request #2523 from hmhealey/plt2351 | Joram Wilander | 2016-03-24 | 2476 | -126/+8380 |
|\ \ | | | | | | | PLT-2351 Switch to Apple emoji set | ||||
| * | | Fixed ESLint errors | Harrison Healey | 2016-03-24 | 1 | -19/+20 |
| | | | |||||
| * | | Replaced EmojiOne emoji with Apple emoji | Harrison Healey | 2016-03-23 | 2469 | -0/+0 |
| | | | |||||
| * | | Change emoticon rendering code to use image files with unicode names | Harrison Healey | 2016-03-23 | 3 | -118/+8368 |
| | | | |||||
| * | | Fixed unicode emoji not having a consistent size | Harrison Healey | 2016-03-23 | 4 | -8/+11 |
| | | | |||||
* | | | Merge pull request #2526 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-24 | 7 | -291/+327 |
|\ \ \ | |_|/ |/| | | Multiple UI Improvements | ||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-03-24 | 7 | -291/+327 |
| | | | |||||
* | | | Add claim LDAP locs in spanish | Elias Nahum | 2016-03-23 | 2 | -26/+49 |
|/ / | |||||
* | | Merge pull request #2519 from mattermost/search-store-fix | Christopher Speller | 2016-03-23 | 1 | -31/+9 |
|\ \ | | | | | | | Moving search store to memory | ||||
| * | | Moving search store to memory | Christopher Speller | 2016-03-23 | 1 | -31/+9 |
| |/ | |||||
* | | 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 | 12 | -190/+567 |
|\ \ | | | | | | | 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 | 12 | -195/+572 |
| |/ | |||||
* | | Merge pull request #2494 from hmhealey/plt2190 | Christopher Speller | 2016-03-23 | 6 | -66/+53 |
|\ \ | | | | | | | 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 | 6 | -66/+53 |
| | | | |||||
* | | | Merge pull request #2517 from mattermost/plt-2379 | Joram Wilander | 2016-03-23 | 4 | -66/+48 |
|\ \ \ | | | | | | | | | PLT-2379, PLT-2432 Fixing browser store issue. | ||||
| * | | | Fixing browser store issue. | Christopher Speller | 2016-03-23 | 4 | -66/+48 |
| | |/ | |/| | |||||
* | | | Merge pull request #2509 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-03-23 | 19 | -52/+66 |
|\ \ \ | |/ / |/| | | Multiple UI improvements | ||||
| * | | Multiple UI improvements | Asaad Mahmood | 2016-03-23 | 19 | -52/+66 |
| | | | |||||
* | | | Merge pull request #2516 from hmhealey/disableautolinker | Joram Wilander | 2016-03-23 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | Disabled autolinker | ||||
| * | | | Disabled autolinker | Harrison Healey | 2016-03-23 | 1 | -2/+8 |
| | | | | |||||
* | | | | Merge pull request #2515 from hmhealey/prefs | Joram Wilander | 2016-03-23 | 8 | -150/+118 |
|\ \ \ \ | |/ / / |/| | | | Changed PreferenceStore to store data in memory | ||||
| * | | | Changed PreferenceStore to store data in memory | Harrison Healey | 2016-03-23 | 8 | -150/+118 |
| |/ / | |||||
* / / | Fixing websocket connection issue. Refactoring websockets into an action ↵ | Christopher Speller | 2016-03-23 | 11 | -430/+495 |
|/ / | | | | | | | creator. | ||||
* | | Added SpinnerButton component to handle buttons that are also spinners | Harrison Healey | 2016-03-22 | 4 | -31/+65 |
| | | |||||
* | | 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 |
| |/ | |||||
* | | Merge pull request #2499 from hmhealey/plt2284 | Joram Wilander | 2016-03-22 | 1 | -0/+11 |
|\ \ | | | | | | | PLT-2284 Re-added ChannelMembersModal on mobile | ||||
| * | | Re-added ChannelMembersModal on mobile | Harrison Healey | 2016-03-21 | 1 | -0/+11 |
| | | | |||||
* | | | Merge pull request #2500 from ZBoxApp/es-locs | Corey Hulen | 2016-03-21 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | Add admin support es locs | ||||
| * | | | Add admin support es locs | Elias Nahum | 2016-03-21 | 2 | -2/+4 |
| |/ / | |||||
* / / | Fixing intl on Safari | Christopher Speller | 2016-03-21 | 2 | -4/+24 |
|/ / | |||||
* | | Merge pull request #2491 from rodrigocorsi2/compliance_pt_loc | Joram Wilander | 2016-03-21 | 1 | -4/+46 |
|\ \ | | | | | | | Translation compliance and others in pt | ||||
| * | | Translation compliance and others pt | Rodrigo Corsi | 2016-03-21 | 1 | -4/+46 |
| |/ | |||||
* / | Merge release branch commits | Christopher Speller | 2016-03-21 | 6 | -75/+49 |
|/ | |||||
* | 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 | 2 | -1/+18 |
|/ | | | | or https, it does not open properly | ||||
* | Merge pull request #2473 from ZBoxApp/compliance-es | Corey Hulen | 2016-03-18 | 2 | -37/+74 |
|\ | | | | | Add spanish translations for compliance |