summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Collapse)AuthorAgeFilesLines
* 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 images
| * 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 this in websockets.
| * | Removing extranious thisChristopher Speller2016-03-241-1/+1
| |/
* | Merge pull request #2529 from mattermost/plt-2383Harrison Healey2016-03-2435-177/+152
|\ \ | | | | | | PLT-2383 Fixed system console login page flash.
| * | Modifying login not to display until it has finished checking. Caused admin ↵Christopher Speller2016-03-242-3/+6
| | | | | | | | | | | | console to redirect to town-square. Will be changed after user model flip.
| * | 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 into i18n.jsx
| * | Consolidating i18n stuff into i18n.jsxChristopher Speller2016-03-242-20/+29
| |/
* | Merge pull request #2523 from hmhealey/plt2351Joram Wilander2016-03-242476-126/+8380
|\ \ | | | | | | PLT-2351 Switch to Apple emoji set
| * | 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 Improvements
| * | 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 memory
| * | 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 strings
| * | 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
|\ \ | | | | | | PLT-2260 Add the ability to switch from email to ldap and back
| * | 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
|\ \ | | | | | | PLT-2190 Switched Textbox to use a TextareaAutosize and removed custom resizing code
| * | 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
|\ \ \ | | | | | | | | PLT-2379, PLT-2432 Fixing browser store issue.
| * | | 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 improvements
| * | Multiple UI improvementsAsaad Mahmood2016-03-2319-52/+66
| | |
* | | Merge pull request #2516 from hmhealey/disableautolinkerJoram Wilander2016-03-231-2/+8
|\ \ \ | | | | | | | | Disabled autolinker
| * | | 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 memory
| * | | Changed PreferenceStore to store data in memoryHarrison Healey2016-03-238-150/+118
| |/ /
* / / Fixing websocket connection issue. Refactoring websockets into an action ↵Christopher Speller2016-03-2311-430/+495
|/ / | | | | | | creator.
* | 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 #2495 from hmhealey/plt2317aJoram Wilander2016-03-224-53/+68
|\ \ | | | | | | PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props
| * | Changed RhsComment to receive the current user through propsHarrison Healey2016-03-212-6/+7
| | |
| * | Passed currentUser into RhsRootPostHarrison Healey2016-03-213-47/+61
| |/
* | Merge pull request #2499 from hmhealey/plt2284Joram Wilander2016-03-221-0/+11
|\ \ | | | | | | PLT-2284 Re-added ChannelMembersModal on mobile
| * | Re-added ChannelMembersModal on mobileHarrison Healey2016-03-211-0/+11
| | |
* | | Merge pull request #2500 from ZBoxApp/es-locsCorey Hulen2016-03-212-2/+4
|\ \ \ | | | | | | | | Add admin support es locs
| * | | Add admin support es locsElias Nahum2016-03-212-2/+4
| |/ /
* / / Fixing intl on SafariChristopher Speller2016-03-212-4/+24
|/ /
* | Merge pull request #2491 from rodrigocorsi2/compliance_pt_locJoram Wilander2016-03-211-4/+46
|\ \ | | | | | | Translation compliance and others in pt
| * | Translation compliance and others ptRodrigo Corsi2016-03-211-4/+46
| |/
* / Merge release branch commitsChristopher Speller2016-03-216-75/+49
|/
* Merge pull request #2481 from khoa-le/PLT-2018Christopher Speller2016-03-211-1/+5
|\ | | | | PLT-2018 After clicking "Use a different address" hitting enter should submit …
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-08-04 19:34:39 +0000