summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
| * Update team_settings.jsxit332015-09-251-3/+3
| |
| * Update service_settings.jsxit332015-09-251-2/+2
| |
| * Minor wording changeit332015-09-251-1/+1
| |
| * Typo fixit332015-09-251-1/+1
| |
| * Fix capitalization typeit332015-09-251-1/+1
| |
* | 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-258-35/+55
| |\ \
| * | | plt-366 - Adding Windows 8 themeAsaad Mahmood2015-09-258-10/+43
| | | |
* | | | 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-251-2/+8
|\ \ \ \ | | | | | | | | | | Fixing 1 more case
| * | | | Fixing 1 more case=Corey Hulen2015-09-251-2/+8
| |/ / /
* | | | 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-252-14/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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-251-14/+14
| |\ \ \
| * | | | 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 #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
| |/
* / 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
* Fixing merge=Corey Hulen2015-09-2410-113/+111
|\
| * Merge pull request #789 from mattermost/PLT-362Harrison Healey2015-09-242-57/+35
| |\ | | | | | | PLT-362 removing themes and hiding OAuth provider option.
| | * Removing default theme no longer in use=Corey Hulen2015-09-241-22/+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
| | * | plt-298 - Improving UI for webhooksAsaad Mahmood2015-09-244-39/+61
| | | |
| * | | 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
| | |/ /