summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* 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-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
|\ \ | | | | | | 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 Garmsen2015-10-073-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 handledReed Garmsen2015-10-062-2/+35
| | |
* | | Merge pull request #951 from mattermost/PLT-500Corey Hulen2015-10-071-19/+53
|\ \ \ | | | | | | | | PLT-500 fixing connection msg issues
| * | | 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
|\ \ \ | | | | | | | | PLT-471 Fix user_added websocket event
| * | | Fix user_added websocket event and update websocket channel access cache on ↵JoramWilander2015-10-071-1/+1
| | | | | | | | | | | | | | | | add/remove member.
* | | | Merge pull request #958 from mattermost/plt-450Joram Wilander2015-10-071-1/+1
|\ \ \ \ | | | | | | | | | | Add space between 'message:' and the actual root message.
| * | | | 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 return
| * | | | Deleting carriage returnmishimi2015-10-071-3/+1
| | | | |
* | | | | Merge pull request #950 from mattermost/PLT-519Harrison Healey2015-10-071-17/+22
|\ \ \ \ \ | |/ / / / |/| | | | PLT-519 toggle team creation link based on config setting
| * | | | PLT-519 toggle team creation link based on config setting=Corey Hulen2015-10-061-17/+22
| | |/ / | |/| |
* | | | Merge pull request #953 from asaadmahmoodspin/plt-522Christopher Speller2015-10-071-7/+7
|\ \ \ \ | |_|/ / |/| | | PLT-522 - Adding option for mentionHighlightLink for themes
| * | | PLT-522 - Adding option for mentionHighlightLink for themesAsaad Mahmood2015-10-071-7/+7
| |/ /
* | | Merge pull request #947 from mattermost/PLT-435Christopher Speller2015-10-072-21/+24
|\ \ \ | | | | | | | | PLT-435 adding ability to demote system admin
| * | | PLT-435 adding ability to demote system admin=Corey Hulen2015-10-062-21/+24
| | |/ | |/|
* | | Merge pull request #945 from mattermost/plt-433Christopher Speller2015-10-072-65/+78
|\ \ \ | | | | | | | | PLT-433 Allow team admin to delete comments.
| * | | Allow team admin to delete comments.JoramWilander2015-10-062-65/+78
| | | |
* | | | Merge pull request #946 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-072-1/+5
|\ \ \ \ | |_|_|/ |/| | | PLT-451 - Adding visual effect for logout active sessions button
| * | | Removing sidebar text hover colorAsaad Mahmood2015-10-061-1/+0
| | | |
| * | | Removing console.logAsaad Mahmood2015-10-061-1/+0
| | | |
| * | | PLT-451 - Adding visual effect for logout active sessions buttonAsaad Mahmood2015-10-061-0/+6
| | |/ | |/|
* | | Merge pull request #938 from mattermost/plt-111Corey Hulen2015-10-062-2/+14
|\ \ \ | |/ / |/| | PLT-111 Combining email verification confirmation screen with login screen.
| * | Combining email verification confirmation screen with login screen.Christopher Speller2015-10-062-2/+14
| |/
* | Merge pull request #939 from asaadmahmoodspin/plt-424Corey Hulen2015-10-065-142/+144
|\ \ | | | | | | Admin console UI Improvements
| * | Admin console UI ImprovementsAsaad Mahmood2015-10-065-142/+144
| |/
* / Hid Copy Link button when unable to copy the team signup linkhmhealey2015-10-061-11/+18
|/
* Merge pull request #936 from mattermost/signup-fixJoram Wilander2015-10-061-13/+14
|\ | | | | Fixing broken signup page
| * Fixing broken signup pageChristopher Speller2015-10-061-13/+14
| |
* | Fixed Get Public Link buttonhmhealey2015-10-052-3/+3
|/
* Merge pull request #925 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-052-4/+3
|\ | | | | Multiple UI Improvements
| * Multiple UI ImprovementsAsaad Mahmood2015-10-052-4/+3
| |
* | Merge pull request #922 from mattermost/plt-360Harrison Healey2015-10-0527-289/+326
|\ \ | |/ |/| PLT-360 Upgrade and changes to ESLint
| * Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵Christopher Speller2015-10-0527-289/+326
| | | | | | | | Adding new ESLint rules. Fixing new ESLint errors.
* | Merge pull request #923 from mattermost/fix-load-scrollCorey Hulen2015-10-051-1/+1
|\ \ | | | | | | Fix missed binding for youtube data callback.
| * | Fix missed binding for youtube data callback.JoramWilander2015-10-051-1/+1
| | |
* | | Merge pull request #914 from mattermost/plt-297Joram Wilander2015-10-055-9/+121
|\ \ \ | |_|/ |/| | PLT-297 Add ability to override username and icon for posts from incoming webhooks.
| * | Update help text to mention the BOT tag for webhook posts.JoramWilander2015-10-051-1/+1
| | |
| * | Add config options for overriding username and icon, and add BOT indicator ↵JoramWilander2015-10-054-14/+91
| | | | | | | | | | | | next to webhook posts.
| * | Add ability to override username and icon for posts from incoming webhooks.JoramWilander2015-10-024-8/+43
| | |
* | | Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-053-6/+13
|\ \ \ | | | | | | | | PLT-44 allow team switching without the need to login
| * | | Fixing issues=Corey Hulen2015-10-021-1/+1
| | | |
| * | | PLT-44 allow team switching without the need to login=Corey Hulen2015-10-013-5/+12
| |/ /