Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix webhook name not overriding in LHS and update webhook help text. | JoramWilander | 2015-10-13 | 2 | -8/+40 |
| | |||||
* | Fixing user settings dialog so it desn't ask you to check your email unless ↵ | Christopher Speller | 2015-10-13 | 1 | -10/+10 |
| | | | | you changed it | ||||
* | PLT-596 - Update to email verification title | it33 | 2015-10-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 2 | -2/+2 |
|\ | |||||
| * | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Update user_settings_integrations.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
| * | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 |
| | | |||||
* | | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 2 | -35/+36 |
|/ | |||||
* | Fixing broken travis release build | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
| | |||||
* | Fixed html used for autolinking | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #982 from hmhealey/plt547 | Harrison Healey | 2015-10-08 | 1 | -24/+24 |
|\ | | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace | ||||
| * | Fixed parsing of :'( emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | |||||
| * | Changed emoticons so that they much be surrounded by whitespace | hmhealey | 2015-10-08 | 1 | -24/+24 |
| | | |||||
| * | Switched :p emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 160 | -160/+160 |
|\ \ | | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 160 | -160/+160 |
| |/ | |||||
* | | Merge pull request #978 from mattermost/plt-355 | Corey Hulen | 2015-10-08 | 3 | -6/+8 |
|\ \ | | | | | | | PLT-355 Fixing ability to dynamicly update members list. | ||||
| * | | Fixing ability to dynamicly update members list. | Christopher Speller | 2015-10-08 | 3 | -6/+8 |
| | | | |||||
* | | | Merge pull request #971 from mattermost/PLT-567 | Corey Hulen | 2015-10-08 | 3 | -6/+30 |
|\ \ \ | | | | | | | | | PLT-567 auto join open channels | ||||
| * | | | Fixing issue with lastIndexOf | =Corey Hulen | 2015-10-08 | 2 | -2/+2 |
| | | | | |||||
| * | | | Adding removing blank target for browser links | =Corey Hulen | 2015-10-08 | 2 | -2/+7 |
| | | | | |||||
| * | | | PLT-567 auto join open channels | =Corey Hulen | 2015-10-07 | 2 | -5/+24 |
| |/ / | |||||
* | / | Tweaking welcome text in Town-Square | it33 | 2015-10-08 | 1 | -6/+2 |
| |/ |/| | |||||
* | | Merge pull request #966 from mattermost/GIT-960 | Christopher Speller | 2015-10-08 | 2 | -10/+16 |
|\ \ | | | | | | | GIT-960 show error when you cannot create a team | ||||
| * | | GIT-960 show error when you cannot create a team | =Corey Hulen | 2015-10-07 | 2 | -10/+16 |
| |/ | |||||
* | | Merge pull request #944 from mattermost/PLT-518 | Christopher Speller | 2015-10-08 | 1 | -8/+8 |
|\ \ | | | | | | | PLT-518 check for security bulletins | ||||
| * | | PLT-518 check for security bulletins | =Corey Hulen | 2015-10-05 | 1 | -8/+8 |
| | | | |||||
* | | | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 3 | -8/+69 |
|\ \ \ | | | | | | | | | PLT-112 Improves email change verification process | ||||
| * | | | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 1 | -20/+12 |
| | | | | |||||
| * | | | Resending the verification email now sends the appropriate version of the ↵ | Reed Garmsen | 2015-10-05 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | email depending on whether it's a change or first signup | ||||
| * | | | Added better verification when a user changes his or her email | Reed Garmsen | 2015-10-05 | 1 | -5/+32 |
| | | | | |||||
| * | | | Initial cosmetic changes to the process of verifying a changed email | Reed Garmsen | 2015-10-05 | 2 | -5/+42 |
| | | | | |||||
* | | | | Merge pull request #970 from mattermost/GIT-957 | Harrison Healey | 2015-10-08 | 6 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | GIT-957 fixing email templates and logos | ||||
| * | | | | GIT-957 fixing email templates and logos | =Corey Hulen | 2015-10-07 | 6 | -3/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #952 from tomitm/PLT-445 | Harrison Healey | 2015-10-08 | 3 | -11/+84 |
|\ \ \ \ | | | | | | | | | | | PLT-445 Create About dialog | ||||
| * | | | | Use ReactBootstrap.Modal instead. | Tomi M | 2015-10-07 | 4 | -50/+58 |
| | | | | | |||||
| * | | | | PLT-445 Create About dialog | Tomi M | 2015-10-06 | 5 | -11/+76 |
| | | | | | |||||
* | | | | | Merge pull request #948 from rgarmsen2295/plt-167 | Harrison Healey | 2015-10-08 | 3 | -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 Garmsen | 2015-10-07 | 3 | -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 handled | Reed Garmsen | 2015-10-06 | 2 | -2/+35 |
| | | | | | |||||
* | | | | | Merge pull request #951 from mattermost/PLT-500 | Corey Hulen | 2015-10-07 | 4 | -23/+69 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-500 fixing connection msg issues | ||||
| * | | | | | Fixing resize | =Corey Hulen | 2015-10-07 | 1 | -15/+16 |
| | | | | | | |||||
| * | | | | | Moving to updated | =Corey Hulen | 2015-10-07 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixing resiz | =Corey Hulen | 2015-10-07 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | PLT-500 fixing connection msg issues | =Corey Hulen | 2015-10-06 | 4 | -22/+63 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #961 from mattermost/plt-471 | Corey Hulen | 2015-10-07 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-471 Fix user_added websocket event | ||||
| * | | | | | Fix user_added websocket event and update websocket channel access cache on ↵ | JoramWilander | 2015-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | add/remove member. | ||||
* | | | | | | Merge pull request #959 from mattermost/build-fix | Corey Hulen | 2015-10-07 | 2 | -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 bundle | Christopher Speller | 2015-10-07 | 2 | -24/+18 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #958 from mattermost/plt-450 | Joram Wilander | 2015-10-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add space between 'message:' and the actual root message. |