mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия 1 Пакеты Проекты Релизы Вики Активность
9 659 коммитов 3 Ветки 0 Теги
3922b3ac8c8bcf8c2701be0f5d9496cfa3981bbb
Граф коммитов

9659 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
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 7b2861de3a to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master

* Renamed file to match existing scheme

(cherry picked from commit 8c22c5c6c6)
 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
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
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
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
Pierre de La Morinerie
07fd7aeeb8 Add tests for the platform server command (#8231) 
* Cleanup app state on initialization error

When returning an initialization error, the app state was not cleaned
up. This is especially visible during tests, as `appCount` is not
decremented, and makes the new app initialization fail.

* Test the `platform server` command

As the `platform server` command only exits when interrupted by
a signal, it is not possible to test it as the other cobra
commands. Instead we directly test the actual command function.

The internal command handler is slighly refactored to take
a channel in argument, and registers it as the signal handler.
Nothing very different—except than controlling this channel
from the outside allows the test to send the system signal
itself, thus preventing the server to run forever.
 2018-02-12 08:46:32 -08:00
Jonathan
9707ac3aaf Added invite_id field to email invite url, along with validation of this field on the server (#8235) 2018-02-12 09:16:17 -05:00
Harrison Healey
87fb19b827 Fixed typo in unit test 2018-02-12 08:58:38 -05:00
Christopher Brown
c1b6e8792c minor addition to #8238 2018-02-09 20:08:39 -06:00
Joram Wilander
3e0c3eff9f ABC-228 Update GetPosts caching to work for non-60 limits (#8233) 
* Update GetPosts caching to work for non-60 limits

* Only cache on limits of 30/60 and add test

* Add comments clarifying 30 and 60 limits
 2018-02-09 14:47:22 -08:00
Chris
396e7513ec Don't proxy same-site image urls (#8238) 
* don't proxy same-site urls

* fix empty site url case
 2018-02-09 15:41:06 -06:00
Chris
a4e9499714 Add /v4/image api (#8230) 
* add image api

* i suppose i should add a test...

* only redirect to image proxy
 2018-02-09 13:59:17 -06:00
Chris
0daac7e4fc Add /v4/image api (#8230) 
* add image api

* i suppose i should add a test...

* only redirect to image proxy
 2018-02-09 11:56:11 -08:00
Derrick Anderson
e7b084842a Merge branch 'release-4.7' 2018-02-09 12:59:56 -05:00
Chris
a6309aaf48 Remove license globals entirely (#8229) 
* remove license globals entirely

* fix infinite recursion

* test fix
 2018-02-09 10:04:48 -06:00
Harrison Healey
e2b5f9217f ICU-669 Handle relative links better 2018-02-09 10:05:23 -05:00
Chris
7e8106b95c use mattermost fork of go-bindata (#8216) 2018-02-08 19:43:27 -05:00
Derrick Anderson
1b064c674a Add prepatory code for 4.8.0 (#8226) 
* Add prepatory code for 4.8.0

* formatting issue

* build bug
 2018-02-08 12:12:48 -05:00
Chris
cf929476bd fix client4 post sanitization (#8219) 2018-02-08 11:54:45 -05:00
Harrison Healey
d3a0e561c2 ICU-669 Ensured all URLs returned from OpenGraph are absolute 2018-02-08 10:45:25 -05:00
Derrick Anderson
9bf23ece6c Merge branch 'abc-239' into release-4.7 2018-02-08 10:05:01 -05:00
Derrick Anderson
f28ee8d7c8 Merge branch 'release-4.7' 2018-02-08 09:08:16 -05:00
Chris
0f703a3368 Eliminate utils.SetLicense calls (#8217) 
* eliminate utils.SetLicense calls

* test fix

* another test fix

* more test fixes
 2018-02-07 16:20:51 -06:00
JoramWilander
840892ab88 Increase OAuth2 state parameter limit 2018-02-07 16:21:22 -05:00
enahum
654fc2f749 translations PR 20180205 (#8200) 2018-02-07 14:08:42 -05:00
Chris
eff65aa05c ABC-132: sign error page parameters (#8197) 
* sign error page parameters

* add comments
 2018-02-07 12:05:46 -05:00