Commit Graph

35 Commits

Author SHA1 Message Date
Guy Sartorelli
6259ca30ad
Merge branch '4' into 5.0
# Conflicts:
#	client/dist/js/TinyMCE_sslink-anchor.js
#	client/dist/js/TinyMCE_sslink-internal.js
#	composer.json
#	tests/behat/features/insert-a-link.feature
#	tests/behat/features/insert-anchor-link.feature
2023-09-18 11:10:29 +12:00
Guy Sartorelli
4a92f5eb64
FIX Allow wrapping an image in a link (#2884) 2023-09-11 12:33:00 +12:00
Guy Sartorelli
ba578cfc06
FIX Allow wrapping an image in a link (#2883)
Relies on logic added to silverstripe/admin, so we need to bump the
constraint as well.

Behat test requires new logic added to the behat-extension module.
2023-09-07 10:24:09 +12:00
Guy Sartorelli
b02beba7ba
Resolve a couple of behat issues (#2830)
* FIX Correctly add message to reactstrap-confirm

* MNT Fix behat tests
2023-01-30 10:32:26 +13:00
Guy Sartorelli
dd79cf5a23
MNT Fix behat test for inserting WYSIWYG links
The selectors for TreeDropdownField's markup changed when we updated
react-select.
2023-01-09 13:01:49 +13:00
Guy Sartorelli
9b64c7de24
Merge branch '4' into 5 2022-10-13 11:18:14 +13:00
Guy Sartorelli
7368df8757
FIX Fix link plugins to support tinymce6 2022-09-30 15:27:38 +13:00
Sabina Talipova
19e9dc4920 ENH Replace ADMIN permissions with less permissions in Behat test 2022-09-09 11:23:44 +12:00
Guy Sartorelli
ead1d2f02b FIX Always include unsaved anchors from the current WYSIWYG field 2022-06-13 11:17:38 +12:00
Sam Minnee
dd06178167 MINOR: Change “Choose Page” to “Search or choose Page”
Based on discussions with James Ford, it wasn’t clear that you could
search.

Companion to https://github.com/silverstripe/silverstripe-framework/pull/8766
2019-01-29 12:15:38 +13:00
Luke Edwards
41c0b8fb85 Fix 'Insert links into a page' test 2018-09-12 13:14:06 +12:00
Aaron Carlino
ca8b728580 replace save draft / save & publish buttons with save, publish 2018-02-09 12:18:57 +13:00
Damian Mooyman
496b9c8c04 API Implement insert-anchor modal 2017-09-20 13:35:25 +12:00
Damian Mooyman
d469a2dc88 Fix regressions from tinymce upgrade (#1923) 2017-08-15 11:05:56 +12:00
Saophalkun Ponlu
6fc1491f0b Enhancement Add edit command and its url test for page insert 2017-07-18 13:11:58 +12:00
Christopher Joe
844420df40 Enhancement Translation strings updated 2017-05-31 16:08:54 +12:00
Damian Mooyman
f82f0844c1
API Add insert internal link modal 2017-05-30 11:00:32 +12:00
Damian Mooyman
eebae1f766
BUG Fix insert link behat command 2017-05-16 16:47:07 +12:00
Christopher Joe
f3b442e9b4 Fix behat tests for insert link to work with react implementation 2017-05-16 11:45:15 +12:00
Damian Mooyman
df100b8798 API Upgrade to behat 3 2017-05-05 17:19:41 +12:00
Damian Mooyman
358bb8baec API Remove insert-media tests (now covered by asset-admin, not cms) 2017-02-27 11:00:10 +13:00
Paul Clarke
9a812101fb Update tests 2016-09-05 11:23:12 +12:00
Damian Mooyman
beba0f2551 BUG Fix behat tests for asset abstraction
Requires https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/111
2016-02-24 15:01:40 +13:00
Damian Mooyman
377af292be Upgrade TinyMCE to 4.x 2016-02-15 14:58:24 +13:00
Damian Mooyman
7dfe145412 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
2016-01-20 13:16:43 +13:00
Damian Mooyman
e706b147cc Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:33 +13:00
Loz Calver
e19dfd628b Add behat coverage to check that file field is reset when adding links 2016-01-11 17:08:28 +00:00
Damian Mooyman
2bd9d00da0 API Remove filesystem sync
API support new asset abstraction
BUG Fix file link tracking for new asset abstraction
2015-10-19 13:42:39 +13:00
David Craig
41ce038c8f Add three column layout to Page content view
- Content filters included in SiteTree view
 - View (tree/list) buttons included in SiteTree view
 - Update view button styles for new layout
 - Updated breadcrumbs for new layout
2015-07-02 10:23:37 +12:00
Damian Mooyman
3b90fef04f BUG fix behat tests
Fixes #1223
2015-07-01 13:24:44 +12:00
Damian Mooyman
42755ebf5b Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347 2014-08-01 12:04:58 +12:00
Damian Mooyman
b8d19ba495 BUG Fix deleted pages redirecting the CMS
Update behat tests for Mink 1.6 compatibility
2014-06-17 10:36:08 +12:00
Damian Mooyman
c5d5d10094 BUG Behat now uses explicit radio button behaviour 2014-05-05 12:46:57 +12:00
madmatt
938fb6f714 Fix behat tests for insert-a-link.feature
- Fix "I can link to a file" scenario.
- Fix "I can link to an anchor” scenario.
- Fix "I can edit a link” scenario.
- MINOR: Grammar fixes.
- Fix "I can remove a link” scenario.
2014-01-06 17:39:05 +13:00
Ingo Schommer
c0cc517635 Migrated behat features from framework 2013-10-08 00:23:44 +02:00