Chris
caf9c24099
MM-9688: Better error message for plugin enabling in HA mode ( #8433 )
...
* better error message for plugin enabling in HA mode
* wording update
2018-03-13 11:03:12 -05:00
Joram Wilander
4ae1238bc1
Better error handling for failed plugin activation ( #8361 )
2018-03-13 10:32:24 -04:00
Derrick Anderson
0d1177cdf9
Merge remote-tracking branch 'origin/release-4.8' into t3mergetomaster
2018-03-12 16:47:55 -04:00
Jesús Espino
f2d26801b9
Adding new global relay settings to diagnostics and default.json ( #8441 )
2018-03-12 17:52:17 +00:00
Harrison Healey
4e26594fcb
Removed mssola/user_agent library ( #8417 )
...
* Removed mssola/user_agent library
* Changed user agent tests to use t.Run
2018-03-12 10:21:20 -04:00
Carlos Tadeu Panato Junior
cb1b8fc333
[MM-9725] Slack compatibility code in webhooks captures incorrect text ( #8428 )
2018-03-12 07:40:11 -04:00
Harrison Healey
22f2245a26
ICU-682 Stopped sending out of channel mention warnings for system messages ( #8426 )
2018-03-09 12:16:27 -05:00
Joram Wilander
8ad99b4b1f
Remove query to update channel extra_update_at field on user activation/deactivation ( #8415 )
2018-03-09 08:06:31 -05:00
Stephen Kiers
302dae5bb9
MM-9274- Sort Users in Channel by status ( #8181 )
...
* sort by lastActivity
* added status ordering to Users
* sort offline before dnd
* remove data not needed
* added seperate call for when order=‘status’ is on GetUser request
* remove PrintLn
* styling fix
* remove mistake
* mistake 2
* better comment
* explicit if statemnt
* writing tests
* removed manually added mocks
* generated mock
* ICU-668 Added unit tests
* style fix
* sort by lastActivity
* added status ordering to Users
* sort offline before dnd
* remove data not needed
* added seperate call for when order=‘status’ is on GetUser request
* remove PrintLn
* styling fix
* remove mistake
* mistake 2
* better comment
* explicit if statemnt
* writing tests
* removed manually added mocks
* generated mock
* ICU-668 Added unit tests
* style fix
* reverse dnd and offline
* Fixed app.SaveStatusAndBroadcast
* Fixed incorrect merge
* Fixing incorrect merge again
2018-03-09 07:48:30 -05:00
Chris
e8943936c5
general cleanup ( #8387 )
2018-03-07 12:36:40 -06:00
Jonathan
d448a6bef3
XYZ-87: GlobalRelay DM Exports do not Include Channel Name ( #8275 )
...
* Adding ChannelMemberHistory table records when DM channels are created. This ensures that both participants in a DM are shown in compliance export, even if only one of them typed anything
* Direct/Group Message channels now get pretty display names for the purpose of compliance exports
* Fixed string formatting in t.Fatal calls
* Changed uses of ChannelMemberHistory over to ChannelMemberHistoryResult in tests. This should have been done as a part of the work in XYZ-110, but seems to have been missed in this branch for some reason
2018-03-07 15:54:51 +00:00
Philippe GRANET
09713ff4ea
Add addedUser IDs to render correctly in client based on teammate name display setting ( #8400 )
...
See PLT-7776 on mattermost-webapp:
https://github.com/mattermost/mattermost-webapp/pull/353
2018-03-07 21:00:35 +08:00
Joram Wilander
4a1802c039
MM-9664 Add invalidation metrics for store caches ( #8340 )
...
* Add invalidation metrics for store caches
* Increment session invalidation metric
* Fix tests
2018-03-05 10:35:26 -05:00
Jesse Hallam
fbff94f3be
MM-8604: emit config/license websocket events ( #8371 )
2018-03-05 12:18:22 +00:00
Chris
4ebf974690
remove go Publish(...) idiom ( #8373 )
2018-03-02 16:49:18 +00:00
Christian Hoff
2b3b6051d2
PLT-7567: Integration of Team Icons ( #8284 )
...
* PLT-7567: Integration of Team Icons
* PLT-7567: Read replica workaround, upgrade logic moved, more concrete i18n key
* PLT-7567: Read replica workaround, corrections
* PLT-7567: upgrade correction
2018-03-01 19:11:44 +00:00
Christopher Speller
838295f82c
Fix forward 80 to 443 to not bind on all interfaces. ( #8360 )
2018-02-23 18:33:36 -05:00
Chris
55261a2b15
fix scheduled task race ( #8355 )
2018-02-23 12:56:32 -06:00
Joram Wilander
4211a2bb3c
Fall back to constructured URL for OAuth SSO if SiteURL not set ( #8352 )
2018-02-23 10:08:35 -05:00
Chris
d44ef7ea67
Remove global site url ( #8343 )
...
* remove global site url
* missed one
* revert mysterious change
2018-02-22 18:23:32 -06:00
Joram Wilander
1b3808f3ec
Fix push notification content for file only messages ( #8346 )
2018-02-22 09:00:13 -05:00
Christopher Speller
75d9a3a3b9
MM-8681 Adding config settings necessary for using CloudFront. ( #8307 )
...
* Adding config settings nessisary for using CloudFront.
* Adding new config settings to diagnostics.
2018-02-20 12:49:45 -08:00
Chris
19a5d0047d
MM-8710: Web Hub optimizations ( #8293 )
...
* webhub optimizations
* test fix
* minor fix
* big perf improvement to ToJson after precomputing
* fix hub connection count
2018-02-20 10:50:10 -08:00
Harrison Healey
babd795d79
MM-9556 Added ability to upload files without a multipart request ( #8306 )
...
* MM-9556 Added ability to upload files without a multipart request
* MM-9556 Handled some unusual test behaviour
2018-02-20 10:41:00 -05:00
Jesús Espino
c39291597b
Remove unnecesary line
2018-02-19 21:09:36 +01:00
Saturnino Abril
45d7c51d9f
merge 4.7.1 to master
2018-02-19 23:47:34 +08:00
Chris
30197584d5
always return non-nil client license ( #8317 )
2018-02-16 14:51:46 -05:00
Jesús Espino
c158e9a5a0
XYZ-114 Adding mandatory membership to town-square in bulk-import ( #8274 )
2018-02-15 15:31:48 +00:00
Derrick Anderson
88d693a950
Merge branch 'release-4.7' into icu753
2018-02-14 00:53:04 -05:00
Derrick Anderson
82209b9452
Merge branch 'XYZ-110' into release-4.7
2018-02-14 00:51:40 -05:00
Derrick Anderson
50b648156c
Merge branch 'ICU-764' into release-4.7
2018-02-14 00:48:30 -05:00
Derrick Anderson
afa7f70f53
Merge branch 'XYZ-111' of https://github.com/jespino/platform into jespino-XYZ-111
2018-02-14 00:46:05 -05:00
Derrick Anderson
e43f381764
gofmt
2018-02-13 23:46:49 -05:00
Derrick Anderson
4e4535bda9
Merge release-4.7 with master in side branch
2018-02-13 23:20:27 -05:00
Stephen Kiers
69e56fc042
gofmt
2018-02-13 13:20:46 -07:00
Jonathan
bf1fdf92c7
XYZ-110: Cherrypicking changes from release-4.7 to master ( #8254 )
...
* Cherry-picking 7b2861de3a8c22c5c6c6
2018-02-13 15:17:29 -05:00
Stephen Kiers
2544ad70c3
rerun jenkins?
2018-02-13 13:01:31 -07:00
Stephen Kiers
1fe522659b
remove debug statement
2018-02-13 11:51:38 -07:00
Stephen Kiers
08c21f7519
Added more tests and simplified code
2018-02-13 10:49:48 -07:00
Harrison Healey
3fef21e350
ICU-753 Added unit tests for messages with only push notifications
2018-02-13 09:57:23 -05:00
Harrison Healey
c1b49f8b77
ICU-753 Added unit tests for push notification contents
2018-02-13 09:57:23 -05:00
Harrison Healey
b8a4316b13
ICU-753 Remove special behaviour for group messages in generic push notifications
2018-02-13 09:57:23 -05:00
Jonathan Fritz
18fa32567b
Merge branch 'release-4.7' into XYZ-110
2018-02-13 08:39:56 -05:00
Jesús Espino
bda8736770
XYZ-111: Check max users per team on re-join after leave a team
2018-02-13 10:43:28 +01:00
Stephen Kiers
bdf478c75b
Added another test
2018-02-12 20:50:20 -07:00
Chris
fbef16f863
Merge branch 'release-4.7' into rm-willnorris-proxy-support
2018-02-12 18:36:39 -06:00
Stephen Kiers
0cbba46018
Fixes ICU-764
2018-02-12 16:30:03 -07:00
Jonathan Fritz
7b2861de3a
Removed unused fields from ChannelMemberHistory table, introduced new model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables
2018-02-12 16:14:52 -05:00
Derrick Anderson
c209e44574
revert master changes
2018-02-12 16:01:02 -05:00
Derrick Anderson
efd620d6c8
Merge branch 'release-4.7' into icu669
2018-02-12 15:09:59 -05:00
