summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | 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
| | | | | | |
* | | | | | | set transparent png background to whiteJack2015-09-241-1/+10
| | | | | | |
* | | | | | | godep fixJack2015-09-236-0/+1656
| | | | | | |
* | | | | | | add imagingJack2015-09-239-0/+1984
| | | | | | |
* | | | | | | godep saveJack2015-09-2346-5388/+8
| | | | | | |
* | | | | | | use github.com/disintegration/imagingJack2015-09-233-54/+26
|/ / / / / /
* | | | | | 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
| | | | |