Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-13 | 7 | -57/+71 |
|\ | |||||
| * | Merge pull request #1022 from mattermost/release-1.1.0 | Corey Hulen | 2015-10-12 | 2 | -35/+36 |
| |\ | |||||
| | * | 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 |
| |\ \ \ | |||||
| | * \ \ | 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 branch 'PLT-589' of github.com:stasvovk/platform into PLT-589 | Stas Vovk | 2015-10-13 | 2 | -3/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'master' into PLT-589 | Stas Vovk | 2015-10-12 | 2 | -3/+1 |
| |\| | | | | |||||
| | * | | | | Merge pull request #1009 from mattermost/update-help-text | Corey Hulen | 2015-10-12 | 1 | -1/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Update get_link_modal.jsx | it33 | 2015-10-11 | 1 | -1/+0 |
| | | |/ / / | |||||
| | * | | | | Merge pull request #989 from mattermost/typos | Corey Hulen | 2015-10-12 | 1 | -2/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Merge branch 'master' into typos | Joram Wilander | 2015-10-12 | 2 | -2/+2 |
| | | |\| | | |||||
| | | * | | | Fixed typos | it33 | 2015-10-08 | 1 | -2/+1 |
| | | | |/ | | | |/| | |||||
* | | / | | replaced constructions like user.roles === 'admin' by Utils.isAdmin(user.role... | Stas Vovk | 2015-10-13 | 2 | -4/+4 |
|/ / / / | |||||
* | | | | changed Admin to Team Admin in admin console | Stas Vovk | 2015-10-12 | 1 | -1/+3 |
* | | | | Merge remote-tracking branch 'upstream/master' into PLT-589 | Stas Vovk | 2015-10-12 | 5 | -11/+9 |
|\| | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-12 | 5 | -11/+9 |
| | |/ | |/| | |||||
* / | | changed Admin to Team Admin in Manage Team members | Stas Vovk | 2015-10-12 | 1 | -1/+3 |
|/ / | |||||
* | | 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 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ | |||||
| * | | | 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 | =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 | =Corey Hulen | 2015-10-05 | 1 | -8/+8 |
* | | | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 1 | -7/+62 |
|\ \ \ | |||||
| * | | | 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 | =Corey Hulen | 2015-10-07 | 3 | -3/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #952 from tomitm/PLT-445 | Harrison Healey | 2015-10-08 | 3 | -11/+84 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |_|/ / / |/| | | | |