Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Remove loc change | JoramWilander | 2016-03-24 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix chrome autocompleting using hidden input | JoramWilander | 2016-03-24 | 1 | -4/+12 | |
| | | | | ||||||
| * | | | Minor fix to let Sign-in Method settings show up when ldap is enabled | JoramWilander | 2016-03-24 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2547 from ZBoxApp/notifications-fix | Christopher Speller | 2016-03-26 | 2 | -0/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix HTML Notifications not showing | |||||
| * | | | Fix HTML Notifications not showing | Elias Nahum | 2016-03-26 | 2 | -0/+1 | |
|/ / / | | | | | | | | | | - fix filename typo | |||||
* | | | Merge pull request #2544 from ZBoxApp/loc-fix | Christopher Speller | 2016-03-25 | 1 | -1/+2 | |
|\ \ \ | | | | | | | | | Fix default Browser locale | |||||
| * | | | Fix default Browser locale | Elias Nahum | 2016-03-25 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2543 from hmhealey/safariFix | Christopher Speller | 2016-03-25 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fixed typo safarifix -> safariFix | |||||
| * | | | Fixed typo safarifix -> safariFix | hmhealey | 2016-03-25 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2533 from ZBoxApp/PLT-2358 | Corey Hulen | 2016-03-24 | 2 | -1/+9 | |
|\ \ \ | | | | | | | | | PLT-2358: Detect user localization using client headers | |||||
| * | | | PLT-2358: Detect user localization using client headers | Elias Nahum | 2016-03-24 | 2 | -1/+9 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2534 from hmhealey/plt2184 | Corey Hulen | 2016-03-24 | 2 | -21/+6 | |
|\ \ \ | | | | | | | | | PLT-2184 Moved theme reset code to componentWillUnmount | |||||
| * | | | Moved theme reset code to componentWillUnmount | Harrison Healey | 2016-03-24 | 2 | -21/+6 | |
| | | | | ||||||
* | | | | Merge pull request #2535 from hmhealey/plt2446 | Corey Hulen | 2016-03-24 | 1 | -0/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | PLT-2446 Imported React into SearchSuggestionList | |||||
| * | | | Imported React into SearchSuggestionList | Harrison Healey | 2016-03-24 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2536 from numericube/master | Joram Wilander | 2016-03-24 | 3 | -0/+5061 | |
|\ \ \ \ | | | | | | | | | | | Added FR translation | |||||
| * | | | | 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 | |||||
| * | | | 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 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 | |
| | | | ||||||
* | | | Merge pull request #2522 from ZBoxApp/es-locs | Christopher Speller | 2016-03-24 | 4 | -46/+81 | |
|\ \ \ | |/ / |/| | | Add claim LDAP locs in spanish | |||||
| * | | 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 | |||||
| * | | 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 | 20 | -225/+927 | |
|\ \ | | | | | | | PLT-2260 Add the ability to switch from email to ldap and back | |||||
| * | | 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 | |
|\ \ | | | | | | | 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 | |
| | | | |