summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into PLT-589Stas Vovk2015-10-137-57/+71
|\
| * Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-122-35/+36
| |\ | | | | | | Release 1.1.0rc merging to master
| | * Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-122-2/+2
| | |\
| | * | PLT-586 fixing issues with security alert=Corey Hulen2015-10-092-35/+36
| | | |
| * | | Merge pull request #1018 from asaadmahmoodspin/ui-fixesCorey Hulen2015-10-125-22/+35
| |\ \ \ | | | | | | | | | | Other UI Improvements
| | * \ \ Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2015-10-125-11/+9
| | |\ \ \
| | * | | | Other UI ImprovementsAsaad Mahmood2015-10-125-22/+35
| | | |_|/ | | |/| |
* | | | | Merge branch 'PLT-589' of github.com:stasvovk/platform into PLT-589Stas Vovk2015-10-132-3/+1
|\ \ \ \ \
| * | | | | Merge branch 'master' into PLT-589Stas Vovk2015-10-122-3/+1
| |\| | | |
| | * | | | Merge pull request #1009 from mattermost/update-help-textCorey Hulen2015-10-121-1/+0
| | |\ \ \ \ | | | | | | | | | | | | | | Updating help text
| | | * | | | Update get_link_modal.jsxit332015-10-111-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/typosCorey Hulen2015-10-121-2/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | | Fixed typos
| | | * | | Merge branch 'master' into typosJoram Wilander2015-10-122-2/+2
| | | |\| |
| | | * | | Fixed typosit332015-10-081-2/+1
| | | | |/ | | | |/| | | | | | There was no space after "user name." before the next sentence. Also, "user name" should be "username"
* | | / | replaced constructions like user.roles === 'admin' by ↵Stas Vovk2015-10-132-4/+4
|/ / / / | | | | | | | | | | | | Utils.isAdmin(user.roles) in manage members
* | | | changed Admin to Team Admin in admin consoleStas Vovk2015-10-121-1/+3
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into PLT-589Stas Vovk2015-10-125-11/+9
|\| | |
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-125-11/+9
| | |/ | |/|
* / | changed Admin to Team Admin in Manage Team membersStas Vovk2015-10-121-1/+3
|/ /
* | 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
|/
* 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-08157-157/+157
|\ \ | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright
| * | Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08157-157/+157
| |/
* | 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-082-2/+15
|\ \ \ | | | | | | | | 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-071-1/+9
| |/ /
* | / 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-081-7/+62
|\ \ \ | | | | | | | | PLT-112 Improves email change verification process
| * | | Added new email to email change notificationReed Garmsen2015-10-061-20/+12
| | | |
| * | | 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-051-5/+41
| | | |
* | | | Merge pull request #970 from mattermost/GIT-957Harrison Healey2015-10-083-3/+3
|\ \ \ \ | | | | | | | | | | GIT-957 fixing email templates and logos
| * | | | GIT-957 fixing email templates and logos=Corey Hulen2015-10-073-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-073-49/+58
| | | | |
| * | | | PLT-445 Create About dialogTomi M2015-10-064-11/+75
| | | | |
* | | | | 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-19 19:52:19 +0000