summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge branch 'master' into PLT-157=Corey Hulen2015-09-258-38/+70
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Fixing eslint=Corey Hulen2015-09-241-1/+0
| | | | | | |
| * | | | | | Fixing blue bar and renders warning when mis-configured.=Corey Hulen2015-09-246-82/+107
| | | | | | |
* | | | | | | Merge pull request #797 from asaadmahmoodspin/bug-fixesChristopher Speller2015-09-257-24/+56
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Bug fixes and UI improvements for multiple tickets
| * | | | | | Using react tooltip for timestamp in center channel instead of normal bootstrapAsaad Mahmood2015-09-254-9/+13
| | | | | | |
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into bug-fixesAsaad Mahmood2015-09-253-17/+57
| |\ \ \ \ \ \
| * | | | | | | Adding margin bot to videosAsaad Mahmood2015-09-251-0/+1
| | | | | | | |
| * | | | | | | Improving uploader name and video type for videosAsaad Mahmood2015-09-251-4/+2
| | | | | | | |
| * | | | | | | Bug fixes and UI improvements for multiple ticketsAsaad Mahmood2015-09-2510-20/+49
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #803 from mattermost/plt-405Corey Hulen2015-09-251-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-405 Fixes youtube videos causing random scrolling.
| * | | | | | | Fixes youtube videos causing random scrolling.JoramWilander2015-09-251-1/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #802 from mattermost/plt-291Corey Hulen2015-09-252-11/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | PLT-291 Fixing 404 page props
| * | | | | | Fixing 404 page propsChristopher Speller2015-09-242-11/+6
| | | | | | |
* | | | | | | Merge pull request #793 from hmhealey/plt367Joram Wilander2015-09-251-0/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | PLT-367 Added a json response to the uploadProfileImage api call
| * | | | | | Added a json response to the uploadProfileImage api callhmhealey2015-09-241-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #799 from mattermost/plt-31-2Harrison Healey2015-09-254-21/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-31 Added welcome email back in.
| * | | | | | Added welcome email back in.JoramWilander2015-09-254-21/+8
| | | | | | |
* | | | | | | Merge pull request #801 from mattermost/plt-376Harrison Healey2015-09-251-0/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | PLT-376 Fix account settings being scrolled to bottom when opened.
| * | | | | | Fix acconut settings being scrolled to bottom when opened.JoramWilander2015-09-251-0/+2
| | | | | | |
* | | | | | | Merge pull request #800 from mishimi/patch-7Christopher Speller2015-09-251-14/+14
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | PLT 381 In Theme Color settings, change the "Button Color" to "Button…
| * | | | | | PLT 381 In Theme Color settings, change the "Button Color" to "Button Text"mishimi2015-09-251-14/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made the following changes 1. Capitalize all words 2. Remove the word "color" if it comes after "text" Ex. Sidebar text color --> Sidebar Text
* | | | | | 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.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 08:13:15 +0000