summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1018 from asaadmahmoodspin/ui-fixesCorey Hulen2015-10-1211-25/+53
|\
| * 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
|\ \ \
| * | | Update get_link_modal.jsxit332015-10-111-1/+0
| |/ /
* | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into typosJoram Wilander2015-10-123-3/+3
| |\|
| * | Fixed typosit332015-10-081-2/+1
* | | Multiple UI ImprovementsAsaad Mahmood2015-10-129-20/+18
| |/ |/|
* | 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
|\
| * 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
|\ \
| * | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08160-160/+160
| |/
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-083-6/+8
|\ \
| * | 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
|\ \ \
| * | | 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=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=Corey Hulen2015-10-051-8/+8
* | | Merge pull request #931 from rgarmsen2295/plt-112Christopher Speller2015-10-083-8/+69
|\ \ \
| * | | Added new email to email change notificationReed Garmsen2015-10-061-20/+12
| * | | Resending the verification email now sends the appropriate version of the ema...Reed Garmsen2015-10-051-1/+6
| * | | Added better verification when a user changes his or her emailReed Garmsen2015-10-051-5/+32
| * | | Initial cosmetic changes to the process of verifying a changed emailReed Garmsen2015-10-052-5/+42
* | | | Merge pull request #970 from mattermost/GIT-957Harrison Healey2015-10-086-3/+3
|\ \ \ \
| * | | | GIT-957 fixing email templates and logos=Corey Hulen2015-10-076-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #952 from tomitm/PLT-445Harrison Healey2015-10-083-11/+84
|\ \ \ \
| * | | | Use ReactBootstrap.Modal instead.Tomi M2015-10-074-50/+58
| * | | | PLT-445 Create About dialogTomi M2015-10-065-11/+76
* | | | | Merge pull request #948 from rgarmsen2295/plt-167Harrison Healey2015-10-083-9/+41
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Now handles commenting on a deleted post gracefully, and checks for any areas...Reed Garmsen2015-10-073-20/+19
| * | | | Initial changes to how trying to comment on a deleted post is handledReed Garmsen2015-10-062-2/+35
* | | | | Merge pull request #951 from mattermost/PLT-500Corey Hulen2015-10-074-23/+69
|\ \ \ \ \
| * | | | | Fixing resize=Corey Hulen2015-10-071-15/+16
| * | | | | Moving to updated=Corey Hulen2015-10-071-1/+1
| * | | | | Fixing resiz=Corey Hulen2015-10-071-2/+6
| * | | | | PLT-500 fixing connection msg issues=Corey Hulen2015-10-064-22/+63
| | |/ / / | |/| | |