Loz Calver
62816e1ff8
Refactor VirtualPage, remove VirtualPage_Controller
2016-09-22 14:37:54 +01:00
Loz Calver
3d827543a8
NEW: Allow pages to specify the controller they use
2016-09-22 14:37:51 +01:00
Damian Mooyman
760caaab44
API use new bootstrap button row template
2016-09-22 13:20:31 +12:00
Ingo Schommer
5c31bf357b
Remove framework bundle include
...
This is now handled through one combined bundle
which is included through LeftAndMain.php (in framework module)
Rename bundle-legacy.js to bundle.js: It'll contain more than legacy stuff eventually
Remove leftover dist artefacts: These weren't part of the webpack build any more
Building SilverStripeNavigator separately (and rename bundle)
2016-09-21 15:00:26 +12:00
Damian Mooyman
18939157f0
BUG Fix pages level up link
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5400
2016-09-20 13:03:56 +12:00
Damian Mooyman
4f19113c5c
API Use new DBField::getSchemaValue()
2016-09-20 12:08:20 +12:00
Christopher Joe
4b3f4ba01c
move BackLinkHTMLList to template
2016-09-19 10:43:39 +12:00
Ingo Schommer
fee7e0211e
Use CDN jQuery for RemoveOrphanedPagesTask
...
We shouldn't rely on static file paths from framework,
since they tend to change around.
2016-09-15 15:16:12 +12:00
Ingo Schommer
cd3ae42c1d
Fixed jquery.js path
2016-09-15 15:15:24 +12:00
Damian Mooyman
2dae4e2adc
Rename SS_ prefixed class names
2016-09-09 11:26:24 +12:00
Damian Mooyman
a12d52a161
BUG Fix some namespace class errors
2016-09-08 19:33:32 +12:00
Ingo Schommer
ac954095ab
Merge pull request #1602 from open-sausages/pulls/4.0/namespace-everything
...
Upgrade code for framework namespaces
2016-09-08 17:44:45 +12:00
Daniel Hensby
91444b8016
Merge branch '3'
2016-09-07 11:28:05 +01:00
Damian Mooyman
a87a857a6e
Upgrade code for framework namespaces
...
Remove @package / @subpackage
Fix inifinite loop in VirtualPage_Controller
2016-09-07 16:29:26 +12:00
Damian Mooyman
9c48b93983
BUG Ensure changes in class write to an instance of the new class, not the old one
...
Fixes #1210
Requires https://github.com/silverstripe/silverstripe-framework/pull/5950
2016-09-05 18:46:00 +12:00
maks feltrin
a0886f16bf
typo?
...
$controller is already a reference
2016-09-02 16:40:14 +02:00
Ingo Schommer
b599095a50
API Remove AssetAdmin (moved to asset-admin module)
2016-08-31 23:15:12 +12:00
Ingo Schommer
40904686a4
Removed AddToCampaignHandler->setShowTitle()
...
It was used to support different display variations in admin/assets and admin/pages,
while those display variations should've been removed in the first place (and have been now).
2016-08-28 13:49:25 +12:00
Ingo Schommer
93d7197aad
Support for React-driven "add to campaign"
2016-08-25 21:30:53 +12:00
Daniel Hensby
6d9b4415f1
Merge branch '3.4' into 3
2016-08-23 10:58:50 +01:00
Daniel Hensby
c754882e0a
Merge branch '3.3' into 3.4
2016-08-23 10:58:24 +01:00
Daniel Hensby
ba5e51c422
Merge branch '3.2' into 3.3
2016-08-23 10:55:13 +01:00
Christopher Joe
c411c500a5
Fix for pages admin add to campaign modal
2016-08-23 12:39:01 +12:00
Daniel Hensby
59be597004
FIX #1052
2016-08-22 19:41:10 +01:00
Daniel Hensby
4aca9ac145
Merge pull request #1052 from @dmeeking
2016-08-22 17:46:43 +01:00
Dan Meeking
26f5fc2853
Issue #1051 : fix so that OldPageRedirector::find_old_page uses ORM call
2016-08-22 17:44:43 +01:00
Christopher Joe
c46490ea3a
ErrorPage no longer generates HTML response for ajax requests
2016-08-22 15:36:01 +12:00
Damian Mooyman
dab2a7ac9d
Split code into class-per-file
...
Add psr-4 directive in composer.json
2016-08-16 13:22:58 +12:00
Damian Mooyman
041d12129a
Fix regressions from namespacing
...
Update template locations
Add permission codes to cms sections
Code, phpdoc, and typehint cleanup
Split batch actions into files
2016-08-16 11:56:34 +12:00
Damian Mooyman
2352127fe0
Apply SilverStripe\Admin namespace
2016-08-16 11:13:32 +12:00
Damian Mooyman
e414fdb325
Merge 3.4 into 3
2016-08-15 19:05:12 +12:00
Damian Mooyman
c2f21d0008
Merge 3.4.1 into 3.4
2016-08-15 18:37:50 +12:00
Damian Mooyman
ef856185ab
BUG Fix regression in FormField casting
2016-08-15 15:55:06 +12:00
Damian Mooyman
a6a9cd729f
BUG Fix regression in FormField casting
2016-08-15 15:34:29 +12:00
Damian Mooyman
5ad8157655
BUG Fix regression in FormField casting
2016-08-15 15:32:22 +12:00
Damian Mooyman
4dfa4f4473
Resolve issues with namespacing
2016-08-10 16:09:23 +12:00
Damian Mooyman
5bf364bedb
Apply SilverStripe\CMS namespace
2016-08-10 16:09:23 +12:00
Damian Mooyman
cb946508cf
Move CMS classes and templates to namespaced locations
2016-08-10 16:09:23 +12:00
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