summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1711 from asaadmahmoodspin/code-themesCorey Hulen2015-12-1411-25/+73
|\ | | | | Multiple UI Improvements
| * Removing sidebar right fixAsaad Mahmood2015-12-141-1/+5
| |
| * Fixing sidebar--rightAsaad Mahmood2015-12-141-5/+1
| |
| * Merge branch 'master' of https://github.com/mattermost/platform into code-themesAsaad Mahmood2015-12-148-45/+332
| |\
| * | Updating the naming for the docs pageAsaad Mahmood2015-12-142-2/+2
| | |
| * | Multiple UI ImprovementsAsaad Mahmood2015-12-1110-24/+72
| | |
* | | Merge pull request #1690 from npcode/trim-outgoing-callback-urlHarrison Healey2015-12-141-1/+1
|\ \ \ | | | | | | | | Trim callback urls for outgoing webhooks
| * | | Trim callback urls for outgoing webhooksYi EungJun2015-12-121-1/+1
| | | | | | | | | | | | | | | | Adding traling whitespace is common mistake.
* | | | Merge pull request #1697 from asaadmahmoodspin/masterHarrison Healey2015-12-142-14/+21
|\ \ \ \ | | | | | | | | | | FIxing scroll for more direct channels
| * | | | ADding utilis mobile instead of widthAsaad Mahmood2015-12-111-3/+3
| | | | |
| * | | | Updating direct messages codeAsaad Mahmood2015-12-111-1/+1
| | | | |
| * | | | Updating code for direct messagesAsaad Mahmood2015-12-102-3/+5
| | | | |
| * | | | FIxing scroll for more direct channelsAsaad Mahmood2015-12-102-14/+19
| | | | |
* | | | | Merge pull request #1716 from rgarmsen2295/plt-1453Harrison Healey2015-12-141-7/+8
|\ \ \ \ \ | | | | | | | | | | | | PLT-1453 No longer errors upon saving the same info in Account Settings -> General
| * | | | | No longer errors upon saving the same info in Account Settings -> GeneralReed Garmsen2015-12-111-7/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #1717 from rgarmsen2295/plt-1026Harrison Healey2015-12-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-1026 Bolds the team name when the team's statistics page is selected in the system console
| * | | | | When a team's statistics is selected in the sys console the team name is now ↵Reed Garmsen2015-12-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | also bolded
* | | | | Merge pull request #1720 from rgarmsen2295/plt-860Harrison Healey2015-12-142-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+'
| * | | | Fixed issue with emails containing a '+'Reed Garmsen2015-12-131-1/+1
| | | | |
| * | | | Updated emails in unit tests to include '+'Reed Garmsen2015-12-131-2/+2
| |/ / /
* | | | Merge pull request #1588 from rgarmsen2295/plt-881Joram Wilander2015-12-128-45/+332
|\ \ \ \ | |/ / / |/| | | PLT-881 Adds Legal and Support Settings to the System Console
| * | | Added legal and support settings to sys console and implemented support for ↵Reed Garmsen2015-12-108-45/+332
| | | | | | | | | | | | | | | | options in app
* | | | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-116-30/+57
|\ \ \ \ | | | | | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists
| * | | | Changed Sidebar direct channel list to be driven by preferenceshmhealey2015-12-082-17/+31
| | | | |
| * | | | Moved logic for making direct channels visible to both members on post to ↵hmhealey2015-12-071-13/+2
| | | | | | | | | | | | | | | | | | | | the server
| * | | | Added preference_changed web socket eventhmhealey2015-12-074-4/+28
| | | | |
* | | | | Merge pull request #1703 from rgarmsen2295/plt-583Christopher Speller2015-12-111-6/+13
|\ \ \ \ \ | | | | | | | | | | | | PLT-583 Disables the ability to send email invites when user creation is disabled
| * | | | | Disables the ability to send email invites when user creation is disabledReed Garmsen2015-12-101-6/+13
| | | | | |
* | | | | | Merge pull request #1702 from rgarmsen2295/plt-1047Christopher Speller2015-12-113-21/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1047 Fixed issue with Team Settings modal visually saving items instead of cancelling
| * | | | | | Fixed issue with Team Settings modal saving items instead of cancelling; ↵Reed Garmsen2015-12-103-21/+32
| |/ / / / / | | | | | | | | | | | | | | | | | | changed remaining copyrights
* | | | | | Merge pull request #1698 from rgarmsen2295/plt-1346Christopher Speller2015-12-111-32/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-1346 Hides the ability to enable team listing on a team where it's been disabled in the system console
| * | | | | | Disabling ability to enable team listing on a system where ↵Reed Garmsen2015-12-101-32/+52
| |/ / / / / | | | | | | | | | | | | | | | | | | EnableTeamListing=false
* | | | | | Merge pull request #1684 from hmhealey/plt1184Joram Wilander2015-12-113-20/+43
|\ \ \ \ \ \ | |/ / / / / |/| | | | | PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made
| * | | | | Fixed EditChannelHeaderModal's contents not always being updated when a ↵hmhealey2015-12-103-20/+43
| | | | | | | | | | | | | | | | | | | | | | | | change is made
* | | | | | Revert "add helper method to add ephemeral messages; also switch 'delete ↵Christopher Speller2015-12-105-103/+48
| | | | | | | | | | | | | | | | | | | | | | | | mess…"
* | | | | | add helper method to add ephemeral messages; also switch 'delete message' to ↵Florian Orben2015-12-095-48/+103
| |_|_|/ / |/| | | | | | | | | | | | | | this new method
* | | | | Merge pull request #1678 from mattermost/plt-1402Corey Hulen2015-12-094-8/+15
|\ \ \ \ \ | |/ / / / |/| | | | PLT-1402 Fix OEmbeds when switching channel, vine/soundcloud heights, and yout…
| * | | | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embedsJoramWilander2015-12-094-8/+15
| | | | |
* | | | | Merge pull request #1674 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-12-092-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Ui improvements
| * | | | Improving pencil icon for manage membersAsaad Mahmood2015-12-091-1/+3
| | | | |
| * | | | Removing clearfix from modal bodyAsaad Mahmood2015-12-091-1/+0
| | | | |
* | | | | Merge pull request #1672 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-09146-324/+47799
|\| | | | | | | | | | | | | | Multiple UI Improvements
| * | | | Multiple UI ImprovementsAsaad Mahmood2015-12-09146-324/+47799
| | | | |
* | | | | Merge pull request #1670 from mattermost/plt-1407Corey Hulen2015-12-091-2/+9
|\ \ \ \ \ | |/ / / / |/| | | | PLT-1407 Delay center scroll when sidebar opens to be after animation
| * | | | Delay center scroll when sidebar opens to be after animationJoramWilander2015-12-091-2/+9
| | | | |
* | | | | Merge pull request #1671 from hmhealey/plt1430Christopher Speller2015-12-093-16/+2
|\ \ \ \ \ | | | | | | | | | | | | PLT-1430 Removed space bar from autocompletes
| * | | | | Removed space bar from autocompleteshmhealey2015-12-093-16/+2
| |/ / / /
* | | | | Merge pull request #1663 from mattermost/PLT-1418Joram Wilander2015-12-093-1/+53
|\ \ \ \ \ | | | | | | | | | | | | PLT-1418 Adding old style replying in RHS
| * \ \ \ \ Fixing merge=Corey Hulen2015-12-0815-39/+59
| |\ \ \ \ \
| * | | | | | PLT-1418 Adding old style replying in RHS=Corey Hulen2015-12-083-2/+54
| | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 00:32:53 +0000