Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix websocket trying to reconnect after a logout | JoramWilander | 2016-03-24 | 2 | -7/+13 |
* | Merge pull request #2536 from numericube/master | Joram Wilander | 2016-03-24 | 3 | -0/+5061 |
|\ | |||||
| * | Added FR translation / thanks to @jblobel and @tbolon for their help | Pierre-Julien Grizel | 2016-03-24 | 3 | -0/+5061 |
|/ | |||||
* | Merge pull request #2528 from hmhealey/plt2351 | Christopher Speller | 2016-03-24 | 20 | -0/+0 |
|\ | |||||
| * | Re-added Github emoji images | Harrison Healey | 2016-03-24 | 20 | -0/+0 |
* | | Merge pull request #2531 from mattermost/websocket-fix | Harrison Healey | 2016-03-24 | 1 | -1/+1 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * | | Modifying login not to display until it has finished checking. Caused admin c... | Christopher Speller | 2016-03-24 | 2 | -3/+6 |
| * | | 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 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 |
|\ \ | |||||
| * | | 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 | Asaad Mahmood | 2016-03-24 | 7 | -291/+327 |
* | | | Merge pull request #2522 from ZBoxApp/es-locs | Christopher Speller | 2016-03-24 | 4 | -46/+81 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add claim LDAP locs in spanish | Elias Nahum | 2016-03-23 | 4 | -46/+81 |
|/ / | |||||
* | | Merge pull request #2519 from mattermost/search-store-fix | Christopher Speller | 2016-03-23 | 1 | -31/+9 |
|\ \ | |||||
| * | | 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 | Harrison Healey | 2016-03-23 | 2 | -7/+11 |
| |/ | |||||
* | | Merge pull request #2465 from mattermost/plt-2260 | Christopher Speller | 2016-03-23 | 20 | -225/+927 |
|\ \ | |||||
| * | | Fix imports and change ldap function name | JoramWilander | 2016-03-23 | 7 | -11/+11 |
| * | | Add the ability to switch from email to ldap and back | JoramWilander | 2016-03-23 | 20 | -230/+932 |
| |/ | |||||
* | | Merge pull request #2494 from hmhealey/plt2190 | Christopher Speller | 2016-03-23 | 6 | -66/+53 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 | 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 | 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 | Harrison Healey | 2016-03-23 | 8 | -150/+118 |
* | | | | Merge pull request #2512 from mattermost/plt-2473 | Corey Hulen | 2016-03-23 | 11 | -430/+495 |
|\ \ \ \ | |||||
| * | | | | Fixing websocket connection issue. Refactoring websockets into an action crea... | Christopher Speller | 2016-03-23 | 11 | -430/+495 |
| |/ / / | |||||
* | | | | Merge pull request #2508 from mattermost/mf-fixes | Corey Hulen | 2016-03-23 | 2 | -2/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Removing static test. Adding start-docker as a dep for run-server. | Christopher Speller | 2016-03-22 | 2 | -2/+3 |
| |/ / | |||||
* | | | Merge pull request #2507 from stupied4ever/patch-1 | Christopher Speller | 2016-03-23 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix typo | Rafael da Silva Almeida | 2016-03-22 | 1 | -1/+1 |
* | | | Merge pull request #2498 from hmhealey/plt2285 | Corey Hulen | 2016-03-22 | 8 | -54/+171 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 #2496 from mattermost/fix-postgres-bug | Christopher Speller | 2016-03-22 | 1 | -5/+0 |
|\ \ | |||||
| * | | Removing old schema upgrades affecting postgres | =Corey Hulen | 2016-03-21 | 1 | -5/+0 |
* | | | Merge pull request #2495 from hmhealey/plt2317a | Joram Wilander | 2016-03-22 | 4 | -53/+68 |
|\ \ \ |