Commit Graph

134 Commits

Author SHA1 Message Date
Steve Boyd
4e6fbe17aa Merge branch '2.2' into 2 2021-12-22 10:28:46 +13:00
Steve Boyd
25e13114d2 MNT Remove obsolete branch-alias 2021-11-30 13:54:56 +13:00
Maxime Rainville
c2c0221ddc
Merge pull request #56 from creative-commoners/pulls/2/sapphire-test-nine
API phpunit 9 support
2021-11-01 21:47:47 +13:00
Steve Boyd
1b3496d66e API phpunit 9 support 2021-10-27 18:09:34 +13:00
Steve Boyd
3f8b3d1eda
Update build status badge 2021-01-21 16:36:05 +13:00
Steve Boyd
346411676c Merge branch '2.1' into 2 2021-01-02 20:07:10 +13:00
Steve Boyd
23ab2ecca1 ENH Update translations 2020-11-18 12:56:02 +13:00
Steve Boyd
040defb708 Merge branch '2.0' into 2 2020-11-11 17:16:06 +13:00
Serge Latyntsev
f8a8e605c3
Merge pull request #55 from creative-commoners/pulls/2.0/shared-config
MNT Use shared travis config, use sminnee/phpunit
2020-11-10 16:54:45 +13:00
Steve Boyd
dca1c67594 MNT Use shared travis config, use sminnee/phpunit 2020-11-10 13:31:11 +13:00
Steve Boyd
42ab5e10b6
Merge pull request #53 from mxmclaudel/bugfix/jquery-update
Update load event registration
2020-06-30 12:54:09 +12:00
Maxime Rainville
d13b3bfe0d Merge branch '2.0' into 2 2020-06-12 14:03:31 +12:00
Maxime Claudel
e551026cad Update load event registration 2020-01-15 14:05:13 +13:00
Aaron Carlino
c4ebf0ad60
META: Add github action to build docs 2019-12-19 13:54:07 +13:00
Serge Latyntsev
c240521832
Merge pull request #48 from creative-commoners/pulls/2/fix-travis
Pulls/2/fix travis
2019-11-18 15:17:35 +13:00
Serge Latyntcev
3e6648558f A small code style fix 2019-11-18 14:47:08 +13:00
Serge Latyntcev
a6a9d142fb Travis config update 2019-11-18 14:42:59 +13:00
Guy Marriott
a3f28bb58b
Update translations 2019-08-20 16:37:58 +12: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