summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Multiple UI ImprovementsAsaad Mahmood2016-03-2914-0/+31
* Multiple UI ImprovementsAsaad Mahmood2016-03-288-16/+7395
* Merge pull request #2539 from ryoon/gnu-make-as-gmakeHarrison Healey2016-03-281-4/+4
|\
| * Replace 'make' with '$(MAKE)'Ryo ONODERA2016-03-251-4/+4
* | Merge pull request #2548 from rodrigocorsi2/pt-translationsHarrison Healey2016-03-282-14/+44
|\ \
| * | LDAP translations ptRodrigo Corsi2016-03-272-14/+44
* | | Merge pull request #2550 from mattermost/plt-2452Harrison Healey2016-03-281-1/+1
|\ \ \
| * | | Fixing Link being imported incorrectly. Fixes team creation.Christopher Speller2016-03-281-1/+1
* | | | Merge pull request #2546 from ZBoxApp/open-inviteJoram Wilander2016-03-281-1/+3
|\ \ \ \
| * | | | fix register account for teams with open invitesElias Nahum2016-03-261-1/+3
* | | | | Merge pull request #2545 from ryoon/no-travisJoram Wilander2016-03-281-2/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Mattermost does not appears to use travis ci anymoreRyo ONODERA2016-03-261-2/+0
| |/ / /
* | | | Merge pull request #2538 from mattermost/websocket-fixChristopher Speller2016-03-282-7/+13
|\ \ \ \
| * | | | Fix websocket trying to reconnect after a logoutJoramWilander2016-03-242-7/+13
| | |_|/ | |/| |
* | | | Merge pull request #2537 from mattermost/oauth-fixChristopher Speller2016-03-285-16/+19
|\ \ \ \
| * | | | Fix oauth routes and link issuesJoramWilander2016-03-245-16/+19
| |/ / /
* | | | Merge pull request #2532 from mattermost/ldap-switch-fixChristopher Speller2016-03-282-3/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove loc changeJoramWilander2016-03-241-1/+1
| * | | Fix chrome autocompleting using hidden inputJoramWilander2016-03-241-4/+12
| * | | Minor fix to let Sign-in Method settings show up when ldap is enabledJoramWilander2016-03-241-0/+1
* | | | Merge pull request #2547 from ZBoxApp/notifications-fixChristopher Speller2016-03-262-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix HTML Notifications not showingElias Nahum2016-03-262-0/+1
|/ / /
* | | Merge pull request #2544 from ZBoxApp/loc-fixChristopher Speller2016-03-251-1/+2
|\ \ \
| * | | Fix default Browser localeElias Nahum2016-03-251-1/+2
* | | | Merge pull request #2543 from hmhealey/safariFixChristopher Speller2016-03-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed typo safarifix -> safariFixhmhealey2016-03-251-1/+1
| | |/ | |/|
* | | Merge pull request #2533 from ZBoxApp/PLT-2358Corey Hulen2016-03-242-1/+9
|\ \ \
| * | | PLT-2358: Detect user localization using client headersElias Nahum2016-03-242-1/+9
| | |/ | |/|
* | | Merge pull request #2534 from hmhealey/plt2184Corey Hulen2016-03-242-21/+6
|\ \ \
| * | | Moved theme reset code to componentWillUnmountHarrison Healey2016-03-242-21/+6
* | | | Merge pull request #2535 from hmhealey/plt2446Corey Hulen2016-03-241-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Imported React into SearchSuggestionListHarrison Healey2016-03-241-0/+1
* | | | Merge pull request #2536 from numericube/masterJoram Wilander2016-03-243-0/+5061
|\ \ \ \
| * | | | Added FR translation / thanks to @jblobel and @tbolon for their helpPierre-Julien Grizel2016-03-243-0/+5061
|/ / / /
* | | | Merge pull request #2528 from hmhealey/plt2351Christopher Speller2016-03-2420-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Re-added Github emoji imagesHarrison Healey2016-03-2420-0/+0
| |/ /
* | | Merge pull request #2531 from mattermost/websocket-fixHarrison Healey2016-03-241-1/+1
|\ \ \
| * | | Removing extranious thisChristopher Speller2016-03-241-1/+1
| |/ /
* | | Merge pull request #2529 from mattermost/plt-2383Harrison Healey2016-03-2435-177/+152
|\ \ \ | |_|/ |/| |
| * | Modifying login not to display until it has finished checking. Caused admin c...Christopher Speller2016-03-242-3/+6
| * | Moving all links and redirects to react-routerChristopher Speller2016-03-2435-175/+147
* | | Merge pull request #2530 from mattermost/i18n-consolidationChristopher Speller2016-03-242-20/+29
|\ \ \ | |_|/ |/| |
| * | Consolidating i18n stuff into i18n.jsxChristopher Speller2016-03-242-20/+29
| |/
* | Merge pull request #2523 from hmhealey/plt2351Joram Wilander2016-03-242476-126/+8380
|\ \
| * | Fixed ESLint errorsHarrison Healey2016-03-241-19/+20
| * | Replaced EmojiOne emoji with Apple emojiHarrison Healey2016-03-232469-0/+0
| * | Change emoticon rendering code to use image files with unicode namesHarrison Healey2016-03-233-118/+8368
| * | Fixed unicode emoji not having a consistent sizeHarrison Healey2016-03-234-8/+11
* | | Merge pull request #2526 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-03-247-291/+327
|\ \ \ | |_|/ |/| |
| * | Multiple UI ImprovementsAsaad Mahmood2016-03-247-291/+327