summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Partial fix to scrolling issues. No longer jumps up from the bottom when RHS ↵Christopher Speller2015-09-251-8/+8
| | | | opens
* Merge pull request #795 from chengweiv5/fix-typoJoram Wilander2015-09-251-2/+2
|\ | | | | Fix a typo and trailing space: adminsiter -> administer
| * Fix a typo and trailing space: adminsiter -> administerChengwei Yang2015-09-251-2/+2
| | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | Merge pull request #792 from esethna/patch-2Christopher Speller2015-09-251-1/+41
|\ \ | |/ |/| Update NOTICE.txt to include emoji license info V2
| * Update NOTICE.txt to include emoji license info V3esethna2015-09-241-3/+6
| | | | | | Tweaked the license info as per chat with Ian
| * Update NOTICE.txt to include emoji license info V2esethna2015-09-241-0/+37
|/ | | Added to the bottom of the file
* Merge pull request #787 from mattermost/PLT-30Corey Hulen2015-09-247-291/+5
|\ | | | | PLT-30 Removing old valet crud
| * Fixing merge=Corey Hulen2015-09-2415-121/+111
| |\ | |/ |/|
* | Merge pull request #789 from mattermost/PLT-362Harrison Healey2015-09-247-65/+35
|\ \ | | | | | | PLT-362 removing themes and hiding OAuth provider option.
| * | fixing issue=Corey Hulen2015-09-241-1/+0
| | |
| * | Removing default theme no longer in use=Corey Hulen2015-09-246-29/+0
| | |
| * | Disabling OAuth provider for 0.8=Corey Hulen2015-09-241-35/+35
| | |
* | | Merge pull request #785 from mattermost/PLT-203Joram Wilander2015-09-241-10/+3
|\ \ \ | | | | | | | | Partial fix for PLT-203
| * | | Partial fix for PLT-203=Corey Hulen2015-09-241-10/+3
| | | |
* | | | Merge pull request #788 from hmhealey/plt379Christopher Speller2015-09-241-4/+3
|\ \ \ \ | |_|/ / |/| | | PLT-379 Removed smilies that start with a semicolon
| * | | Removed smilies that start with a semicolonhmhealey2015-09-241-4/+3
| | | |
* | | | Merge pull request #782 from asaadmahmoodspin/plt-298Joram Wilander2015-09-244-39/+61
|\ \ \ \ | |/ / / |/| | | plt-298 - Improving UI for webhooks
| * | | Removing config file EnableIncomingWebhooks to falseAsaad Mahmood2015-09-241-1/+1
| | | |
| * | | plt-298 - Improving UI for webhooksAsaad Mahmood2015-09-245-40/+62
| | | |
* | | | Merge pull request #783 from mattermost/plt-287Harrison Healey2015-09-241-1/+3
|\ \ \ \ | | | | | | | | | | PLT-287 Hiding export from UI
| * | | | Hiding export from UIChristopher Speller2015-09-241-1/+3
| |/ / /
* | | | Merge pull request #784 from mattermost/img-modal-fixHarrison Healey2015-09-241-2/+6
|\ \ \ \ | |/ / / |/| | | Fixing arrow keys in preview image modal
| * | | Fixing arrow keys in preview image modalChristopher Speller2015-09-241-2/+6
|/ / /
| | * Removing old valet crud=Corey Hulen2015-09-247-291/+5
| |/ |/|
* | Merge pull request #780 from hmhealey/plt258Joram Wilander2015-09-242-2/+20
|\ \ | | | | | | PLT-258 Added help text to notification settings to say which browsers support them
| * | Added help text to notification settings to say which browsers support themhmhealey2015-09-242-2/+20
| | |
* | | Merge pull request #781 from hmhealey/plt332Joram Wilander2015-09-243-9/+3
|\ \ \ | | | | | | | | PLT-332 Improved date tooltips
| * | | Changed format of date tooltipshmhealey2015-09-241-1/+1
| | | |
| * | | Removed timestamp tooltips from posts in the RHShmhealey2015-09-242-8/+2
| |/ /
* | | Merge pull request #779 from mattermost/plt-294Corey Hulen2015-09-248-165/+179
|\ \ \ | | | | | | | | PLT-294 Converting preview image modal to use react-bootstrap.
| * | | Converting preview image modal to use react-bootstrap. Fixes issue where ↵Christopher Speller2015-09-248-165/+179
| |/ / | | | | | | | | | modal would appear behind background on iOS
* | | Merge pull request #778 from mattermost/plt-43Corey Hulen2015-09-242-1/+11
|\ \ \ | |/ / |/| | PLT-43 Fixes backspace navigating back a page.
| * | Fixes backspace navigating back a page.JoramWilander2015-09-242-1/+11
| | |
* | | Merge pull request #777 from asaadmahmoodspin/plt-363Harrison Healey2015-09-249-31/+58
|\ \ \ | |/ / |/| | plt-363 - Adding organisation theme
| * | plt-363 - Adding organisation themeAsaad Mahmood2015-09-249-31/+58
|/ /
* | Merge pull request #771 from rgarmsen2295/plt-143Harrison Healey2015-09-245-4/+25
|\ \ | | | | | | PLT-143 Support for text drag and drop
| * | Text cursor now focuses on the textbox after performing a drag and drop of ↵Reed Garmsen2015-09-232-6/+6
| | | | | | | | | | | | some text
| * | Added support to drag and drop text into the main textbox or RHS textboxReed Garmsen2015-09-233-1/+16
| | |
| * | Small fix for react key warningReed Garmsen2015-09-232-3/+9
| | |
* | | Merge pull request #776 from mishimi/patch-5Harrison Healey2015-09-241-1/+1
|\ \ \ | | | | | | | | PLT-388 Added warning that @mentions from Slack are not imported
| * | | PLT-388mishimi2015-09-241-1/+1
| | |/ | |/| | | | Warning users that @mentions from Slack are currently not supported after import
* | | Merge pull request #765 from mattermost/PLT-349Christopher Speller2015-09-2424-171/+1279
|\ \ \ | | | | | | | | PLT-349 adding team mgt to admin console
| * | | Assiging first user system_admin role=Corey Hulen2015-09-234-0/+51
| | | |
| * | | Fixing state setting=Corey Hulen2015-09-235-33/+102
| | | |
| * | | Fixing merge=Corey Hulen2015-09-2383-489/+1669
| |\ \ \
| * | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2322-162/+1150
| | | | |
* | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-242-1/+23
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-334 Restricted markdown output to only appear on one line when in singleline mode
| * | | | Restricted markdown output to only appear on one line when in singleline modehmhealey2015-09-232-1/+23
| | | | |
* | | | | Merge pull request #766 from mattermost/postpone-oauth-and-webhooksCorey Hulen2015-09-231-5/+0
|\ \ \ \ \ | | | | | | | | | | | | Removing OAuth and webhooks changes
| * | | | | Removing OAuth and webhooks changesit332015-09-231-5/+0
| | | | | | | | | | | | | | | | | | While OAuth2 and webhooks are in the codebase, the UI was only partly finished and we foresee enough time for testing before shipping Oct 2 so we're postponing these to the Oct 16 release.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 18:32:21 +0000