summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | Merge pull request #2522 from ZBoxApp/es-locsChristopher Speller2016-03-244-46/+81
|\ \ \ | |/ / |/| |
| * | Add claim LDAP locs in spanishElias Nahum2016-03-234-46/+81
|/ /
* | 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-2320-225/+927
|\ \
| * | Fix imports and change ldap function nameJoramWilander2016-03-237-11/+11
| * | Add the ability to switch from email to ldap and backJoramWilander2016-03-2320-230/+932
| |/
* | 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
|\ \ \
| * | | Fixing browser store issue.Christopher Speller2016-03-234-66/+48
| | |/ | |/|
* | | Merge pull request #2509 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-03-2319-52/+66
|\ \ \ | |/ / |/| |
| * | Multiple UI improvementsAsaad Mahmood2016-03-2319-52/+66
* | | Merge pull request #2516 from hmhealey/disableautolinkerJoram Wilander2016-03-231-2/+8
|\ \ \
| * | | Disabled autolinkerHarrison Healey2016-03-231-2/+8
* | | | Merge pull request #2515 from hmhealey/prefsJoram Wilander2016-03-238-150/+118
|\ \ \ \ | |/ / / |/| | |
| * | | Changed PreferenceStore to store data in memoryHarrison Healey2016-03-238-150/+118
* | | | Merge pull request #2512 from mattermost/plt-2473Corey Hulen2016-03-2311-430/+495
|\ \ \ \
| * | | | Fixing websocket connection issue. Refactoring websockets into an action crea...Christopher Speller2016-03-2311-430/+495
| |/ / /
* | | | Merge pull request #2508 from mattermost/mf-fixesCorey Hulen2016-03-232-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Removing static test. Adding start-docker as a dep for run-server.Christopher Speller2016-03-222-2/+3
| |/ /
* | | Merge pull request #2507 from stupied4ever/patch-1Christopher Speller2016-03-231-1/+1
|\ \ \ | |/ / |/| |
| * | Fix typoRafael da Silva Almeida2016-03-221-1/+1
* | | Merge pull request #2498 from hmhealey/plt2285Corey Hulen2016-03-228-54/+171
|\ \ \ | |/ / |/| |
| * | Added SpinnerButton component to handle buttons that are also spinnersHarrison Healey2016-03-224-31/+65
| * | Adding loading indicator after clicking invite channel member buttonHarrison Healey2016-03-225-40/+123
|/ /
* | Merge pull request #2496 from mattermost/fix-postgres-bugChristopher Speller2016-03-221-5/+0
|\ \
| * | Removing old schema upgrades affecting postgres=Corey Hulen2016-03-211-5/+0