summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixing slash commands=Corey Hulen2016-02-054-22/+11
|
* Merge pull request #2088 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-052-3/+27
|\ | | | | Minor UI Improvements
| * Fixing indentationAsaad Mahmood2016-02-051-2/+2
| |
| * Minor UI ImprovementsAsaad Mahmood2016-02-052-3/+27
|/
* 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 #2085 from hmhealey/plt1896Christopher Speller2016-02-051-0/+4
|\ \ | | | | | | PLT-1896 Added more space between adjacent markdown paragraphs
| * | Added more space between adjacent markdown paragraphshmhealey2016-02-051-0/+4
| |/
* | 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
| |/
* | Merge pull request #2086 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-057-126/+150
|\ \ | |/ |/| Multiple UI improvements
| * Improving indentation for base.scssAsaad Mahmood2016-02-051-128/+128
| |
| * Multiple UI improvementsAsaad Mahmood2016-02-057-31/+55
|/
* 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 #2080 from ZBoxApp/PLT-7-locsCorey Hulen2016-02-044-100/+133
|\ \ | | | | | | New localizations messages
| * | New localizationsElias Nahum2016-02-044-100/+133
|/ /
* | Merge pull request #2079 from mattermost/help-text-updatesCorey Hulen2016-02-043-8/+8
|\ \ | | | | | | Changing URL for testing push notifications
| * | Update en.jsonit332016-02-041-1/+1
| | |
| * | Update es.jsonit332016-02-041-1/+1
| | |
| * | Update en.jsonit332016-02-041-1/+1
| | |
| * | Update email_settings.jsxit332016-02-041-1/+1
| | |
| * | Update es.jsonit332016-02-041-2/+2
| | |
| * | Update en.jsonit332016-02-041-2/+2
| | |
| * | Update email_settings.jsxit332016-02-041-2/+2
| | |
* | | Merge pull request #2076 from ZBoxApp/loc-fixCorey Hulen2016-02-044-42/+114
|\ \ \ | | | | | | | | PLT-7: Fix and Add new loc strings
| * | | fix typosElias Nahum2016-02-042-4/+4
| | | |
| * | | revert config.jsonElias Nahum2016-02-041-32/+7
| | | |
| * | | PLT-7: Fix and Add new loc stringsElias Nahum2016-02-045-48/+145
| |/ /
* | | 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-0454-1005/+3728
| |\| |
| * | | 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-0421-440/+685
|\ \ \ \ | |_|_|/ |/| | | Some general updates to EE
| * | | Move license storage to databaseJoramWilander2016-02-0414-53/+284
| | | |
| * | | Turn failed audit descriptions redJoramWilander2016-02-041-1/+6
| | | |
| * | | Convert audit_table to a proper tableJoramWilander2016-02-044-385/+375
| | | |
| * | | Rename audits tabJoramWilander2016-02-043-3/+10
| | | |
| * | | Disable remove license button until LDAP is disabledJoramWilander2016-02-042-2/+4
| | | |
| * | | Fix license info localizationJoramWilander2016-02-043-4/+14
| |/ /
* | | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-0419-360/+580
|\ \ \ | |/ / |/| | PLT-882 Ephemeral Messages and Out-Of-Channel mentions
| * | Changed sendNotificationsAndForget to be synchronous and called as a go funchmhealey2016-02-041-228/+225
| | |
| * | Added helper methods to send ephemeral messages to specific usershmhealey2016-02-043-21/+54
| | |
| * | Changed how posts are marked ephemeralhmhealey2016-02-046-15/+17
| | |
| * | Reworked the code for sending notifications and checking for out of channel ↵hmhealey2016-02-044-280/+278
| | | | | | | | | | | | mentions to share some data