summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | | Changed PostStore to not clear a deleted post's messagehmhealey2016-02-045-22/+27
| | | |
| * | | Changed out of channel mention tests to use proper email addresseshmhealey2016-02-041-6/+7
| | | |
| * | | Removed untranslated phrases from es.jsonhmhealey2016-02-041-12/+0
| | | |
| * | | Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-048-13/+72
| | | |
| * | | Changed deleted posts to be more general ephemeral postshmhealey2016-02-046-72/+64
| | | |
| * | | Added serverside check for a post that @mentions someone who isn't in the ↵hmhealey2016-02-044-0/+145
| | | | | | | | | | | | | | | | channel
* | | | Merge pull request #2072 from ZBoxApp/command-locCorey Hulen2016-02-042-108/+312
|\ \ \ \ | | | | | | | | | | Add spanish translations for commands
| * | | | Add spanish translations for commandsElias Nahum2016-02-042-108/+312
|/ / / /
* | | | Merge pull request #2052 from mattermost/PLT-1429Harrison Healey2016-02-0444-979/+3453
|\ \ \ \ | | | | | | | | | | PLT-1429 adding user created slash commands
| * | | | PLT-1429 Fixing code review comments=Corey Hulen2016-02-045-8/+6
| | | | |
| * | | | Fixing build=Corey Hulen2016-02-031-2/+2
| | | | |
| * | | | Fixing based on feedback=Corey Hulen2016-02-032-3/+3
| | | | |
| * | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-0328-329/+798
| |\ \ \ \ | | | |/ / | | |/| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-30 22:39:09 +0000