Damian Mooyman
d7d6fd8758
Merge 3 into master
...
# Conflicts:
# code/controllers/CMSPageAddController.php
# code/model/ErrorPage.php
# composer.json
# css/screen.css
# tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Daniel Hensby
af4b546050
Merge branch '3.3' into 3
2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3
2016-04-26 01:50:03 +01:00
Damian Mooyman
7a36789130
Cleanup PHPDoc and use injector for AddToCampaignHandler
2016-04-26 11:56:37 +12:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2
...
Conflicts:
code/reports/SideReport.php
2016-04-26 00:09:19 +01:00
scott1702
69d7a3ae7d
Add 'Add to campaign' button to pages
2016-04-22 08:39:39 +12:00
Ingo Schommer
e4861bdc79
Adjust file paths for new static file structure in framework
2016-04-20 21:13:20 +12:00
Patrick Nelson
000bf09354
FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage()
2016-04-06 17:34:55 -07:00
Damian Mooyman
3ed4c0fd52
Merge pull request #1418 from mikenz/patch-2
...
FIX 'Settings' fields being overwritten by 'Content' fields
2016-04-06 13:06:14 +12:00
Damian Mooyman
716baa6b1f
API Support renamed Versioned API
2016-04-01 16:17:47 +13:00
Damian Mooyman
d22ad706a9
API Support new DataObject::can() signature
2016-04-01 16:17:47 +13:00
Damian Mooyman
5852cd56a5
Merge pull request #1433 from open-sausages/pulls/4.0/build-tooling-fixes
...
Build tooling fixes
2016-03-31 11:56:06 +13:00
David Craig
a9d839396d
Ensure all form fields have a form set
2016-03-28 22:25:04 +13:00
Ingo Schommer
abe565eb01
JS build tooling fixes
...
- Relaxed NodeJS dependency to 4.x
- Switch to NPM "dependencies" (rather than dev)
Provides consistency with framework, where these had previously
been broken out between "dependencies" and "devDependencies", which in turn caused issues with "npm shrinkwrap"
- Add npm-shrinkwrap.json: Consistent with framework approach
Using uber's wrapper library since it prevents npm shrinkwrap from failing on file generation,
as well as actually suceeding with an "npm install" once the file is present.
- Don't add comments to dist files via babelify
We've had some issues with different dependencies causing different results based on the environment,
which in turn causes unnecessary diffs - making our work harder to review.
Comments can be read through the ES6 source files, and through source maps when
generated through `npm run build --development`
- Make JS build tooling and naming consistent with framework
2016-03-28 22:22:21 +13:00
Sam Minnee
46b35ecb0e
FIX: Changes to support php7 and new DBFields
...
These changes are necessary for CMS to work with this API breakage:
https://github.com/silverstripe/silverstripe-framework/pull/4551
2016-03-23 10:05:05 +13:00
Daniel Hensby
9d62d9d381
FIX Link tracking not escaping # Fixes #1409
2016-03-21 15:22:00 +00:00
Damian Mooyman
067d44ac6c
API Update link tracking for image shortcodes
2016-03-21 09:08:31 +13:00
Damian Mooyman
4cc7b0806d
API Update to use new Versioned API
...
API CMS notifications for recursive operations
API Un-deprecated delete action and batch actions
API remove deprecated API
2016-03-17 13:44:26 +13:00
Jake Bentvelzen
68694c01b7
Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page.
2016-03-15 10:48:46 +11:00
Daniel Hensby
bc31d9ca9c
FIX Use Controller::join_links() in Reports
2016-03-10 16:39:00 +00:00
Mike Cochrane
70062ebc9c
FIX 'Settings' fields being overwritten by 'Content' fields
...
CMSMain::getEditForm wasn't passing the $fields parameter to the parent. The the "Settings" fields we being replaced with the "Content" settings when requesting /admin/pages/settings/show/123345
2016-03-09 17:40:43 +13:00
Damian Mooyman
849cd898a4
Cleanup trailing whitespace
2016-03-09 10:28:45 +13:00
Damian Mooyman
de6db9f5c6
API Mark image tracking as owned
2016-03-08 10:58:33 +13:00
Andrew Mc Cormack
e6078be52e
Update SiteTree.php
...
Minor type fix
2016-03-07 20:37:29 +00:00
Ingo Schommer
6a53e607f5
Replace CMSForm use with new setValidationResponseCallback() API
...
Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938
2016-03-07 16:49:33 +13:00
micmania1
7c5f29ce19
Removed dependency for translatable module
2016-03-03 23:11:49 +00:00
Damian Mooyman
99c72fce5f
Merge remote-tracking branch 'origin/3'
2016-02-25 14:52:55 +13:00
Damian Mooyman
2734f1a18e
Merge remote-tracking branch 'origin/3.3' into 3
2016-02-24 17:35:46 +13:00
Damian Mooyman
208497ea42
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# lang/en.yml
# lang/lt.yml
2016-02-24 17:32:58 +13:00
Damian Mooyman
1c907dd227
API Support versioned File management
...
API Decouple File and ErrorPage
API Link tracking is now only performed on stage (in lieu of versioned relationships)
API Refactor versioned API methods out of SiteTree and into Versioned
2016-02-22 12:25:25 +13:00
Daniel Hensby
c8748f58f3
Merge pull request #1395 from tractorcow/pulls/4.0/cleanup-object
...
API Remove references to class aliases; Use correct classname
2016-02-19 23:30:26 +00:00
scott1702
26613dc39e
Correctly require CMS lang files
2016-02-18 12:05:27 +13:00
Andrew Aitken-Fincham
644c807031
BUG Use correct formaction for doRollback exemption #1378
2016-02-17 10:20:38 +13:00
Damian Mooyman
99394a84d0
API Remove references to class aliases; Use correct classname
2016-02-17 10:18:33 +13:00
Damian Mooyman
3cefb2edad
Merge remote-tracking branch 'origin/3'
2016-02-12 15:42:33 +13:00
Damian Mooyman
2ad490c3e2
BUG Prevent folders deleted on the filesystem from breaking asset interface
2016-02-09 13:03:40 +13:00
Damian Mooyman
531e7d4c3b
Merge pull request #1384 from dhensby/pulls/modeladmin-reading-mode
...
Removing stage reading mode as it will be set in LeftAndMain
2016-02-04 11:16:34 +13:00
appchecker
8e40b41460
Fix typo
2016-02-02 20:19:23 +03:00
Daniel Hensby
5f10d66e71
Removing stage reading mode as it will be set in LeftAndMain
2016-02-02 13:43:56 +00:00
Damian Mooyman
c9cf833ad6
Merge pull request #1375 from open-sausages/pulls/4.0/module-loader
...
Implement RFC-7 JavaScript module loader in CMS
2016-01-27 16:57:43 +13:00
Damian Mooyman
3d0178ebc0
BUG Use correct formaction for doRollback exemption
2016-01-27 15:38:48 +13:00
scott1702
66f6ecc57e
Implement RFC-7 JavaScript module loader in CMS
2016-01-27 14:56:47 +13:00
Damian Mooyman
17ee318d06
API VirtualPage permissions now can be set independently of the mirrored page
2016-01-27 10:01:14 +13:00
Daniel Hensby
b1b403cd08
FIX Borders on CMS Actions
2016-01-26 14:42:41 +00:00
David Craig
ebe3d24a56
Removed requirements to non-existant file
...
- CMSMain.GridField.js was moved to LeftAndMain.js in a317b6
2016-01-26 16:14:50 +13:00
scott1702
31e7832875
Update paths in AssetAdmin.php
2016-01-26 16:14:40 +13:00
Daniel Hensby
0eb4b8e256
Merge pull request #1314 from kinglozzer/hide_ancestor
...
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 11:57:04 +00:00
Loz Calver
fb43e59b00
FIX: Setting hide_ancestor=true causes a random page type to be hidden
2016-01-25 09:18:35 +00:00
Damian Mooyman
0a2456e71e
Merge remote-tracking branch 'origin/3'
2016-01-25 16:16:53 +13:00
Damian Mooyman
19c24bb2df
Merge remote-tracking branch 'origin/3.3' into 3
2016-01-25 15:58:35 +13:00
