tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
5,263 Commits 29 Branches 403 Tags 28 MiB
dd5c050108
Commit Graph

2510 Commits

Author SHA1 Message Date
Hamish Friedlander
25a8fb87da Merge pull request #1571 from open-sausages/pulls/4.0/virtualpage-controller 
API Better behaviour for virtualised controller
 2016-08-10 07:09:54 +07:00
Damian Mooyman
63fc4dbcae BUG Fix extra border in page settings 
Fixes #1547
 2016-08-09 17:19:45 +12:00
Damian Mooyman
7c13f7f75f Merge 3.4 into 3 
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
 2016-08-05 19:14:57 +12:00
Damian Mooyman
afc9bb0dc6 Merge 3.3 into 3.4 
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml
 2016-08-05 16:46:35 +12:00
Damian Mooyman
19b811555c
API Move NestedController from cms to framework 2016-08-05 10:56:06 +12:00
Damian Mooyman
70179c8b87
API Better behaviour for virtualised controller 2016-08-04 14:19:33 +12:00
Paul Clarke
43ceeebb82 Gridfield updates for new styling. Mainly class update 2016-08-03 12:10:54 +12:00
Damian Mooyman
7c151321b4 BUG Fix issue with old asset-admin repeating "level up" button 
BUG Fix incorrectly built dist files
 2016-08-01 17:38:22 +12:00
Jonathon Menz
c965133da0 FIX Direct edit file by URL 
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
 2016-07-29 16:53:31 -07:00
Damian Mooyman
d7fa00267e
Fix field casting 2016-07-28 12:06:05 +12:00
Paul Clarke
1c2228f508 Template reorder and adjust step styles 2016-07-28 10:24:06 +12:00
Damian Mooyman
47e06bd2be Adjust layout of page search form 2016-07-26 10:42:23 +12:00
Daniel Hensby
75d72285c7 Merge pull request #1556 from open-sausages/pulls/4.0/remove-obsolete-actions 
API Remove obsolete API
 2016-07-25 15:33:21 +01:00
