summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | | Fix ESLint for code_preview.jsxElias Nahum2016-03-172-4/+1
| | | |
| * | | Option to enable full snippets in push notificationsElias Nahum2016-03-173-3/+53
| | | |
* | | | Fxing make cleanChristopher Speller2016-03-171-1/+1
| |_|/ |/| |
* | | Fixing style issue caused by build changesChristopher Speller2016-03-172-4/+1
|/ /
* | Merge pull request #2380 from rodrigocorsi2/code_previewChristopher Speller2016-03-179-111/+434
|\ \ | | | | | | Created component CodePreview
| * | Created component CodePreviewRodrigo Corsi2016-03-179-111/+434
| | |
* | | Merge pull request #2461 from hmhealey/teamdefaultChristopher Speller2016-03-173-4/+4
|\ \ \ | | | | | | | | Changed 'show username' display text to be more accurate
| * | | Changed 'show username' display text to be more accurateHarrison Healey2016-03-173-4/+4
| | | |
* | | | Merge pull request #2462 from mattermost/plt-2340Christopher Speller2016-03-173-12/+43
|\ \ \ \ | |_|/ / |/| | | PLT-2340 Webpack optimizations and fixes
| * | | Webpack optimizations and fixesChristopher Speller2016-03-173-12/+43
| | | |
* | | | Merge pull request #2169 from kernicPanel/external-slashcommands-managementChristopher Speller2016-03-179-128/+214
|\ \ \ \ | |/ / / |/| | | PLT-2183 Slash command auto-complete
| * | | toggle incompatible settings viewsNicolas Clerc2016-03-171-119/+135
| | | |
| * | | wording + localizationNicolas Clerc2016-03-172-2/+3
| | | |
| * | | use pre-released featuresNicolas Clerc2016-03-174-29/+56
| | | |
| * | | eslint error: validate suggestion_box channelId propNicolas Clerc2016-03-171-0/+1
| | | |
| * | | fix eslint errorsNicolas Clerc2016-03-171-4/+1
| | | |
| * | | add external slashcommands managementNicolas Clerc2016-03-176-10/+54
| | | |
* | | | Changed mention parser to ignore empty string mentionsHarrison Healey2016-03-171-0/+5
| |/ / |/| |
* | | Merge pull request #2448 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-1755-1294/+1463
|\ \ \ | |_|/ |/| | Updating sass lint stuff with other scss improvements
| * | Reordering styles.scss fileAsaad Mahmood2016-03-171-1/+1
| | |