summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Separated displayTime functions for component/string formReed Garmsen2016-02-051-1/+1
|
* Fixed issue with on-hover timestampsReed Garmsen2016-02-051-1/+2
|
* Merge pull request #2087 from hmhealey/plt1758Corey Hulen2016-02-051-3/+0
|\ | | | | 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-051-3/+0
| | | | | | | | 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 #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 #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-044-17/+47
|\ \ | |/ |/| PLT-882 Ephemeral Messages and Out-Of-Channel mentions
| * Changed how posts are marked ephemeralhmhealey2016-02-041-3/+3
| |
| * Changed PostStore to not clear a deleted post's messagehmhealey2016-02-042-14/+23
| |
| * Changed deleted posts to be more general ephemeral postshmhealey2016-02-042-3/+24
| |
* | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-044-10/+796
|\ \ | |/ |/| PLT-1429 adding user created slash commands
| * Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0318-78/+387
| |\
| * \ Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0342-767/+2031
| |\ \
| * | | 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-01113-1443/+6952
| |\ \ \
| * \ \ \ merging=Corey Hulen2016-01-2510-236/+533
| |\ \ \ \
| * \ \ \ \ merging=Corey Hulen2016-01-2221-98/+278
| |\ \ \ \ \
| * \ \ \ \ \ merging=Corey Hulen2016-01-151-3/+3
| |\ \ \ \ \ \
| * | | | | | | finishing up commands UI=Corey Hulen2016-01-141-67/+249
| | | | | | | |
| * | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1420-83/+507
| |\ \ \ \ \ \ \
| * | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| | | | | | | | |
| * | | | | | | | partial fix for UI=Corey Hulen2016-01-081-6/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #2068 from hmhealey/plt1767Corey Hulen2016-02-041-3/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | PLT-1767 Fixed editing your last comment in the RHS
| * | | | | | | | | Fixed editing your last comment in the RHShmhealey2016-02-041-3/+2
| | | | | | | | | |
* | | | | | | | | | Fixed localization issues in file_upload.jsxhmhealey2016-02-041-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-042-54/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements
| * | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2016-02-032-54/+74
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #2063 from mattermost/fix-locCorey Hulen2016-02-031-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Fixing loc error
| * | | | | | | | Fixing loc error=Corey Hulen2016-02-031-1/+1
| |/ / / / / / /