Daniel Hensby
1ae58bbc82
Merge branch '3' 2016-07-25 14:51:39 +01:00
Damian Mooyman
3306deb69b BUG Fix link concatenation in SilverStripeNavigator (#1560) 
Fixes #1557
Fixes https://github.com/tractorcow/silverstripe-fluent/issues/219
 2016-07-25 14:34:45 +01:00
Daniel Hensby
4f99ced5df
Merge branch '3.3' into 3.4 2016-07-25 14:12:31 +01:00
Damian Mooyman
ff07a2e264 API Convert CMS forms to bootstrap 
API Update to cms-forms theme

This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
 2016-07-25 17:25:22 +12:00
Damian Mooyman
886d65ad37 API Remove obsolete Folder_UsusedAssetsField 2016-07-25 10:16:18 +12:00
Damian Mooyman
4d007cd13c API remove obsolete CMSMain::buildbrokenlinks() 2016-07-25 10:15:45 +12:00
Damian Mooyman
b135c2566c API remove obsolete UpgradeSiteTreePermissionSchemaTask 2016-07-25 10:15:28 +12:00
Robbie Averill
82e54314bf FIX do not show HiddenClass pages in allowed children (#1555) 
* FIX do not show HiddenClass pages in allowed children

* Resolves #1553

* * Update SiteTreeTest to include HiddenClass checks
* Refactor testAllowedChildren to use a data provider
 2016-07-22 09:45:14 +01:00
Daniel Hensby
a8cf17b008 Merge pull request #1551 from phptek/issue/1054 
FIX: Fixes #1054 By preventing errors in the CMS _only_.
 2016-07-21 12:18:33 +01:00
Russell Michell
10e06dce50 FIX: Fixes #1054 By preventing errors in the CMS _only_. 
MINOR Boyscouting: Addition of missing braces, default return and missing types in @return annotation.
 2016-07-21 20:07:30 +12:00
Daniel Hensby
6b4617d476 Merge pull request #1549 from dhensby/pulls/4/admin-url-fix 
FIX Allow changing admin URLs
 2016-07-19 14:48:19 +01:00
Daniel Hensby
0a7437db40
FIX Allow changing admin URLs 2016-07-18 12:44:20 +01:00
Damian Mooyman
abda4dc2d8
BUG Restore SiteTree::canPublish method to resolve incorrect fallback to SiteTreeExtension 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5625
 2016-07-18 10:59:07 +12:00
Daniel Hensby
7e5f0087b8
Merge branch '3' 2016-07-14 12:25:54 +01:00
Daniel Hensby
c7b1a4ded8
Merge branch '3.3' into 3.4 2016-07-14 12:24:04 +01:00
Damian Mooyman
f8b1c27e3c BUG Fix regressions from https://github.com/silverstripe/silverstripe-framework/pull/5653 2016-07-14 11:51:14 +12:00
Daniel Hensby
e5aad336ce Merge pull request #1525 from tractorcow/pulls/4.0/dupe-api 
API Cleanup inconsistent SiteTree::duplicate API
 2016-07-14 00:41:40 +01:00
Daniel Hensby
dc8d4ffe0b API Refactor usages of HTMLText -> HTMLFragment 
API Revert hack in VirtualPage
API Respect default_cast
 2016-07-13 18:48:46 +12:00
Damian Mooyman
8123c433f0 BUG Fix getAbsoluteLiveLink() concatenation 
Fixes #1183
 2016-07-12 15:57:52 +12:00
Daniel Hensby
3a395e6d56
Merge branch '3' 2016-07-12 01:13:07 +01:00
Daniel Hensby
a2657b519a
Merge branch '3.3' into 3.4 2016-07-12 01:08:54 +01:00
Daniel Hensby
118a09afff
Merge branch '3.2' into 3.3 2016-07-12 01:07:12 +01:00
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage 2016-07-05 16:13:23 +01:00
Damian Mooyman
25e4cad164
API Apply SilverStripe\Security namespace 2016-07-05 15:08:05 +12:00
Ingo Schommer
d208a6f511 Merge pull request #1534 from open-sausages/pulls/4.0/namespace-orm 
API Update for new SilverStripe\ORM namespace
 2016-07-01 15:09:00 +12:00
Damian Mooyman
bf511939f4 Merge pull request #1514 from stevie-mayhew/pulls/redirector-description 
DOCS: updated description for redirector page
 2016-06-28 18:13:28 +12:00
Damian Mooyman
e378332ff3
API Update for new SilverStripe\ORM namespace 2016-06-24 11:00:21 +12:00
Damian Mooyman
880ce895f5
Support custom table_name and DataObjectSchema 2016-06-14 15:37:41 +12:00
Daniel Hensby
a3d7d986a7
Merge branch '3' 2016-06-13 14:38:08 +01:00
Daniel Hensby
ea81389a18
Merge branch '3.3' into 3.4 2016-06-13 14:35:40 +01:00
Daniel Hensby
19047d1577
Merge branch '3.2' into 3.3 2016-06-13 14:34:12 +01:00
Damian Mooyman
c50bc91772 API Cleanup inconsistent SiteTree::duplicate API 2016-06-13 15:47:47 +12:00
Daniel Hensby
eba89b9520
FIX OldPageRedirector no longer loops infinitely if 404 thrown on existing page 2016-05-31 15:46:17 +01:00
Stevie Mayhew
e7bcbe3f79 DOCS: updated description for redirector page 2016-05-30 14:51:51 +12:00
Sam Minnée
359b969346 Merge pull request #1505 from open-sausages/features/bootify/actions-toolbars 
Swap out .Actions class for bootstrap .btn-toolbar
 2016-05-27 13:39:23 +12:00
Daniel Hensby
0a7610f245 Merge pull request #1508 from tractorcow/pulls/4.0/fix-rollback-page 
BUG Fix rollback page crash
 2016-05-24 21:30:42 +01:00
Paul Clarke
11192b0207 Swap out .Actions class for bootstrap .btn-toolbar 2016-05-24 12:28:38 +12:00
Damian Mooyman
04e617d65d
API Allow extensions to influence canCreate, canEdit, canView, canDelete, and canAddChildren even for admins. 
Resolves issues where modules expect to apply business logic to models that admins must adhere to.
 2016-05-24 10:16:14 +12:00
Daniel Hensby
092c8986cb
FIX Query string not built properly 2016-05-23 19:04:28 +01:00
Damian Mooyman
ad213b3576 BUG Fix rollback page crash 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5532
 2016-05-23 17:36:58 +12:00
Damian Mooyman
0f646ba375 Fix undefined index error 2016-05-23 16:55:31 +12:00
Daniel Hensby
e04e992c73
Fixes relating to Controller cleanup 2016-05-23 00:49:08 +01:00
Omar Nava
6bc0d026f7 DBField namespace in Search for php7 support 2016-05-17 16:03:54 -05:00
Hamish Friedlander
7393995836 FIX preview in Asset Admin 2016-05-12 12:42:13 +12:00
Ingo Schommer
54573292a3 Merge pull request #1489 from open-sausages/pulls/4.0/fix-save-from-page-settings 
FIX Not being able to save when viewing page settings
 2016-05-09 18:07:11 +12:00
Hamish Friedlander
1263bf8a04 FIX Not being able to save when viewing page settings 2016-05-09 16:43:19 +12:00
Hamish Friedlander
2af63a84ef FIX add_i18n_javascript calls not being updated after JS move 
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
 2016-05-09 15:41:58 +12:00
Ingo Schommer
d52058a4fd Merge pull request #1484 from open-sausages/pulls/4.0/Add-page-steps-bug 
Make page steps use the same styles, consistent markup
 2016-05-09 12:53:39 +12:00
Ingo Schommer
4297d33343 Merge pull request #1475 from candidasa/ss4-issue1473 
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it up…
 2016-05-09 07:59:07 +12:00
Paul Clarke
a039753f5c removed .field class as it adds a bottom border 2016-05-06 15:30:08 +12:00
Paul Clarke
ca3770f03d Make page steps use the same styles, consistent markup 2016-05-06 15:11:31 +12:00
Frank Mullenger
1181cac123 MINOR: Removing camel cased 'Html' references. 2016-05-06 14:31:19 +12:00
Julian Seidenberg
9169b11b8f MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it upon first viewing of a new database (fixes #1473) 2016-05-06 11:24:03 +12:00
Damian Mooyman
46f69b0c0d API set menu title without editing transifex masters 2016-05-02 21:54:09 +12:00
Damian Mooyman
1aa5492410 API Cleanup SilverStripeNavigator and CMSPreview 2016-05-02 17:02:37 +12:00
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
Damian Mooyman
b54d2f1f7f Merge pull request #1353 from sb-relaxt-at/1334-sitetree-classdropdown-bugfix 
Adding context parameter to canCreate-check in getClassDropdown
 2016-01-22 17:41:27 +13:00
Daniel Hensby
0a0ac86f5b Merge pull request #1370 from tractorcow/pulls/4.0/defaultclass 
API Refactor out Page default classname hack
 2016-01-21 22:40:33 +00:00
Daniel Hensby
e77cfb5143 Merge pull request #1271 from tractorcow/pulls/4.0/dropdown-cleanup 
API Use new formfields
 2016-01-21 13:00:12 +00:00
Damian Mooyman
c97647078b API Refactor out Page default classname hack 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1932
 2016-01-21 17:16:55 +13:00
Damian Mooyman
abc5556520 BUG Fix legacy breadcrumbs appearing on page save 
Fixes #1358
 2016-01-20 15:29:51 +13:00
Damian Mooyman
7c4e6f4b60 BUG prevent "Home page" being selected when no selection was made 
Fixes #1351
 2016-01-20 14:44:11 +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
c3e82a4838 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	javascript/lang/src/fi.js
 2016-01-19 17:10:41 +13:00
Damian Mooyman
e706b147cc Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:33 +13:00
Damian Mooyman
f4d22d6cfe Merge pull request #1354 from sminnee/remove-trailing-whitespace 
MINOR: Remove trailing whitespace
 2016-01-13 09:30:01 +13:00
Loz Calver
d637141487 FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359) 2016-01-11 16:44:55 +00:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:32:05 +13:00
Loz Calver
54e8c71a4d Use setFailover() in ContentController (closes silverstripe/silverstripe-framework#4821) 2016-01-06 15:24:17 +00:00
Jonathon Menz
8ddef0b817 Decouple ErrorPage 2016-01-05 15:00:38 -08:00
Stephan Bauer
b30d33585f BUG Adding context parameter to canCreate-check in getClassDropdown of SiteTree (fixes #1334) 2016-01-05 11:00:43 +01:00
Damian Mooyman
43a855e5b5 Merge pull request #1342 from mejt/3 
Added avoiding unhandled exception from Translatable extension in ContentController
 2015-12-22 16:58:04 +13:00
Damian Mooyman
15685d85ab Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 14:10:52 +13:00
Mateusz
68dd8cf798 Added avoiding unhandled exception from Translatable extension in ContentController 2015-12-08 08:47:50 +01:00
Damian Mooyman
5353ac5315 API Refactor versioned security into core module 2015-12-02 17:37:35 +13:00
Damian Mooyman
c50dc06401 API Update ErrorPage to use FilesystemGeneratedAssetHandler 2015-11-26 16:08:14 +13:00
Loz Calver
b624eb98f1 FIX: Setting target for unwritten VirtualPage breaks write 
The VirtualPage inherits the ID of the target page, which is undesirable if the VirtualPage hasn’t been written yet - it will trick write() into thinking that the record already exists in the database
 2015-11-18 09:14:16 +00:00
Loz Calver
2983d823d1 FIX: Ensure VirtualPage forwards request/response data to virtual controllers (fixes #1329) 2015-11-18 09:14:11 +00:00
Ingo Schommer
7a5b30a05d Extension hooks for "restore to stage" and "archive" 2015-11-16 10:23:24 +13:00
Damian Mooyman
0cabc22a57 Revert 7e2838c81c 2015-11-11 09:14:39 +13:00
Damian Mooyman
b26c3a3b4e Restore deprecated reports 2015-11-10 17:17:56 +13:00
Ingo Schommer
21df7069d0 Extension hooks for "restore to stage" and "archive" 2015-11-10 15:30:15 +13:00
Damian Mooyman
369f3dda8d API Remove deprecated ListboxField::setMultiple() 2015-11-09 17:05:31 +13:00
Damian Mooyman
18e368448a Merge remote-tracking branch 'origin/3' 
Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
	code/controllers/CMSSiteTreeFilter.php
	code/controllers/LeftAndMainPageIconsExtension.php
	code/controllers/ModelAsController.php
	code/controllers/SilverStripeNavigator.php
	code/model/ErrorPage.php
	code/model/SiteTreeFileExtension.php
 2015-11-03 14:23:04 +13:00
Damian Mooyman
748866ec0f Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	code/controllers/CMSMain.php
	code/model/ErrorPage.php
 2015-11-03 13:11:26 +13:00
Ingo Schommer
e3a321b306 Merge pull request #1304 from scott1702/update-upload-button 
Update asset admin toolbar
 2015-10-30 10:27:29 +13:00
scott1702
6dc3fc1f26 Update asset admin toolbar 2015-10-30 10:05:51 +13:00
Damian Mooyman
227e2ba162 API Move ErrorPage to new generated files API 2015-10-23 10:08:51 +13:00