summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2548 from rodrigocorsi2/pt-translationsHarrison Healey2016-03-281-10/+28
|\
| * LDAP translations ptRodrigo Corsi2016-03-271-10/+28
* | Fixing Link being imported incorrectly. Fixes team creation.Christopher Speller2016-03-281-1/+1
* | 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-283-13/+13
|\ \ \
| * | | Fix oauth routes and link issuesJoramWilander2016-03-243-13/+13
| |/ /
* | | 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
* | | 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
* | | | Added FR translation / thanks to @jblobel and @tbolon for their helpPierre-Julien Grizel2016-03-242-0/+1387
* | | | 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
* | | Add claim LDAP locs in spanishElias Nahum2016-03-232-26/+49
|/ /
* | Merge pull request #2519 from mattermost/search-store-fixChristopher Speller2016-03-231-31/+9
|\ \
| * | Moving search store to memoryChristopher Speller2016-03-231-31/+9
| |/
* | Merge pull request #2520 from hmhealey/prefsChristopher Speller2016-03-232-7/+11
|\ \
| * | Fixed tutorial step preferences to be saved as stringsHarrison Healey2016-03-232-7/+11
| |/
* | Merge pull request #2465 from mattermost/plt-2260Christopher Speller2016-03-2312-190/+567
|\ \
| * | Fix imports and change ldap function nameJoramWilander2016-03-235-9/+9
| * | Add the ability to switch from email to ldap and backJoramWilander2016-03-2312-195/+572
| |/
* | Merge pull request #2494 from hmhealey/plt2190Christopher Speller2016-03-236-66/+53
|\ \
| * | Switched Textbox to use a TextareaAutosize and removed custom resizing codeHarrison Healey2016-03-216-66/+53
* | | Merge pull request #2517 from mattermost/plt-2379Joram Wilander2016-03-234-66/+48
|\ \ \