summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Collapse)AuthorAgeFilesLines
* 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 …
| * After clicking "Use a different address" hitting enter should submit the ↵Khoa, Le Ngoc2016-03-191-1/+5
| | | | | | | | "Use this instead" button
* | System Console > Legal and Support Settings: If a link does not include http ↵Khoa, Le Ngoc2016-03-192-1/+18
|/ | | | or https, it does not open properly
* Merge pull request #2473 from ZBoxApp/compliance-esCorey Hulen2016-03-182-37/+74
|\ | | | | Add spanish translations for compliance
| * Add spanish translations for complianceElias Nahum2016-03-182-39/+74
| |
* | Revert "PLT-2183 Slash command auto-complete"Christopher Speller2016-03-189-214/+128
| |
* | Merge pull request #2472 from ZBoxApp/PLT-2392Christopher Speller2016-03-182-2/+3
|\ \ | | | | | | PLT-2392: Fix for Notification sound broken
| * | PLT-2392: Fix for Notification sound brokenElias Nahum2016-03-182-2/+3
| |/
* / PLT-2368: Fix for Date of last profile picture update is showing ↵Elias Nahum2016-03-181-14/+16
|/ | | | [object][object]
* Merge pull request #2470 from mattermost/plt-2380Joram Wilander2016-03-183-25/+60
|\ | | | | PLT-2380 Improvements to webpack build system + watch mode
| * Creating sepearate dev and prod webpack builds. Enabled webpack watch mode. ↵Christopher Speller2016-03-183-25/+60
| | | | | | | | Updated to latest master webpack to fix bug in watch mode
* | Merge pull request #2442 from mattermost/PLT-2115Corey Hulen2016-03-1712-26/+847
|\ \ | |/ |/| PLT-2115 adding compliance feature
| * Fixing localization stuff=Corey Hulen2016-03-171-3/+0
| |
| * Fixing localization stuff=Corey Hulen2016-03-171-20/+8
| |
| * Fixing merge=Corey Hulen2016-03-1773-1548/+2159
| |\
| * | Fixing webpack=Corey Hulen2016-03-162-0/+3
| | |
| * | Fixing merge=Corey Hulen2016-03-162-0/+660
| | |
| * | merging files=Corey Hulen2016-03-1610-26/+199
| | |
* | | Merge pull request #2418 from ZBoxApp/PLT-2053Christopher Speller2016-03-173-3/+53
|\ \ \ | | | | | | | | PLT-2053: Option to enable full snippets in push notifications