summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Renamed show_hide preference to showhmhealey2015-10-134-7/+15
|
* Made direct channels visible when receiving a message on onehmhealey2015-10-131-0/+12
|
* Changed direct messages channels so users can show/hide themhmhealey2015-10-135-164/+143
|
* Changed direct channels in the sidebar to be displayed based on user preferenceshmhealey2015-10-135-37/+308
|
* Merge pull request #1007 from florianorben/PLT-486Joram Wilander2015-10-1314-0/+19
|\ | | | | PLT-486: Remove spell check feature from input boxes during signup flow
| * PLT-486: Remove spell check feature from input boxes during signup flowFlorian Orben2015-10-1214-0/+19
| | | | | | | | Add spellcheck="false" attribute to login and signup form inputs
* | Merge pull request #987 from hmhealey/plt521Joram Wilander2015-10-132-8/+39
|\ \ | | | | | | PLT-521 Modified markdown lexer to not break up words written in snake_case
| * | Modified markdown lexer to not break up words written in snake_casehmhealey2015-10-092-8/+39
| | |
* | | Merge release branch 'release-1.1.0'Christopher Speller2015-10-131-1/+1
|\ \ \
| * | | PLT-596 - Update to email verification titleit332015-10-121-1/+1
| | | |
* | | | Merge branch 'master' into PLT-590Maxim2015-10-1323-83/+108
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-122-35/+36
| |\| | | | | | | | | | Release 1.1.0rc merging to master
| | * | Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-122-2/+2
| | |\ \
| | * | | PLT-586 fixing issues with security alert=Corey Hulen2015-10-092-35/+36
| | | |/ | | |/|
| * | | Merge pull request #1018 from asaadmahmoodspin/ui-fixesCorey Hulen2015-10-1211-25/+53
| |\ \ \ | | | | | | | | | | Other UI Improvements
| | * \ \ Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2015-10-129-20/+18
| | |\ \ \
| | * | | | Removing padding from post comment cell in RHSAsaad Mahmood2015-10-121-0/+3
| | | | | |
| | * | | | Other UI ImprovementsAsaad Mahmood2015-10-1210-25/+50
| | | |_|/ | | |/| |
| * | | | Merge pull request #1009 from mattermost/update-help-textCorey Hulen2015-10-121-1/+0
| |\ \ \ \ | | | | | | | | | | | | Updating help text
| | * | | | Update get_link_modal.jsxit332015-10-111-1/+0
| | |/ / / | | | | | | | | | | Removing out-of-date text saying that anyone can join a team from invite link, since there are now options to restrict sign-up based on email domain and SSO options
| * | | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
| |\ \ \ \ | | |_|/ / | |/| | | Fixed typos
| | * | | Merge branch 'master' into typosJoram Wilander2015-10-123-3/+3
| | |\| |
| | * | | Fixed typosit332015-10-081-2/+1
| | | | | | | | | | | | | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username"
| * | | | Multiple UI ImprovementsAsaad Mahmood2015-10-129-20/+18
| | |/ / | |/| |
* / | | PLT-590: Change "Manage Team" to "Manage Members"Potapov Max2015-10-122-2/+2
|/ / /
* | | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| | |
* | | Update user_settings_integrations.jsxit332015-10-091-1/+1
| | |
* | | Update manage_incoming_hooks.jsxit332015-10-091-1/+1
| |/ |/|
* | Fixing broken travis release buildChristopher Speller2015-10-081-1/+1
|/
* Fixed html used for autolinkinghmhealey2015-10-081-1/+1
|
* Merge pull request #982 from hmhealey/plt547Harrison Healey2015-10-081-24/+24
|\ | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace
| * Fixed parsing of :'( emoticonhmhealey2015-10-081-1/+1
| |
| * Changed emoticons so that they much be surrounded by whitespacehmhealey2015-10-081-24/+24
| |
| * Switched :p emoticonhmhealey2015-10-081-1/+1
| |
* | Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-08160-160/+160
|\ \ | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright
| * | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08160-160/+160
| |/
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-083-6/+8
|\ \ | | | | | | PLT-355 Fixing ability to dynamicly update members list.
| * | Fixing ability to dynamicly update members list.Christopher Speller2015-10-083-6/+8
| | |
* | | Merge pull request #971 from mattermost/PLT-567Corey Hulen2015-10-083-6/+30
|\ \ \ | | | | | | | | PLT-567 auto join open channels
| * | | Fixing issue with lastIndexOf=Corey Hulen2015-10-082-2/+2
| | | |
| * | | Adding removing blank target for browser links=Corey Hulen2015-10-082-2/+7
| | | |
| * | | PLT-567 auto join open channels=Corey Hulen2015-10-072-5/+24
| |/ /
* | / Tweaking welcome text in Town-Squareit332015-10-081-6/+2
| |/ |/|
* | Merge pull request #966 from mattermost/GIT-960Christopher Speller2015-10-082-10/+16
|\ \ | | | | | | GIT-960 show error when you cannot create a team
| * | GIT-960 show error when you cannot create a team=Corey Hulen2015-10-072-10/+16
| |/
* | Merge pull request #944 from mattermost/PLT-518Christopher Speller2015-10-081-8/+8
|\ \ | | | | | | PLT-518 check for security bulletins
| * | PLT-518 check for security bulletins=Corey Hulen2015-10-051-8/+8
| | |
* | | Merge pull request #931 from rgarmsen2295/plt-112Christopher Speller2015-10-083-8/+69
|\ \ \ | | | | | | | | PLT-112 Improves email change verification process
| * | | Added new email to email change notificationReed Garmsen2015-10-061-20/+12
| | | |
| * | | Resending the verification email now sends the appropriate version of the ↵Reed Garmsen2015-10-051-1/+6
| | | | | | | | | | | | | | | | email depending on whether it's a change or first signup