Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2560 from mattermost/plt-2464 | Joram Wilander | 2016-03-29 | 1 | -1/+1 |
|\ | |||||
| * | Spelling | Christopher Speller | 2016-03-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2553 from hmhealey/actions | Joram Wilander | 2016-03-29 | 1 | -0/+8 |
|\ | |||||
| * | Added a warning message when AppDispatcher tries to dispatch without an actio... | Harrison Healey | 2016-03-28 | 1 | -0/+8 |
* | | Merge pull request #2551 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-28 | 8 | -16/+7395 |
|\ \ | |/ |/| | |||||
| * | Multiple UI Improvements | Asaad Mahmood | 2016-03-28 | 8 | -16/+7395 |
|/ | |||||
* | Merge pull request #2539 from ryoon/gnu-make-as-gmake | Harrison Healey | 2016-03-28 | 1 | -4/+4 |
|\ | |||||
| * | Replace 'make' with '$(MAKE)' | Ryo ONODERA | 2016-03-25 | 1 | -4/+4 |
* | | Merge pull request #2548 from rodrigocorsi2/pt-translations | Harrison Healey | 2016-03-28 | 2 | -14/+44 |
|\ \ | |||||
| * | | LDAP translations pt | Rodrigo Corsi | 2016-03-27 | 2 | -14/+44 |
* | | | Merge pull request #2550 from mattermost/plt-2452 | Harrison Healey | 2016-03-28 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixing Link being imported incorrectly. Fixes team creation. | Christopher Speller | 2016-03-28 | 1 | -1/+1 |
* | | | | Merge pull request #2546 from ZBoxApp/open-invite | Joram Wilander | 2016-03-28 | 1 | -1/+3 |
|\ \ \ \ | |||||
| * | | | | fix register account for teams with open invites | Elias Nahum | 2016-03-26 | 1 | -1/+3 |
* | | | | | Merge pull request #2545 from ryoon/no-travis | Joram Wilander | 2016-03-28 | 1 | -2/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Mattermost does not appears to use travis ci anymore | Ryo ONODERA | 2016-03-26 | 1 | -2/+0 |
| |/ / / | |||||
* | | | | Merge pull request #2538 from mattermost/websocket-fix | Christopher Speller | 2016-03-28 | 2 | -7/+13 |
|\ \ \ \ | |||||
| * | | | | Fix websocket trying to reconnect after a logout | JoramWilander | 2016-03-24 | 2 | -7/+13 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2537 from mattermost/oauth-fix | Christopher Speller | 2016-03-28 | 5 | -16/+19 |
|\ \ \ \ | |||||
| * | | | | Fix oauth routes and link issues | JoramWilander | 2016-03-24 | 5 | -16/+19 |
| |/ / / | |||||
* | | | | Merge pull request #2532 from mattermost/ldap-switch-fix | Christopher Speller | 2016-03-28 | 2 | -3/+12 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 | Elias Nahum | 2016-03-26 | 2 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #2544 from ZBoxApp/loc-fix | Christopher Speller | 2016-03-25 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | 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 | 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 | Elias Nahum | 2016-03-24 | 2 | -1/+9 |
| | |/ | |/| | |||||
* | | | Merge pull request #2534 from hmhealey/plt2184 | Corey Hulen | 2016-03-24 | 2 | -21/+6 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 / 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 |