summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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.
* | | | | | Merge pull request #770 from hmhealey/plt339Corey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | PLT-339 Changed Markdown links to open in a new tab
| * | | | | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
|/ / / / /
* | | | | Merge pull request #768 from mattermost/segment-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fixing segment bug
| * | | | | fixing segment bug=Corey Hulen2015-09-231-1/+1
| | | | | |
* | | | | | Merge pull request #767 from mattermost/segment-fixCorey Hulen2015-09-231-1/+0
|\| | | | | | |_|/ / / |/| | | | fixing segment bug
| * | | | fixing segment bug=Corey Hulen2015-09-231-1/+0
|/ / / /
* | | | Merge pull request #762 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-09-233-0/+30
|\ \ \ \ | | | | | | | | | | Markdown UI improvements with small description height fix
| * | | | Markdown UI improvements with small description height fixAsaad Mahmood2015-09-233-0/+30
| | | | |
* | | | | Merge pull request #752 from mattermost/PLT-11-emailCorey Hulen2015-09-2361-1127/+3196
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
| * | | | Changing image settings to file settings=Corey Hulen2015-09-2315-134/+134
| | | | |
| * | | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-2368-353/+1504
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Merge pull request #764 from mattermost/theme-image-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix theme images 404ing.
| * | | Fix theme images 404ing.JoramWilander2015-09-231-1/+1
|/ / /
* | | Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
|\ \ \ | | | | | | | | PLT-356 Fix post not rendering properly in some cases.
| * | | Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36
| | | |
* | | | Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-2341-189/+1161
|\ \ \ \ | |_|_|/ |/| | | PLT-242 Implement custom UI theme colors.
| * | | Implement UI theme colors.JoramWilander2015-09-2341-189/+1161
| | | |
* | | | Merge pull request #753 from hmhealey/plt341Corey Hulen2015-09-231-1/+12
|\ \ \ \ | |_|/ / |/| | | PLT-341 Added CSS classes to markdown headings, links, and tables
| * | | Added CSS classes to markdown headings, links, and tableshmhealey2015-09-231-1/+12
| | | |
* | | | Merge pull request #760 from chengweiv5/PLT-126Harrison Healey2015-09-237-11/+11
|\ \ \ \ | |/ / / |/| | | PLT-126: Change 'Private Messages' to 'Direct Messages'
| * | | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-237-11/+11
|/ / / | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-236-8/+16
|\ \ \ | | | | | | | | UI Modifications for multiple tickets
| * | | Removing click event for channel description popoverAsaad Mahmood2015-09-221-1/+1
| | | |
| * | | UI Modifications for multiple ticketsAsaad Mahmood2015-09-225-7/+15
| | | |
* | | | Merge pull request #756 from rgarmsen2295/plt-165Joram Wilander2015-09-231-8/+15
|\ \ \ \ | | | | | | | | | | PLT-165 Prevents users from signing up via a public link using a non-valid email address
| * | | | Adds a check for email validity client-side when joining a team using a ↵Reed Garmsen2015-09-221-8/+15
| | | | | | | | | | | | | | | | | | | | public link
* | | | | Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
|\ \ \ \ \ | | | | | | | | | | | | PLT-168: check email used to reset password strictly
| * | | | | PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | | | | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly
| * | | | | | Functionalized draft checkingReed Garmsen2015-09-221-24/+26
| | | | | | |
| * | | | | | Post drafts are now displayed when they contain only files and no textReed Garmsen2015-09-221-2/+2
| | | | | | |
| * | | | | | Small change to remove react warningReed Garmsen2015-09-221-0/+1
| | |/ / / / | |/| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 03:10:37 +0000