summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2101 from hmhealey/plt1415Christopher Speller2016-02-0814-34/+34
|\ | | | | PLT-1415 Renamed RECIEVED_* to RECEIVED_*
| * Renamed RECIEVED_* to RECEIVED_*hmhealey2016-02-0814-34/+34
| |
* | Multiple UI ImprovementsAsaad Mahmood2016-02-081-12/+14
|/
* Merge pull request #2089 from mattermost/plt-1205Joram Wilander2016-02-087-143/+157
|\ | | | | PLT-1205 Remove appearance settings tab and move theme management to display s…
| * Fix cancel bugJoramWilander2016-02-081-1/+3
| |
| * Remove appearance settings tab and move theme management to display settings tabJoramWilander2016-02-057-143/+155
| |
* | Merge pull request #2083 from mattermost/plt-1879Christopher Speller2016-02-081-1/+49
|\ \ | | | | | | PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete…
| * | Make insecure TLS connections configurableJoramWilander2016-02-051-1/+49
| |/
* | Merge pull request #2092 from mattermost/fix-slashChristopher Speller2016-02-081-14/+2
|\ \ | | | | | | Fixing slash commands
| * | Fixing slash commands=Corey Hulen2016-02-051-14/+2
| | |
* | | Merge pull request #2090 from hmhealey/plt1847Joram Wilander2016-02-062-8/+21
|\ \ \ | | | | | | | | PLT-1847 Disabled keyboard focus code changes on mobile
| * | | Disabled keyboard focus code changes on mobilehmhealey2016-02-052-8/+21
| |/ /
* | | Merge pull request #2091 from rgarmsen2295/plt-1797Corey Hulen2016-02-053-2/+3
|\ \ \ | | | | | | | | PLT-1797 Increased username max length
| * | | Increased username max lengthReed Garmsen2016-02-053-2/+3
| | | |
* | | | 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
| |\ \ \