Commit Graph

117 Commits

Author SHA1 Message Date
Serge Latyntcev
53b00762d2 Travis config update, remove branch aliases 2019-11-05 11:22:09 +13:00
Robbie Averill
80da77ac06 Merge branch '2.0' 2019-08-15 14:03:36 +12:00
Robbie Averill
7d17c8eea3 Use trusty distro in Travis builds and update tested SilverStripe versions 2019-08-15 14:03:00 +12:00
Robbie Averill
8198429312 Merge branch '2.0' 2019-08-15 09:55:18 +12:00
Robbie Averill
a01b4609e9
Merge pull request #44 from creative-commoners/pulls/2.0/aria-label-for-frame
FIX Add CMS configurable title for iframe to tell screenreaders it contains frame content
2019-05-17 14:40:36 +12:00
Robbie Averill
097edbc9c2 Update title and description of IFrameTitle field 2019-05-17 14:35:01 +12:00
Robbie Averill
9082db159c FIX Add CMS configurable title for iframe to tell screenreaders it contains frame content 2019-05-17 11:56:07 +12:00
Robbie Averill
58113b4d77
Merge pull request #42 from torque-foxes/fix/legacy-config
FIX move legacy.yml to _config folder to be picked up correctly
2019-04-16 15:05:33 +12:00
Scott Hutchinson
70ff0883e8 FIX move legacy.yml to _config folder to be picked up correctly 2019-04-16 14:56:55 +12:00
Robbie Averill
07fb16fc15 Merge branch '2.0' 2019-04-15 15:40:18 +12:00
Will Rossiter
9c32c062a5 Add legacy.yml for upgrading 2019-04-15 15:40:09 +12:00
Robbie Averill
5fd8fcb561 Merge branch '2.0' 2019-03-01 15:41:56 +13:00
Robbie Averill
f2bff01b74
Merge pull request #40 from robingram/compatibility/inheritance
Change inheritance of controller class
2019-03-01 15:41:20 +13:00
Rob Ingram
de7a66b12a Change inheritance of controller class
This needs to extend from PageController to pick up site templating, styleing etc.
2019-03-01 15:11:18 +13:00
Dylan Wagstaff
d43163e327
Merge pull request #36 from creative-commoners/pulls/2.0/update-docs
DOCS Update readme and userguide to be a bit more specific about what this module does
2019-02-14 10:11:09 +13:00
Robbie Averill
0568665ecb Add note about possibility for a WAF to block requests containing iframes 2019-02-13 09:26:35 +07:00
Robbie Averill
f96cbb0601
Merge pull request #37 from creative-commoners/pulls/2.0/travis
Update Travis to include various SS versions and PHP 7.3 and use PSR-12
2019-02-01 11:48:09 +02:00
Robbie Averill
682d72e08a Update Travis to include various SS versions and PHP 7.3 and use PSR-12 2019-02-01 12:42:52 +03:00
Robbie Averill
14837665b4 DOCS Update readme and userguide to be a bit more specific about what this module does 2019-02-01 12:39:39 +03:00
Dylan Wagstaff
4c251194f7
Merge pull request #35 from silverstripe/wilr-patch-1
Add legacy.yml for upgrading
2019-01-23 13:18:56 +13:00
Will Rossiter
b5306a2f1f
Add legacy.yml for upgrading 2019-01-23 12:13:49 +13:00
Robbie Averill
89fee80220
Merge pull request #34 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:17:19 +12:00
Dylan Wagstaff
a2ac63bb62 Add supported module badge to readme 2018-06-15 17:42:41 +12:00
Guy
ec6ed4b686
Update branch alias for 2.x-dev 2018-06-14 17:15:35 +12:00
Guy
a756b9bcfc
Merge branch '2.0' 2018-06-14 17:13:52 +12:00
Guy
d9c629291f
Remove obsolete branch alias 2018-06-14 17:11:47 +12:00
Dylan Wagstaff
ab75e0cb46
Merge pull request #33 from creative-commoners/pulls/2.0/escaped-right-title
FIX Cast IFrameURL right title as HTMLText to avoid double escaping
2018-04-03 22:30:34 +12:00
Robbie Averill
2b3b0c84eb FIX Cast IFrameURL right title as HTMLText to avoid double escaping 2018-04-03 16:39:50 +12:00
Daniel Hensby
a28df17a06
Merge pull request #31 from creative-commoners/pulls/2.0/table-name
FIX Add table_name to IFramePage
2017-12-04 16:43:14 +00:00
Robbie Averill
3970403b14 FIX Add table_name to IFramePage 2017-12-04 11:35:41 +13:00
Dylan Wagstaff
fdb9d013b7
Merge pull request #30 from creative-commoners/pulls/2.0/update-translations
FIX Update translations to match class namespaces
2017-11-28 09:26:01 +13:00
Robbie Averill
1f0292c564 FIX Update translations to match class namespaces 2017-11-27 16:35:59 +13:00
Dylan Wagstaff
112059c6e5
Merge pull request #29 from creative-commoners/pulls/2.0/rename-code-src
NEW Rename code to src, remove changelog and extraneous codecov file
2017-11-27 15:20:33 +13:00
Robbie Averill
bd5c9c090c NEW Rename code to src, remove changelog and extraneous codecov file 2017-11-27 13:54:53 +13:00
Robbie Averill
c3da4e2b6c
Merge pull request #28 from creative-commoners/pulls/2.0/vendorise-miframe
update readme and docs for SS4 specific infos
2017-11-23 10:59:56 +13:00
Dylan Wagstaff
ef1a6322a7 update readme and docs for SS4 specific infos 2017-11-23 10:47:30 +13:00
Robbie Averill
df6bd2107e
Merge pull request #26 from creative-commoners/pulls/2.0/vendorise-miframe
Pulls/2.0/vendorise miframe
2017-11-22 18:29:20 +13:00
Dylan Wagstaff
352bc67aa8 Update CI tool configurations to fit SS4 conventions
Also update test class to use non-deprecated methods from core (such as
Config::update). Fix a few code sniffer errors.
2017-11-22 18:10:32 +13:00
Robbie Averill
2295c9ae93 Merge branch '1.0' 2017-11-22 18:00:28 +13:00
Robbie Averill
892d97ad6c Freeze Transifex translations for SS3. Please commit directly to lang files. 2017-11-22 17:56:13 +13:00
Dylan Wagstaff
4fb947d0c7 FIX: Use new resource loading syntax for javascript
SilverStripe 4 vendormodule types make use of an 'expose' composer
directive to allow assets they provide to be accessed by a web request.
Previously the javascript for the iFrame resizing business tried to load
from a static path that no longer exists (referenced inside PHP), which
caused a fatal error. This has been fixed along with making the
conditional code for enforcing a protocol on the page's request a bit more
readable & easily digestable to developers.
2017-11-22 17:11:34 +13:00
Dylan Wagstaff
e394d9098c Update to silverstripe-vendormodule type 2017-11-22 16:19:24 +13:00
Damian Mooyman
3c9e89fc00 Merge pull request #23 from ssmarco/pulls/ss4-compat
SS4 Compatibility Changes
2017-06-19 15:46:56 +12:00
Damian Mooyman
1337e4a34d no message 2017-06-19 15:46:35 +12:00
Marco Hermo
5b8e0ba0b1 This merge will upgrade silverstripe iframe module for compatibility with SS4
Implement namespacing
Update unit tests
2017-06-19 14:51:10 +12:00
Daniel Hensby
454cee84df Merge pull request #24 from creative-commoners/pulls/1.0/travis-php7
Add PHP7 + SS3.6 build to Travis configuration
2017-06-15 19:18:08 +01:00
Daniel Hensby
1ee0d33669 Remove codecov comments 2017-06-15 19:18:01 +01:00
Robbie Averill
4fd0638913 Add PHP7 + SS3.6 build to Travis configuration 2017-06-15 11:04:45 +12:00
Robbie Averill
ed00f5a4f0 Update translations 2017-05-12 15:06:51 +12:00
Ingo Schommer
8b04cf2ee9 Don't test on unsupported releases 2017-05-11 08:28:40 +12:00