Граф коммитов

  • 2fba6fa799 Fix prerequisites checker so 1.10 > 1.9 (#8344) Fede 2018-02-27 23:53:27 +01:00
  • 2782602c6e Temporarily disable flaky TestSendMailUsingConfigAdvanced test (#8379) Joram Wilander 2018-02-27 18:07:31 +00:00
  • ae1acbda49 MM-9698 Fixing Minio with server side encryption. (#8367) Christopher Speller 2018-02-26 06:45:35 -08:00
  • f0f4f68def add individual platform packaging targets (#8366) Chris 2018-02-26 01:48:56 -06:00
  • 838295f82c Fix forward 80 to 443 to not bind on all interfaces. (#8360) Christopher Speller 2018-02-23 15:33:36 -08:00
  • babccba8f8 Merge branch 'merge47intomaster' Derrick Anderson 2018-02-23 15:34:04 -05:00
  • 4538857ae3 Merge remote-tracking branch 'origin/release-4.7' into merge47intomaster Derrick Anderson 2018-02-23 15:14:01 -05:00
  • 55261a2b15 fix scheduled task race (#8355) Chris 2018-02-23 12:56:32 -06:00
  • 5fb4b1bc93 MM-8593 Default APIv3 to disabled for new installs (#8353) Joram Wilander 2018-02-23 10:55:02 -05:00
  • 4211a2bb3c Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352) Joram Wilander 2018-02-23 10:08:35 -05:00
  • d44ef7ea67 Remove global site url (#8343) Chris 2018-02-22 18:23:32 -06:00
  • 1b3808f3ec Fix push notification content for file only messages (#8346) Joram Wilander 2018-02-22 09:00:13 -05:00
  • 659ce8c600 Change log level of 404s to DEBUG (#8339) Joram Wilander 2018-02-21 09:20:10 -05:00
  • 342d05bcfc Adding saml migration command (#8263) Jesús Espino 2018-02-21 14:34:03 +01:00
  • 75d9a3a3b9 MM-8681 Adding config settings necessary for using CloudFront. (#8307) Christopher Speller 2018-02-20 12:49:45 -08:00
  • febc129eca Update en.json (#8332) Jason Blais 2018-02-20 13:56:50 -05:00
  • 19a5d0047d MM-8710: Web Hub optimizations (#8293) Chris 2018-02-20 12:50:10 -06:00
  • babd795d79 MM-9556 Added ability to upload files without a multipart request (#8306) Harrison Healey 2018-02-20 10:41:00 -05:00
  • 21afaf4bed MM-8825: Make consistent INVITE_USER and ADD_USER_TO_TEAM permissions checking (#8326) Jesús Espino 2018-02-20 16:19:35 +01:00
  • f85d910592 Added t.Helper to CheckXStatus test functions (#8305) Harrison Healey 2018-02-20 08:51:01 -05:00
  • 18a1599e92 translations PR 20180220 (#8334) enahum 2018-02-20 10:43:01 -03:00
  • 0145cd4da8 Merge branch 'merge-4.7' Derrick Anderson 2018-02-19 17:07:39 -05:00
  • c39291597b Remove unnecesary line Jesús Espino 2018-02-19 21:09:36 +01:00
  • 45d7c51d9f merge 4.7.1 to master Saturnino Abril 2018-02-19 23:47:34 +08:00
  • f8289eb286 Merge branch 'master' into advanced-permissions-phase-1 George Goldberg 2018-02-19 11:19:39 +00:00
  • 8891fa2a5e MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS permissions (#8300) Jesús Espino 2018-02-19 12:13:29 +01:00
  • 0e718a632a MM-9618: Don't change default role permissions for policy. (#8303) George Goldberg 2018-02-19 10:16:45 +00:00
  • a9d4c7d4c1 Merge branch 'mm-9633' into release-4.7 Derrick Anderson 2018-02-16 19:13:08 -05:00
  • 291432e254 Add upgrade code from 4.7.0 to 4.7.1 JoramWilander 2018-02-16 17:14:22 -05:00
  • 98bd9a0753 Remove bad field from ChannelMemberHistory model JoramWilander 2018-02-16 17:03:12 -05:00
  • 30197584d5 always return non-nil client license (#8317) Chris 2018-02-16 13:51:46 -06:00
  • 8c3a7b75de [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) Carlos Tadeu Panato Junior 2018-02-16 17:29:12 +01:00
  • 6d8f122a51 Upgrading server dependancies (#8308) Christopher Speller 2018-02-16 06:47:51 -08:00
  • b112747de7 Send systemd READY notification (#8296) Pierre de La Morinerie 2018-02-16 06:17:03 +05:30
  • 2930766c65 PLT-8723: Fix DeadLock on reactions insertions (#8225) Jesús Espino 2018-02-16 01:41:49 +01:00
  • c158e9a5a0 XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274) Jesús Espino 2018-02-15 16:31:48 +01:00
  • 05d84a8008 Modified advanced mail implementation to properly support multiple attachments with the same file name (#8289) Jonathan 2018-02-15 03:02:31 -05:00
  • 9360131992 Merge branch 'translations-20180215' into release-4.7 Derrick Anderson 2018-02-14 21:22:42 -05:00
  • 7f93d17a5f translations PR 20180215 Elias Nahum 2018-02-15 02:04:21 +00:00
  • 44a27125de Wait for goroutines to finish before shuting down server (#8259) Pierre de La Morinerie 2018-02-14 23:48:06 +05:30
  • cafa4e4370 Merge branch 'release-4.7-t3merge3' Derrick Anderson 2018-02-14 12:58:36 -05:00
  • 642d78173a Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 Martin Kraft 2018-02-14 08:53:25 -05:00
  • 622fb1a50f Merge branch 'icu753' into release-4.7 Derrick Anderson 2018-02-14 00:53:28 -05:00
  • 88d693a950 Merge branch 'release-4.7' into icu753 Derrick Anderson 2018-02-14 00:53:04 -05:00
  • 82209b9452 Merge branch 'XYZ-110' into release-4.7 Derrick Anderson 2018-02-14 00:51:40 -05:00
  • 2fa49a41f7 Merge branch 'translations-20180212' into release-4.7 Derrick Anderson 2018-02-14 00:50:23 -05:00
  • 50b648156c Merge branch 'ICU-764' into release-4.7 Derrick Anderson 2018-02-14 00:48:30 -05:00
  • 963150b6ec Merge branch 'jespino-XYZ-111' into release-4.7 Derrick Anderson 2018-02-14 00:46:43 -05:00
  • afa7f70f53 Merge branch 'XYZ-111' of https://github.com/jespino/platform into jespino-XYZ-111 Derrick Anderson 2018-02-14 00:46:05 -05:00
  • 63d45a0ada ping jenkins Derrick Anderson 2018-02-14 00:12:57 -05:00
  • e43f381764 gofmt Derrick Anderson 2018-02-13 23:46:49 -05:00
  • 4e4535bda9 Merge release-4.7 with master in side branch Derrick Anderson 2018-02-13 23:20:27 -05:00
  • 69e56fc042 gofmt Stephen Kiers 2018-02-13 13:20:46 -07:00
  • bf1fdf92c7 XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) Jonathan 2018-02-13 15:17:29 -05:00
  • 2544ad70c3 rerun jenkins? Stephen Kiers 2018-02-13 13:01:31 -07:00
  • bfb2e85bf6 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 Martin Kraft 2018-02-13 14:05:24 -05:00
  • a43928cca8 ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) Joram Wilander 2018-02-13 11:08:49 -05:00
  • 1fe522659b remove debug statement Stephen Kiers 2018-02-13 11:51:38 -07:00
  • 0663f5f88d XYZ-78: Add note to upgrade code about advanced permissions migration. (#8267) George Goldberg 2018-02-13 18:03:09 +00:00
  • 08c21f7519 Added more tests and simplified code Stephen Kiers 2018-02-13 10:49:48 -07:00
  • 5c560db810 ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) Joram Wilander 2018-02-13 11:08:49 -05:00
  • 8c22c5c6c6 Renamed file to match existing scheme Jonathan Fritz 2018-02-13 10:48:34 -05:00
  • 3fef21e350 ICU-753 Added unit tests for messages with only push notifications Harrison Healey 2018-02-12 12:56:46 -05:00
  • c1b49f8b77 ICU-753 Added unit tests for push notification contents Harrison Healey 2018-02-12 11:50:41 -05:00
  • b8a4316b13 ICU-753 Remove special behaviour for group messages in generic push notifications Harrison Healey 2018-02-12 11:09:51 -05:00
  • 5c101253c5 Merge branch 'master' into advanced-permissions-phase-1 George Goldberg 2018-02-13 13:35:52 +00:00
  • 18fa32567b Merge branch 'release-4.7' into XYZ-110 Jonathan Fritz 2018-02-13 08:39:56 -05:00
  • 8b79f5d49c Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7 Derrick Anderson 2018-02-13 08:16:38 -05:00
  • b7fc3d7d35 Updates migration tests to reflect front-end mapping changes. (#8237) Martin Kraft 2018-02-13 06:08:21 -05:00
  • bda8736770 XYZ-111: Check max users per team on re-join after leave a team Jesús Espino 2018-02-13 10:43:28 +01:00
  • bdf478c75b Added another test Stephen Kiers 2018-02-12 20:50:20 -07:00
  • fbef16f863 Merge branch 'release-4.7' into rm-willnorris-proxy-support Chris 2018-02-12 18:36:39 -06:00
  • 0cbba46018 Fixes ICU-764 Stephen Kiers 2018-02-12 16:30:03 -07:00
  • 445a356d0d translations PR 20180212 Elias Nahum 2018-02-12 23:08:38 +00:00
  • 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 Jonathan Fritz 2018-02-12 16:14:52 -05:00
  • 32c1f7be23 Merge branch 'release-4.7-revertmaster' into release-4.7 Derrick Anderson 2018-02-12 16:13:01 -05:00
  • c209e44574 revert master changes Derrick Anderson 2018-02-12 16:01:02 -05:00
  • 62efb1df75 Merge branch 'icu669' into release-4.7 Derrick Anderson 2018-02-12 15:10:22 -05:00
  • efd620d6c8 Merge branch 'release-4.7' into icu669 Derrick Anderson 2018-02-12 15:09:59 -05:00
  • d88d2bc2ed Merge branch 'release-4.7-t4merge' Derrick Anderson 2018-02-12 14:50:52 -05:00
  • 56f49cf486 poke jenkins Christopher Brown 2018-02-12 13:44:27 -06:00
  • 3da5df3c90 Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge Derrick Anderson 2018-02-12 14:13:29 -05:00
  • 141cfd2f9b remove willnorris/imageproxy support Christopher Brown 2018-02-12 13:05:01 -06:00
  • 1ae680aefa Merge branch 'master' into release-4.7 Chris 2018-02-12 12:02:54 -06:00
  • 9325430859 XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245) Martin Kraft 2018-02-12 12:49:29 -05:00
  • 07fd7aeeb8 Add tests for the platform server command (#8231) Pierre de La Morinerie 2018-02-12 22:16:32 +05:30
  • 9707ac3aaf Added invite_id field to email invite url, along with validation of this field on the server (#8235) Jonathan 2018-02-12 09:16:17 -05:00
  • 87fb19b827 Fixed typo in unit test Harrison Healey 2018-02-12 08:58:38 -05:00
  • 1edcabbc9b Fix tests. (#8244) George Goldberg 2018-02-12 13:52:42 +00:00
  • c1b6e8792c minor addition to #8238 Christopher Brown 2018-02-09 20:08:39 -06:00
  • 3e0c3eff9f ABC-228 Update GetPosts caching to work for non-60 limits (#8233) Joram Wilander 2018-02-09 17:47:22 -05:00
  • 396e7513ec Don't proxy same-site image urls (#8238) Chris 2018-02-09 15:41:06 -06:00
  • a4e9499714 Add /v4/image api (#8230) Chris 2018-02-09 13:56:11 -06:00
  • 0daac7e4fc Add /v4/image api (#8230) Chris 2018-02-09 13:56:11 -06:00
  • e7b084842a Merge branch 'release-4.7' Derrick Anderson 2018-02-09 12:59:56 -05:00
  • a6309aaf48 Remove license globals entirely (#8229) Chris 2018-02-09 10:04:48 -06:00
  • 3b83cc7dd3 XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160) Martin Kraft 2018-02-09 10:57:07 -05:00
  • 0aa7ecd5e8 AllowEditPost and PostEditTimeLimit migration (#8208) Jesús Espino 2018-02-09 16:31:01 +01:00
  • e2b5f9217f ICU-669 Handle relative links better Harrison Healey 2018-02-09 10:05:23 -05:00
  • 7e8106b95c use mattermost fork of go-bindata (#8216) Chris 2018-02-08 18:43:27 -06:00