Commit Graph

5725 Commits

Author SHA1 Message Date
Chris Joe
af1b2fc37f Merge pull request #1827 from fspringveldt/new/issue-1756
FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage
2017-05-26 15:29:29 +12:00
Franco Springveldt
c034ead6df FIX beforeUpdateCMSFields added to ErrorPage and VirtualPage
References #1756
2017-05-26 13:21:51 +12:00
Daniel Hensby
14a855ed97 Merge pull request #1804 from dnadesign/doArchiveFix
fixing doArchive
2017-05-25 23:13:14 +01:00
Daniel Hensby
61cf72c08d
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare() 2017-05-25 17:22:04 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages 2017-05-24 23:02:41 +01:00
Daniel Hensby
3d238f7f65 Merge pull request #1830 from wernerkrauss/patch-1
ErrorPage not remapping to namespaced class
2017-05-23 19:10:07 +01:00
wernerkrauss
44308edfb1 ErrorPage not remapping to namespaced class 2017-05-23 15:33:22 +02:00
Chris Joe
cf80adcea8 Merge pull request #1825 from open-sausages/pulls/4.0/remove-object
Remove object class
2017-05-23 11:00:33 +12:00
Damian Mooyman
72e46a8fc1 Merge branch 'master' into pulls/4.0/remove-object 2017-05-22 21:17:40 +12:00
Damian Mooyman
b1c194467d Merge pull request #1828 from robbieaverill/pulls/4.0/remove-create-function
Remove create_function implementations, replace with closures
2017-05-22 19:06:32 +12:00
Robbie Averill
b394718b42 Remove create_function implementations, replace with closures 2017-05-22 17:36:19 +12:00
Chris Joe
8953c09e9a Merge pull request #1829 from open-sausages/pulls/4.0/fix-build
Adjust cms .travis.yml build
2017-05-22 11:25:37 +12:00
Damian Mooyman
a6a74cd5a9
Adjust cms .travis.yml build 2017-05-22 10:37:00 +12:00
Damian Mooyman
0abce5e859
Remove object class 2017-05-18 17:13:51 +12:00
Daniel Hensby
63f930c4e9 Merge pull request #1822 from open-sausages/pulls/4.0/override-redirectorpage-fields
ENHANCEMENT RedirectorPage extensions can now modify fields
2017-05-16 15:40:31 +01:00
Damian Mooyman
9a31b19ed2 ENHANCEMENT RedirectorPage extensions can now modify fields
Fixes #579
2017-05-16 23:33:45 +12:00
Chris Joe
f496d09f0e Merge pull request #1823 from open-sausages/pulls/4.0/fix-mce-behat-menu
BUG Fix insert link behat command
2017-05-16 18:28:09 +12:00
Damian Mooyman
eebae1f766
BUG Fix insert link behat command 2017-05-16 16:47:07 +12:00
Chris Joe
58659834c0 Merge pull request #1821 from open-sausages/pulls/4.0/fqn-services
API Rename services to match FQN of interface / classes
2017-05-16 16:27:52 +12:00
Damian Mooyman
49e559b08c
API Rename services to match FQN of interface / classes 2017-05-16 15:49:09 +12:00
Damian Mooyman
6c5e0f829a
BUG Ensure logs are saved to artifacts 2017-05-16 14:20:54 +12:00
Damian Mooyman
bfbac228ba Merge pull request #1819 from open-sausages/pulls/4.0/save-it-width
Fix for save and publish buttons shrinking
2017-05-16 13:43:59 +12:00
Damian Mooyman
0b24e02db4 BUG Fix missing path to travis-upload-artifacts.php 2017-05-16 13:28:00 +12:00
Christopher Joe
e2b7ca2e79 Fix for save and publish buttons shrinking 2017-05-16 12:49:51 +12:00
Damian Mooyman
ac62b732a4 Merge pull request #1815 from open-sausages/pulls/4.0/tinymce-link-dialog
Fix behat tests for insert link to work with react implementation
2017-05-16 12:01:26 +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
367c35a1de Merge pull request #1820 from open-sausages/pulls/4/remove-who-can-view-toggle
Move who-can-view toggle to Admin module
2017-05-15 11:55:42 +12:00
Aaron Carlino
5bd3440e61 Move who-can-view toggle to Admin module 2017-05-15 11:33:18 +12:00
Damian Mooyman
d539109455 Merge pull request #1818 from open-sausages/pulls/4/fix-webpack-dev-config
BUGFIX: Get rid of special dev webpack plugins
2017-05-12 17:17:02 +12:00
Aaron Carlino
13e6d8ca76 Get rid of special dev plugins 2017-05-12 14:38:05 +12:00
Aaron Carlino
de079154f4 BUGFIX: Webpack dev config was overwriting plugins rather than concatenating 2017-05-12 13:50:17 +12:00
Damian Mooyman
23e1aa8c45 API Refactor inherited permissions (#1811) 2017-05-12 12:47:46 +12:00
Damian Mooyman
fc2219dc72 .travis.yml code cleanup
Fixed indentation
Move coverage build to script
Update travis node version to 6
Update npm to use yarn for CI
2017-05-11 10:03:13 +12:00
Sam Minnee
14540729ca FIX: Use framework 3.5 to test cms 3.5 2017-05-09 11:41:55 +12:00
Damian Mooyman
1efb325b4d Merge pull request #1813 from open-sausages/pulls/4.0/remove-deprecated-methods
Remove APIs with target deprecation of 4.0
2017-05-09 11:36:49 +12:00
Ingo Schommer
4923a2597b Replaced usage of ResetFormAction (#1812)
See https://github.com/silverstripe/silverstripe-framework/pull/6883
2017-05-09 11:11:08 +12:00
Daniel Hensby
fa307a5dfe
Merge branch '3.6' into 3 2017-05-08 16:24:33 +01:00
Daniel Hensby
db7b1b9bd6
Merge branch '3.6.0' into 3.6 2017-05-08 16:24:04 +01:00
Daniel Hensby
aedbc83517
Merge branch '3.5' into 3.6 2017-05-08 16:23:51 +01:00
Damian Mooyman
c65d48f112 Prevent installation from removing behat.yml 2017-05-08 22:56:07 +12:00
Ingo Schommer
484a4ec4f6 API Removed deprecated RootURLController:set_default_homepage_link 2017-05-08 21:17:36 +12:00
Ingo Schommer
de41e14518 API Removed deprecated ModelAsController::find_old_page() 2017-05-08 21:14:38 +12:00
Aaron Carlino
359179025d Reorganise i18n keys 2017-05-08 17:57:24 +12:00
Sam Minnee
11b8926c1a fixup - prefer-stable necessary to avoid armageddon 2017-05-05 17:19:41 +12:00
Sam Minnee
6ddd753471 fixup - fix behat.paths.base reference 2017-05-05 17:19:41 +12:00
Sam Minnee
e2271d1b0a fixup - make behat work 2017-05-05 17:19:41 +12:00
Sam Minnee
f4179d608d NEW: Simplify test runs. 2017-05-05 17:19:41 +12:00
Sam Minnee
c1b3d87b58 fixup - don't need to explicitly include testsession 2017-05-05 17:19:41 +12:00
Damian Mooyman
df100b8798 API Upgrade to behat 3 2017-05-05 17:19:41 +12:00
John Milmine
618c7f126d changed to static function so that subclasses of Versioned will be picked up 2017-05-04 15:05:25 +12:00