summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-132-8/+40
|
* Fixing user settings dialog so it desn't ask you to check your email unless ↵Christopher Speller2015-10-131-10/+10
| | | | you changed it
* PLT-596 - Update to email verification titleit332015-10-121-1/+1
|
* Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-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
| |
* | PLT-586 fixing issues with security alert=Corey Hulen2015-10-092-35/+36
|/
* 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
| * | | 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
| * | | | 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
|\ \ \ \ | | | | | | | | | | PLT-445 Create About dialog
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-167 Fixes issue with trying to comment on a deleted post
| * | | | Now handles commenting on a deleted post gracefully, and checks for any ↵Reed Garmsen2015-10-073-20/+19
| | | | | | | | | | | | | | | | | | | | areas where data may no longer exist once a post has been deleted
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | PLT-500 fixing connection msg issues
| * | | | | 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
| | |/ / / | |/| | |
* | | | | Merge pull request #961 from mattermost/plt-471Corey Hulen2015-10-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-471 Fix user_added websocket event
| * | | | | Fix user_added websocket event and update websocket channel access cache on ↵JoramWilander2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | add/remove member.
* | | | | | Merge pull request #959 from mattermost/build-fixCorey Hulen2015-10-072-24/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Moving external libraries to the install step and into a seperate bundle.
| * | | | | | Moving external libraries to the install step and into a seperate bundleChristopher Speller2015-10-072-24/+18
| | | | | | |
* | | | | | | Merge pull request #958 from mattermost/plt-450Joram Wilander2015-10-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add space between 'message:' and the actual root message.