Jesús Espino
c158e9a5a0
XYZ-114 Adding mandatory membership to town-square in bulk-import ( #8274 )
2018-02-15 15:31:48 +00:00
Jonathan
05d84a8008
Modified advanced mail implementation to properly support multiple attachments with the same file name ( #8289 )
2018-02-15 09:02:31 +01:00
Derrick Anderson
9360131992
Merge branch 'translations-20180215' into release-4.7
2018-02-14 21:22:42 -05:00
Elias Nahum
7f93d17a5f
translations PR 20180215
2018-02-15 02:04:21 +00:00
Pierre de La Morinerie
44a27125de
Wait for goroutines to finish before shuting down server ( #8259 )
...
When running server tests, the server will exit while some jobs spawned
through a goroutine are still running. This may crash the test harness,
as the jobs try to access a shut down app instance.
Fortunately the fix is easy: we just have to use the same App
goroutine-counting facility than the rest of the method's goroutines.
2018-02-14 12:18:06 -06:00
Derrick Anderson
cafa4e4370
Merge branch 'release-4.7-t3merge3'
2018-02-14 12:58:36 -05:00
Martin Kraft
642d78173a
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
2018-02-14 08:53:25 -05:00
Derrick Anderson
622fb1a50f
Merge branch 'icu753' into release-4.7
2018-02-14 00:53:28 -05: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
2fa49a41f7
Merge branch 'translations-20180212' into release-4.7
2018-02-14 00:50:23 -05:00
Derrick Anderson
50b648156c
Merge branch 'ICU-764' into release-4.7
2018-02-14 00:48:30 -05:00
Derrick Anderson
963150b6ec
Merge branch 'jespino-XYZ-111' into release-4.7
2018-02-14 00:46:43 -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
63d45a0ada
ping jenkins
2018-02-14 00:12:57 -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
Martin Kraft
bfb2e85bf6
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
2018-02-13 14:05:24 -05:00
Joram Wilander
a43928cca8
ABC-176 Prevent changing PluginSettings.EnableUploads through the API ( #8249 )
...
* Prevent changing PluginSettings.EnableUploads through the API
* Contain api4 test case in it's own test
2018-02-13 14:05:18 -05:00
Stephen Kiers
1fe522659b
remove debug statement
2018-02-13 11:51:38 -07:00
George Goldberg
0663f5f88d
XYZ-78: Add note to upgrade code about advanced permissions migration. ( #8267 )
2018-02-13 18:03:09 +00:00
Stephen Kiers
08c21f7519
Added more tests and simplified code
2018-02-13 10:49:48 -07:00
Joram Wilander
5c560db810
ABC-176 Prevent changing PluginSettings.EnableUploads through the API ( #8249 )
...
* Prevent changing PluginSettings.EnableUploads through the API
* Contain api4 test case in it's own test
2018-02-13 11:08:49 -05:00
Jonathan Fritz
8c22c5c6c6
Renamed file to match existing scheme
2018-02-13 10:48:34 -05: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
George Goldberg
5c101253c5
Merge branch 'master' into advanced-permissions-phase-1
2018-02-13 13:46:01 +00:00
Jonathan Fritz
18fa32567b
Merge branch 'release-4.7' into XYZ-110
2018-02-13 08:39:56 -05:00
Derrick Anderson
8b79f5d49c
Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7
2018-02-13 08:16:38 -05:00
Martin Kraft
b7fc3d7d35
Updates migration tests to reflect front-end mapping changes. ( #8237 )
2018-02-13 12:08:21 +01: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
Elias Nahum
445a356d0d
translations PR 20180212
2018-02-12 23:08:38 +00: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
32c1f7be23
Merge branch 'release-4.7-revertmaster' into release-4.7
2018-02-12 16:13:01 -05:00
Derrick Anderson
c209e44574
revert master changes
2018-02-12 16:01:02 -05:00
Derrick Anderson
62efb1df75
Merge branch 'icu669' into release-4.7
2018-02-12 15:10:22 -05:00
Derrick Anderson
efd620d6c8
Merge branch 'release-4.7' into icu669
2018-02-12 15:09:59 -05:00
Derrick Anderson
d88d2bc2ed
Merge branch 'release-4.7-t4merge'
2018-02-12 14:50:52 -05:00
Christopher Brown
56f49cf486
poke jenkins
2018-02-12 13:44:27 -06:00
Derrick Anderson
3da5df3c90
Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge
2018-02-12 14:13:29 -05:00
Christopher Brown
141cfd2f9b
remove willnorris/imageproxy support
2018-02-12 13:05:01 -06:00
Chris
1ae680aefa
Merge branch 'master' into release-4.7
2018-02-12 12:02:54 -06:00
Martin Kraft
9325430859
XYZ-73: Removes EnableOnlyAdminIntegrations uses. ( #8245 )
2018-02-12 18:49:29 +01:00
