summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
* | GH-8964 enable notification for text and preText fields in Attachments (#9069)Pradeep Murugesan2018-07-112-15/+95
* | Deduplicating some code in app/status.go (#9095)Jesús Espino2018-07-111-17/+3
* | Merge branch 'plugins-2'JoramWilander2018-07-1030-2718/+849
|\ \
| * | Don't panic if plugin manifest does not have settings (#9086)Joram Wilander2018-07-101-2/+4
| * | Adding ability for plugin system to respect the defaults listed in the plugin...Christopher Speller2018-07-093-18/+26
| * | Merge branch 'master' into plugins-2JoramWilander2018-07-078-11/+196
| |\ \
| * | | First batch of new plugin api methods (#9022)Daniel Schalla2018-07-063-9/+151
| * | | MM-10703 Adding blank request context to plugin hooks for future use. (#9043)Christopher Speller2018-07-064-8/+15
| * | | Add back enable/disable WS events (#9052)Joram Wilander2018-07-052-0/+18
| * | | MM-11029 Adding plugin logging functionality. (#9034)Christopher Speller2018-07-031-4/+20
| * | | Merge branch 'master' into plugins-2JoramWilander2018-06-308-31/+255
| |\ \ \
| * \ \ \ Merge branch 'master' into plugins-2JoramWilander2018-06-279-8/+392
| |\ \ \ \
| * | | | | MM-9674 Add plugin API for publishing custom WebSocket events (#8999)Joram Wilander2018-06-271-0/+9
| * | | | | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-2527-2702/+631
* | | | | | Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-1013-12/+368
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | fix TestInvitePeopleProvider test (#9084)Carlos Tadeu Panato Junior2018-07-101-0/+6
| * | | | MM-11229: Fix invite people slash command and add test case. (#9074)George Goldberg2018-07-102-0/+44
| * | | | MM-11227: Fix group msg slash command. (#9070)George Goldberg2018-07-103-4/+98
| * | | | MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)Christopher Speller2018-07-104-4/+64
| * | | | MM-11174: Fix /msg slash command. (#9059)George Goldberg2018-07-102-0/+38
| * | | | MM-11194: Fix channel header slash command. (#9057)George Goldberg2018-07-083-4/+118
* | | | | Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-063-9/+29
|\| | | |
| * | | | MM-11106: Allow systeadmin webook to post to read only town square. (#9051)George Goldberg2018-07-061-1/+10
| * | | | MM-10766 - Replacing default profile image font (#8955)Asaad Mahmood2018-07-052-8/+19
* | | | | MM-10603: Ignore Redirects and Other Changes when Displaying Link Previews (#...Declan Freeman-Gleason2018-07-051-0/+5
* | | | | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-052-1/+156
|/ / / /
* | | | Make sure diagnostic ID is loaded before client config. (#9032)George Goldberg2018-07-031-1/+3
* | | | Disable Gfycat by default during Beta and move default keys to server (#9027)Jason Blais2018-07-031-0/+3
| |_|/ |/| |
* | | redirect, vs. proxy, 80->443 without LE enabled (#9020)Jesse Hallam2018-06-291-8/+16
* | | Make import compatible with scheme-roles. (#9028)George Goldberg2018-06-292-6/+162
* | | add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-7/+8
* | | Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-281-1/+1
* | | Reset status to away after web conn disconnect if necessary (#8988)Joram Wilander2018-06-274-9/+68
| |/ |/|
* | MM-10910 fix join and open channel commands to work with tilde (#8984)Sudheer2018-06-272-2/+97
* | Lock bulk importing to master database node (#9012)Joram Wilander2018-06-271-0/+3
* | Simplify oauth (#8972)Emil Velikov2018-06-261-1/+7
* | MM-10833: send down computed channel props (#8953)Jesse Hallam2018-06-262-0/+270
* | MM-11008: Fix translation and change the code to be auto-extracted (#9009)Jesús Espino2018-06-261-4/+4
* | Update diagnostics.go (#8989)Jason Blais2018-06-261-0/+7
* | MM-10700 - Updating default image preview size (#9002) (#9003)Joram Wilander2018-06-261-1/+1
* | MM-10269: Make jobserver work without restart. (#9005)George Goldberg2018-06-261-0/+3
|/
* Implementation of File Exists Function; Delete FileInfos upon Permanent User ...Daniel Schalla2018-06-253-0/+79
* MM-10570: Make permissions reset command clear custom role assignments. (#8976)George Goldberg2018-06-251-0/+15
* MM-8716: Security Update Check URL should have recognisable name. (#8983)George Goldberg2018-06-221-1/+1
* MM-10934 Update server dependencies. (#8981)Christopher Speller2018-06-211-2/+2
* MM-10370: serve subpath (#8968)Jesse Hallam2018-06-212-8/+31
* MM-10425 Include active_channel in cluster update user status messages (#8967)Joram Wilander2018-06-211-1/+1
* Fixing mentionBg typo in import_test.go (#8970)Alex Goodman2018-06-211-2/+2
* Add back the ability to reply to push notifications in iOS (#8977)Elias Nahum2018-06-211-0/+1
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-216-94/+986