Periodic merge upstream #3

Merged

djpbessems merged 7 commits from development into master

2019-06-19 10:57:55 +00:00

Author	SHA1	Message	Date
Danny Bessems	dca8f74f25	Minor edits (housekeeping)	2019-06-19 10:55:01 +00:00
Danny Bessems	21f272e9f0	Renamed file to reflect actual purpose	2019-06-19 10:37:20 +00:00
Danny Bessems	5a2d3313e7	Added missing CORS headers and xhrFields	2019-06-19 10:34:31 +00:00
Danny Bessems	6081e42d14	Resolved merge conflicts	2019-06-19 10:14:04 +00:00
Danny Bessems	0675ad8512	Controller for cross-domain iframes added	2019-06-19 10:09:46 +00:00
Danny Bessems	ee35696cd4	Controller for cross-domain iframes added	2019-06-18 13:21:44 +00:00
Danny Bessems	e3405369ca	Delete 'public/misc/script.theme.js'	2019-03-13 10:53:22 +00:00