Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge branch 'master' into PLT-590 | Maxim | 2015-10-13 | 14 | -71/+81 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #1022 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 2 | -35/+36 | |
| |\| | | | | | | | | | | | | | | | | | | | Release 1.1.0rc merging to master | |||||
| | * | | | | | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 2 | -2/+2 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | * | | | | | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 2 | -35/+36 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | Merge pull request #1018 from asaadmahmoodspin/ui-fixes | Corey Hulen | 2015-10-12 | 5 | -22/+35 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Other UI Improvements | |||||
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes | Asaad Mahmood | 2015-10-12 | 5 | -11/+9 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | * | | | | Other UI Improvements | Asaad Mahmood | 2015-10-12 | 5 | -22/+35 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | Merge pull request #1009 from mattermost/update-help-text | Corey Hulen | 2015-10-12 | 1 | -1/+0 | |
| |\ \ \ \ | | | | | | | | | | | | | Updating help text | |||||
| | * | | | | Update get_link_modal.jsx | it33 | 2015-10-11 | 1 | -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/typos | Corey Hulen | 2015-10-12 | 1 | -2/+1 | |
| |\ \ \ \ | | |_|/ / | |/| | | | Fixed typos | |||||
| | * | | | Merge branch 'master' into typos | Joram Wilander | 2015-10-12 | 2 | -2/+2 | |
| | |\| | | ||||||
| | * | | | Fixed typos | it33 | 2015-10-08 | 1 | -2/+1 | |
| | | |/ | | |/| | | | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username" | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-12 | 5 | -11/+9 | |
| | |/ | |/| | ||||||
* / | | PLT-590: Change "Manage Team" to "Manage Members" | Potapov Max | 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 | |
|/ | ||||||
* | 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 | 157 | -157/+157 | |
|\ \ | | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | |||||
| * | | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 157 | -157/+157 | |
| |/ | ||||||
* | | 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 | 2 | -2/+15 | |
|\ \ \ | | | | | | | | | 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 | 1 | -1/+9 | |
| |/ / | ||||||
* | / | 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 | 1 | -7/+62 | |
|\ \ \ | | | | | | | | | PLT-112 Improves email change verification process | |||||
| * | | | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 1 | -20/+12 | |
| | | | | ||||||
| * | | | 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 | 1 | -5/+41 | |
| | | | | ||||||
* | | | | Merge pull request #970 from mattermost/GIT-957 | Harrison Healey | 2015-10-08 | 3 | -3/+3 | |
|\ \ \ \ | | | | | | | | | | | GIT-957 fixing email templates and logos | |||||
| * | | | | GIT-957 fixing email templates and logos | =Corey Hulen | 2015-10-07 | 3 | -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 | 3 | -49/+58 | |
| | | | | | ||||||
| * | | | | PLT-445 Create About dialog | Tomi M | 2015-10-06 | 4 | -11/+75 | |
| | | | | | ||||||
* | | | | | 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 | 3 | -22/+68 | |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | |
| | | | | | |