summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Fixing slash commands=Corey Hulen2016-02-051-14/+2
|
* Merge pull request #2087 from hmhealey/plt1758Corey Hulen2016-02-053-12/+13
|\ | | | | PLT-1758 Changed CommandProvider to only set the matched pretext if it actuall…
| * Changed CommandProvider to only set the matched pretext if it actually ↵hmhealey2016-02-053-12/+13
| | | | | | | | matches anything
* | Merge pull request #2082 from mattermost/plt-1848Christopher Speller2016-02-051-4/+23
|\ \ | | | | | | PLT-1848 Stats for recently active and new users now shows date with the time
| * | Stats for recently active and new users now shows date with the timeJoramWilander2016-02-051-4/+23
| |/
* / Multiple UI improvementsAsaad Mahmood2016-02-052-5/+7
|/
* Merge pull request #2077 from hmhealey/plt1819Joram Wilander2016-02-051-5/+13
|\ | | | | PLT-1819 Changed notification permission dialogue to only be shown once per page load
| * Changed notifications to only request permission once per session if the ↵hmhealey2016-02-041-5/+13
| | | | | | | | user clicks 'Not now' on Firefox
* | Merge pull request #2079 from mattermost/help-text-updatesCorey Hulen2016-02-041-3/+3
|\ \ | | | | | | Changing URL for testing push notifications
| * | Update email_settings.jsxit332016-02-041-1/+1
| | |
| * | Update email_settings.jsxit332016-02-041-2/+2
| | |
* | | Merge pull request #2076 from ZBoxApp/loc-fixCorey Hulen2016-02-042-7/+28
|\ \ \ | | | | | | | | PLT-7: Fix and Add new loc strings
| * | | fix typosElias Nahum2016-02-041-2/+2
| | | |
| * | | PLT-7: Fix and Add new loc stringsElias Nahum2016-02-042-6/+27
| |/ /
* | | Merge pull request #2075 from mattermost/PLT-1851Corey Hulen2016-02-041-7/+16
|\ \ \ | | | | | | | | PLT-1851 reconnect and get missing messages
| * | | PLT-1851 fixing websocket reconnect error=Corey Hulen2016-02-041-6/+12
| | | |
| * | | Merge branch 'master' into PLT-1851=Corey Hulen2016-02-0411-79/+963
| |\| |
| * | | PLT-1851 reconnect and get missing messages=Corey Hulen2016-02-031-1/+4
| | | |
* | | | Merge pull request #2071 from hmhealey/plt1820Corey Hulen2016-02-044-41/+36
|\ \ \ \ | | | | | | | | | | PLT-1820/PLT-1847 Cleaned up textbox focus code
| * | | | Added focus to the sidebar textbox when it is openedhmhealey2016-02-041-0/+6
| | | | |
| * | | | Added code to refocus on the post/comment textbox after a file is drag and ↵hmhealey2016-02-042-0/+8
| | | | | | | | | | | | | | | | | | | | dropped
| * | | | Updated RHS textbox to refocus after clicking to upload a filehmhealey2016-02-041-0/+5
| | | | |
| * | | | Cleaned up textbox focus codehmhealey2016-02-043-42/+18
| | |/ / | |/| |
* | | | Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-046-337/+350
|\ \ \ \ | |_|_|/ |/| | | Some general updates to EE
| * | | Move license storage to databaseJoramWilander2016-02-041-1/+1
| | | |
| * | | Turn failed audit descriptions redJoramWilander2016-02-041-1/+6
| | | |
| * | | Convert audit_table to a proper tableJoramWilander2016-02-043-331/+327
| | | |
| * | | Rename audits tabJoramWilander2016-02-042-2/+2
| | | |
| * | | Disable remove license button until LDAP is disabledJoramWilander2016-02-042-2/+4
| | | |
| * | | Fix license info localizationJoramWilander2016-02-041-2/+12
| |/ /
* | | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-049-91/+103
|\ \ \ | |/ / |/| | PLT-882 Ephemeral Messages and Out-Of-Channel mentions
| * | Added helper methods to send ephemeral messages to specific usershmhealey2016-02-042-2/+19
| | |
| * | Changed how posts are marked ephemeralhmhealey2016-02-044-6/+9
| | |
| * | Changed PostStore to not clear a deleted post's messagehmhealey2016-02-043-18/+23
| | |
| * | Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-042-1/+3
| | |
| * | Changed deleted posts to be more general ephemeral postshmhealey2016-02-045-71/+56
| | |
* | | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-046-18/+883
|\ \ \ | |/ / |/| | PLT-1429 adding user created slash commands
| * | PLT-1429 Fixing code review comments=Corey Hulen2016-02-041-1/+0
| | |
| * | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0323-145/+518
| |\|
| * | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0348-771/+2139
| |\ \
| * | | Fixing console=Corey Hulen2016-02-021-1/+1
| | | |
| * | | Adding props to admin console=Corey Hulen2016-02-021-4/+100
| | | |
| * | | Adding loc to front-end=Corey Hulen2016-02-022-51/+269
| | | |
| * | | Fixing merge=Corey Hulen2016-02-01126-1589/+7199
| |\ \ \
| * \ \ \ merging=Corey Hulen2016-01-2520-331/+1082
| |\ \ \ \
| * \ \ \ \ merging=Corey Hulen2016-01-2229-113/+421
| |\ \ \ \ \
| * \ \ \ \ \ merging=Corey Hulen2016-01-151-3/+3
| |\ \ \ \ \ \
| * | | | | | | finishing up commands UI=Corey Hulen2016-01-142-68/+308
| | | | | | | |
| * | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1424-94/+619
| |\ \ \ \ \ \ \
| * | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| | | | | | | | |