summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #813 from asaadmahmoodspin/plt-366Corey Hulen2015-09-258-10/+43
|\ | | | | PLT-366 - Adding Windows 10 dark theme.
| * Merge branch 'master' of https://github.com/mattermost/platform into plt-366Asaad Mahmood2015-09-259-36/+62
| |\
| * | plt-366 - Adding Windows 8 themeAsaad Mahmood2015-09-258-10/+43
| | |
* | | Merge pull request #812 from hmhealey/plt256Corey Hulen2015-09-255-7/+38
|\ \ \ | | | | | | | | PLT-256 Add headers to getFile api calls from IE/Edge to trigger file download
| * | | Added headers to getFile requests from Microsoft browsers to trigger a downloadhmhealey2015-09-251-0/+14
| | | |
| * | | Updated mssola/user_agent libraryhmhealey2015-09-254-7/+24
| | | |
* | | | Merge pull request #811 from mattermost/plt-45Corey Hulen2015-09-252-4/+18
|\ \ \ \ | |_|_|/ |/| | | PLT-45 Force videos to be set dimensions.
| * | | Force videos to be set dimensions.JoramWilander2015-09-252-4/+18
| | | |
* | | | Merge pull request #810 from mattermost/fixing-redirect3Joram Wilander2015-09-252-3/+15
|\ \ \ \ | | | | | | | | | | Fixing 1 more case
| * | | | Fixing 1 more case=Corey Hulen2015-09-252-3/+15
| |/ / /
* | | | Merge pull request #809 from mattermost/scrolling-partial-fixJoram Wilander2015-09-251-8/+8
|\ \ \ \ | | | | | | | | | | Partial fix to scrolling issues. No longer jumps up from the bottom when RHS opens
| * | | | Partial fix to scrolling issues. No longer jumps up from the bottom when RHS ↵Christopher Speller2015-09-251-8/+8
| | | | | | | | | | | | | | | | | | | | opens
* | | | | Merge pull request #807 from mattermost/plt-248Christopher Speller2015-09-251-0/+6
|\ \ \ \ \ | | | | | | | | | | | | PLT-248 Fixes RHS not scrolling to show previews when file attached.
| * | | | | Fixes RHS not scrolling to show previews when file attached.JoramWilander2015-09-251-0/+6
| | | | | |
* | | | | | Merge pull request #808 from mattermost/fixing-redirect2Corey Hulen2015-09-254-4/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | fixing more redirect places
| * | | | | fixing more redirect places=Corey Hulen2015-09-254-4/+6
| | | | | |
* | | | | | Merge pull request #805 from mattermost/plt-250Joram Wilander2015-09-251-21/+27
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | PLT-250 Fix post list not resizing properly for file previews.
| * | | | | Fix post list not resizing properlu for file previews.JoramWilander2015-09-251-21/+27
| | |_|/ / | |/| | |
* | | | | Merge pull request #806 from mattermost/fixing-redirectHarrison Healey2015-09-252-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | redirect to team after login
| * | | | redirect to team after login=Corey Hulen2015-09-252-2/+2
| | |/ / | |/| |
* | | | Merge pull request #794 from mattermost/PLT-157Christopher Speller2015-09-256-83/+107
|\ \ \ \ | | | | | | | | | | PLT-157 Fixing blue bar and renders warning when mis-configured.
| * | | | Fixing typo=Corey Hulen2015-09-251-6/+6
| | | | |
| * | | | 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
| |\ \ \ | |/ / / |/| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 09:39:48 +0000