summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-590Maxim2015-10-1312-68/+75
|\
| * Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-122-35/+36
| |\
| | * 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
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2015-10-123-8/+3
| | |\ \ \
| | * | | | Other UI ImprovementsAsaad Mahmood2015-10-125-22/+35
| | | |_|/ | | |/| |
| * | | | Merge pull request #1009 from mattermost/update-help-textCorey Hulen2015-10-121-1/+0
| |\ \ \ \
| | * | | | Update get_link_modal.jsxit332015-10-111-1/+0
| | |/ / /
| * | | | Merge pull request #989 from mattermost/typosCorey Hulen2015-10-121-2/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'master' into typosJoram Wilander2015-10-122-2/+2
| | |\| |
| | * | | Fixed typosit332015-10-081-2/+1
| | | |/ | | |/|
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-123-8/+3
| | |/ | |/|
* / | PLT-590: Change "Manage Team" to "Manage Members"Potapov Max2015-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
|/
* Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-08131-131/+131
|\
| * Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-08131-131/+131
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-083-6/+8
|\ \
| * | Fixing ability to dynamicly update members list.Christopher Speller2015-10-083-6/+8
* | | 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=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=Corey Hulen2015-10-051-8/+8
* | | Merge pull request #931 from rgarmsen2295/plt-112Christopher Speller2015-10-081-7/+62
|\ \ \
| * | | 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=Corey Hulen2015-10-073-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #952 from tomitm/PLT-445Harrison Healey2015-10-083-11/+84
|\ \ \ \
| * | | | Use ReactBootstrap.Modal instead.Tomi M2015-10-072-43/+58
| * | | | PLT-445 Create About dialogTomi M2015-10-063-11/+69
* | | | | Merge pull request #948 from rgarmsen2295/plt-167Harrison Healey2015-10-083-9/+41
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Now handles commenting on a deleted post gracefully, and checks for any areas...Reed Garmsen2015-10-073-20/+19
| * | | | 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-071-19/+53
|\ \ \ \ \
| * | | | | 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-061-18/+47
| | |/ / / | |/| | |
* | | | | Merge pull request #961 from mattermost/plt-471Corey Hulen2015-10-071-1/+1
|\ \ \ \ \
| * | | | | Fix user_added websocket event and update websocket channel access cache on a...JoramWilander2015-10-071-1/+1
* | | | | | Merge pull request #958 from mattermost/plt-450Joram Wilander2015-10-071-1/+1
|\ \ \ \ \ \
| * | | | | | Add space between 'messsage:' and the actual root message.JoramWilander2015-10-071-1/+1
| |/ / / / /
* | | | | | Merge pull request #956 from mishimi/patch-8Harrison Healey2015-10-071-3/+1
|\ \ \ \ \ \
| * | | | | | Deleting carriage returnmishimi2015-10-071-3/+1
* | | | | | | Merge pull request #950 from mattermost/PLT-519Harrison Healey2015-10-071-17/+22
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |