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
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
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
Damian Mooyman
bc669311dd
Merge pull request #1297 from patricknelson/issue-586-delete-validation-3.2
...
FIX for #586 and possible fix for #736 and relates to #2449 : Don't perform validation upon deletion, since it isn't necessary.
2015-10-16 17:18:16 +13:00
Patrick Nelson
75dc391df9
FIX for #586 and possible fix for #736 and relates to #2449 : Don't perform validation upon deletion, since it isn't necessary. Cleaned up type hint.
2015-10-09 15:36:21 -04:00
Patrick Nelson
ff6c0a3160
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-08 17:48:31 -04:00
Patrick Nelson
785f85047f
FIX for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-08 17:38:58 -04:00
Peter Thaleikis
4694763fa5
remove trailing spaces in the codebase
2015-09-29 17:18:03 +13:00
David Craig
1ea22c766c
Move UI to main assets area
2015-09-29 09:35:28 +13:00
Peter Thaleikis
f291c5f365
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-09-28 22:31:31 +13:00
Damian Mooyman
8e3f549b19
BUG Fix regressions in CMS from db field changes
2015-09-28 17:22:44 +13:00
Daniel Hensby
f7985b34f2
Merge pull request #1259 from stevie-mayhew/pulls/get_response
...
UPDATE: make all response code use getResponse() method
2015-09-25 12:23:43 +01:00
Stevie Mayhew
d54e117392
UPDATE: make all response code use getResponse() method
2015-09-25 09:10:24 +12:00
Damian Mooyman
e68a752ac7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
.travis.yml
2015-09-09 14:53:48 +12:00
Damian Mooyman
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
Damian Mooyman
f2efbefb8c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
2015-09-09 14:09:00 +12:00
scott1702
c028278957
Update font icons to use new library
2015-08-25 15:08:09 +12:00
Sam Minnée
da348f74e8
Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions
...
BUG block adding children from archived pages
2015-08-24 17:04:46 +12:00
Damian Mooyman
46180f671e
Fix missing packages
2015-08-24 16:14:33 +12:00
Damian Mooyman
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
Stephen Shkardoon
b87f5473d9
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
...
Previously, we would be limited by the way allParams will return 3 parameters
at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Daniel Hensby
7d50e0fac7
Merge branch '3'
...
Conflicts:
.travis.yml
2015-08-17 14:24:16 +01:00
Daniel Hensby
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
Daniel Hensby
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Damian Mooyman
e22b653e06
API batch restore action
2015-08-03 20:57:30 +12:00
Damian Mooyman
3790273ae7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
2015-07-31 15:49:46 +12:00
Damian Mooyman
71b23b622c
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-31 14:34:04 +12:00
Jonathon Menz
7041a43684
Moved image thumbnail style rules to Framework
...
for consistent styling of image thumbnails in GridFields
2015-07-30 16:15:35 -07:00
Loz Calver
10b2fdc318
FIX: ContentController::getViewer() not returning all found templates ( fixes #1244 )
2015-07-24 11:50:09 +01:00
Dan Hensby
a94881372f
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-20 14:14:28 +00:00
Daniel Hensby
f55b22bd75
Merge branch '3.1' into 3.2
...
Conflicts:
CONTRIBUTING.md
code/reports/BrokenLinksReport.php
code/reports/SideReport.php
tests/model/RedirectorPageTest.php
tests/reports/ReportTest.php
2015-07-20 11:09:29 +01:00
Fred Condo
f9cceaada0
Correct doubly-escaped " marks
...
The links in the Broken Links Report had extraneous " marks that made
them unusable. This fixes the links.
2015-07-01 17:42:26 -07:00
Loz Calver
d78d325073
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished ( fixes #1230 )
2015-06-26 10:47:39 +01:00
Daniel Hensby
524b36b75c
Merge pull request #1213 from nglasl/3.1
...
FIX Enforced the published/draft selection for SS reports, which was bein…
2015-06-24 08:08:37 +01:00
David Craig
cc3385b9f8
Move filters from panel to header
...
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
- Renamed to Bulk actions
- Styles updated
- Added placeholder text / removed redundant option
- Now appears in SiteTree view too
2015-06-24 09:58:48 +12:00
Stephen Shkardoon
b71a521c21
Fix incorrect permission check on duplicate()
...
Will now properly fall back to the canCreate() on the parent
2015-06-23 16:42:08 +12:00
Devlin
bc4dc5cf79
increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain
2015-06-22 14:15:49 +02:00
Nathan Glasl
0de71d45db
Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring.
2015-06-22 16:05:13 +10:00
Damian Mooyman
04a513b0a8
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 12:00:42 +12:00
Damian Mooyman
8de0106fea
Merge remote-tracking branch 'origin/3.1' into 3.2
2015-06-19 10:35:00 +12:00
Daniel Hensby
0b92a61e51
Updating docs link in default install
...
Fixing the default Content for Homepage to link to docs.silverstripe.org (there's an "s" at the end of "docs")
2015-06-18 16:47:10 +01:00
Daniel Hensby
e9fde144eb
Merge pull request #1201 from scott1702/update-content
...
Update default home content
2015-06-17 15:40:17 +01:00
Damian Mooyman
4aa84f3dd2
API make DataObject::validate public
...
See https://github.com/silverstripe/silverstripe-framework/pull/4294
2015-06-17 15:57:12 +12:00
Damian Mooyman
dd49a888e8
Merge remote-tracking branch 'origin/3'
2015-06-17 15:54:01 +12:00
scott1702
60c68098eb
Update default home content
2015-06-17 13:04:29 +12:00
Damian Mooyman
f3e1472493
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:44:19 +12:00
scott1702
ffb6c38e3d
Remove 'Filtered Tree' notification when clearing the filter
2015-06-15 16:54:41 +12:00
Daniel Hensby
715cd9ab4e
Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation
...
Conflicts:
tests/model/SiteTreeTest.php
2015-06-13 15:23:22 +01:00
Stan Hutcheon
e2d85b2f88
VirtualPage call init on target controller
2015-06-13 12:38:59 +12:00
Damian Mooyman
3bc76e69fb
API Formalise new DataObject::canCreate argument
2015-06-09 11:32:38 +12:00
Damian Mooyman
e99554fc17
Merge remote-tracking branch 'origin/3.1' into 3
2015-06-09 11:11:39 +12:00
Stevie Mayhew
a819bcfc97
FIX: explicitly call get functions for site tree checks
2015-06-05 11:09:23 +12:00
Damian Mooyman
b169823a00
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
2015-06-03 14:46:16 +12:00
Damian Mooyman
1f9fc33349
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteTree.php
code/model/SiteTreeLinkTracking.php
tests/controller/CMSMainTest.php
2015-06-02 19:23:48 +12:00
Jonathon Menz
dbe2ad4f9f
FIX: Folder expansion icons
...
This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202
2015-05-29 08:43:44 -07:00
Damian Mooyman
c5e0c8f007
API Enable tree filter highlighting
...
Decoupling of CMS / Framework
2015-05-04 17:05:35 +12:00
Stevie Mayhew
7ddf5fa697
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:02 +12:00
Ingo Schommer
36ac61115a
Fix auto-setting of URL from localized page titles
...
Replace the hardcoded check for english locale ("new-page")
with a localized version.
See https://github.com/silverstripe/silverstripe-translatable/issues/180
2015-04-29 00:16:53 +12:00
Ingo Schommer
221281dade
Merge pull request #1181 from dhensby/pulls/injector-searc-form
...
FIX Use SearchForm::create to instantiate SearchForm
2015-04-29 00:11:52 +12:00
Ingo Schommer
94d354de4a
Fixed BacklinkTracking filter usage
...
Previous deprecation fixes made this method error out
when called on the root node (ID=0), so when admin/assets is first called.
2015-04-28 23:34:26 +12:00
Ingo Schommer
812a921072
Merge branch 'pulls/dataobject-relation-updates' of https://github.com/dhensby/silverstripe-cms into dhensby-pulls/dataobject-relation-updates
2015-04-28 23:17:25 +12:00
David Craig
7bdca7f5cc
Added a list of pages where a file is used
2015-04-28 13:15:44 +12:00
Stephen Shkardoon
857ade7d1d
Refactor ErrorPage to have static file building in a separate method
2015-04-27 11:56:54 +12:00
Nik Rolls
5163690bdc
PHPDoc improvements for SiteTree and SiteTreeLinkTracking
...
- Removed @param/@method references to fields from extensions
- Added @mixin references to extensions
- Fixed incorrect PHPDoc @params and @returns
- Fixed wrapping width on many docblocks
- Added and/or improved method documentation when missing or confusing
- Fixed typos as found
2015-04-20 20:59:52 +12:00
Michael Strong
5ab15da8fe
Concat links in "broken links" report ( fixes #1117 )
...
Fixes operation with any modules that add GET parameters to CMS links,
such as the Translatable module.
Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118 .
Modified by @chillu based on peer review feedback.
2015-04-19 22:39:57 +12:00
Colin Tucker
02fcf6429b
Issue #1150 : Removed Save and Delete buttons from regular edit form.
2015-04-17 09:19:15 +10:00
Daniel Hensby
a71f5f99fa
FIX Use SearchForm::create to instantiate SearchForm
2015-03-31 17:03:17 +01:00
Damian Mooyman
cf4d9edafb
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteConfig.php
javascript/CMSMain.AddForm.js
tests/model/SiteConfigTest.php
tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman
a84361e4e8
Ensure SiteConfig::canView
2015-03-19 16:16:54 +13:00
Damian Mooyman
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
Loz Calver
e0afd2f772
Update use of DataObject methods (as per framework #3799 )
2015-03-13 22:11:51 +00:00
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
Damian Mooyman
cabd8bbab9
Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
...
FIX: VirtualPages use correct casting for 'virtual' database fields
2015-03-06 11:29:18 +13:00
Damian Mooyman
21e2bc7258
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/reports/Report.php
2015-02-20 10:16:37 +13:00
Daniel Hensby
fe8cbc89d4
Remove double escaping of report data
2015-02-08 02:11:17 +00:00
Daniel Hensby
a530085016
FIX External redirects shouldnt show in preview pane
2015-02-08 00:30:38 +00:00
Michael Strong
7733c4335e
BUG Correctly sanitise Title
2015-01-22 17:54:05 +13:00
Damian Mooyman
475b6d18e5
Merge remote-tracking branch 'composer/3.1' into 3
2015-01-15 17:48:11 +13:00
Stephen McMahon
9d888d5dde
BUG: Fixed SearchForm not calling getTemplate() in forTemplate()
2014-12-02 15:13:42 +11:00
Damian Mooyman
d01883a5f8
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/model/SiteConfig.php
2014-11-18 12:45:42 +13:00
Loz Calver
a142ffd465
FIX: VirtualPages use correct casting for 'virtual' database fields
2014-11-17 15:44:17 +00:00
Daniel Hensby
dd0332d66d
Merge branch 'guywatson-patch-1' into 3.1
2014-11-03 23:06:38 +00:00
guywatson
d2f0eafa27
Add an extension hook to the getIsModifiedOnStage method
2014-11-03 23:04:28 +00:00
Sean Harvey
56142b8bba
BUG sprintf missing on exception in SilverStripeNavigator
2014-11-03 14:09:27 +13:00
micmania1
8310135923
FIX Broken links on dependent pages tab
2014-10-23 21:53:12 +00:00
Nerijus Eimanavičius
7f3563cd72
Fixes #1112
...
Fixes #1112 $conn->fieldList('SiteTree') has protected access but is called from SiteTree
2014-10-07 10:11:49 +03:00
Daniel Hensby
89184a8134
Implement TemplateGlobalProvider
on SiteConfig
...
Seeing as the `SiteConfig` is a site wide and "global" object, it makes sense to have it universally available to the templates
2014-08-22 14:28:19 +01:00
Sean Harvey
195ef05c8d
Removing deprecated method
2014-08-22 18:16:03 +12:00
Mateusz Uzdowski
2ba1c46bc8
API Change broken link hihglighting to write to database.
...
Before it would be applied on the fly during the rendering of the
HtmlEditorField, and only be written to the database during the
subsequent write.
We just shift the behaviour to apply just-in-time.
2014-08-15 12:29:26 +12:00
Mateusz Uzdowski
b41e081130
Refactor the link-tracking code and move it from framework.
...
This code has a dependency on SiteTree, so it fits much better in the
cms module.
Abstracted away the content parser so the same code can be reused both
in the render phase (to highlight the links) and in the write phase
(storing information about broken links and references).
2014-08-14 11:16:49 +12:00
Mateusz Uzdowski
52d297e6ef
Merge remote-tracking branch 'origin/3.1' into merge-back
...
Conflicts:
code/controllers/CMSSiteTreeFilter.php
code/controllers/ReportAdmin.php
code/reports/Report.php
2014-08-13 17:19:01 +12:00
Sean Harvey
796874dae7
Merge pull request #1017 from tractorcow/pulls/3.1/fix-report-sorting
...
BUG Fix sorting on main ReportAdmin grid
2014-08-13 10:52:51 +12:00
Will Rossiter
18d6c538a7
API: Extract siteconfig out to an external module.
2014-08-09 17:29:50 +12:00
madmatt
4e5b1966d3
Fix changed pages filter to match SiteTree's 'MODIFIED' label
2014-08-07 16:48:06 +12:00
Damian Mooyman
53dbbb7982
BUG Fix CMSMain::getList to correctly respect filter result
...
Fixes #1064
CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned
2014-08-06 15:00:48 +12:00
Damian Mooyman
1c48cb6aae
BUG Fix search range for asset filter
2014-08-06 13:26:23 +12:00
Jakx.nz
20df063f43
#1067 No updateEditForm hook on CMSFieldAddController::getEditForm()
2014-08-01 10:37:11 +12:00
Stig Lindqvist
482c23f18e
NEW Adding CMS sitetree filter to see the current 'live' site
...
This adds a new filter that will show a content editor what the current published site-tree
looks like for a visitor. This helps when there is a lot of drafted content that get included
in the default filter 'All Pages'
2014-07-29 13:12:36 +12:00
Stig Lindqvist
45046f08e8
Bug: CMS tree filters doesn't count the correct number of children for deleted pages
...
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.
This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.
The solution involves a couple of smaller fixes in both CMS and framework modules.
1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
2014-07-25 16:18:54 +12:00
Simon Welsh
6a0366fb84
Merge pull request #1060 from stojg/pull/search-for-date
...
BUG: Narrowing site tree search to one date shows no pages
2014-07-24 13:32:31 +10:00
Stig Lindqvist
3eefd65f7c
BUG: Narrowing site tree search to one date shows no pages
...
It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
2014-07-24 15:24:03 +12:00
Damian Mooyman
a395c5322f
API Move of codebase to parameterised query database abstraction layer
...
API Renamed DB static methods to properly conform to naming convention (lowercase, underscored)
API Replaced deprecated method
2014-07-07 15:07:37 +12:00
Will Rossiter
a777266e43
FIX ensure controller stack is updated when execution halted by an exception.
...
See: https://github.com/silverstripe/silverstripe-framework/issues/2467
popCurrent would be incorrectly not pop a controller from the controller stack if an exception was throw from inside the handleRequest() method.
This change captures the exception, ensures the controller is popped from the stack and passes the exception along.
2014-07-01 14:18:53 +12:00
Rodney Way
1e194854e0
BUG: Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy.
...
Also updated SiteTree YML test data to match.
2014-06-24 13:29:16 +10:00
Damian Mooyman
519b0dfaa0
Merge remote-tracking branch 'origin/3.1'
2014-06-17 18:18:21 +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
Stig Lindqvist
30d42e06d6
Merge pull request #1013 from tractorcow/pulls/3.2-fix-fulltext-query-encoding
...
BUG Fix encoding of SearchForm::getSearchQuery
2014-06-14 17:15:40 +12:00
Damian Mooyman
1a85c7a1ec
Merge pull request #1022 from silverstripe-iterators/pulls/redirector-proto-relative
...
Pulls/redirector proto relative
2014-06-13 16:01:20 +12:00
Damian Mooyman
cba0061fe2
Merge pull request #974 from micmania1/930-added-breadcrumbs-getter
...
API Added getBreadcrumbItems to SiteTree
2014-06-03 08:43:53 +12:00
Ingo Schommer
40f7a876d4
Support for protocol relative RedirectorPage.ExternalURL
2014-05-30 00:01:45 +12:00
Damian Mooyman
7277dc1600
BUG Fix sorting on main ReportAdmin grid
...
ref: CWPBUG-133
2014-05-15 14:49:41 +12:00
Damian Mooyman
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
micmania1
f46b6bde51
Added getBreadcrumbItems to SiteTree
2014-05-08 03:21:40 +01:00
Damian Mooyman
3162d0e664
API Update ErrorPage to respect new HTTP Error codes
2014-05-06 15:29:33 +12:00
Damian Mooyman
5dd058338a
BUG Fix encoding of SearchForm::getSearchQuery
...
This made it awkward for user code to extract the query value for use in other applications; This would otherwise have to be xml decoded again.
Casting has been promoted to the templating level via DBField::create_field and a `SearchForm.casting` config setting.
2014-05-06 11:11:46 +12:00
Damian Mooyman
b3699281c0
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-05-06 10:24:28 +12:00
Damian Mooyman
f9cb8805e1
API Error page support for Security controller errors
2014-05-05 17:13:11 +12:00
Mateusz U
fcb6a9140c
Merge pull request #1004 from tractorcow/pulls/sitetree-title
...
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 14:37:29 +12:00
Damian Mooyman
341eeb7c31
Merge pull request #998 from kinglozzer/pulls/sitetree-file-linktracking
...
FIX: Broken file link tracking (fixes #996 )
2014-04-29 09:36:36 +12:00
Damian Mooyman
89fbae2c2e
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 08:54:17 +12:00
Ingo Schommer
9bff36c078
Merge pull request #994 from tractorcow/pulls/3.1-asset-datefilter
...
API Filter by date created for files
2014-04-28 23:40:17 +12:00
Ingo Schommer
66919ed0cc
Merge pull request #1003 from tractorcow/pulls/3.1-configurable-paging
...
API Ability to configure paging for assets / pages
2014-04-28 23:06:47 +12:00
Loz Calver
396fd9a86e
FIX: Broken file link tracking ( fixes #996 )
2014-04-28 09:26:34 +01:00
Damian Mooyman
0285322049
API Ability to configure paging for assets / pages
...
ref: CWPBUG-143
2014-04-28 15:22:17 +12:00
Russell Michell
a502c9d21c
NEW Fixes #966 . Ability to filter pages on page status.
...
- New filters for statuses normally found through SiteTree::getStatusFlags().
- Refactored menu sorting. Now alphabetical, as it wasn't previously.
2014-04-28 14:50:07 +12:00
Damian Mooyman
61ebe08437
Merge remote-tracking branch 'origin/3.1'
2014-04-22 12:10:49 +12:00
Damian Mooyman
3765030faa
API Filter by date created for files
...
Added test cases
Do not merge before https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/32
ref: CWPBUG-144
2014-04-15 09:42:53 +12:00
Damian Mooyman
baff7f12bd
Merge pull request #968 from phptek/issue/965
...
FIX Fixes #965 . Allow user date-settings to show on GridField Page admin
2014-04-10 14:21:08 +12:00
Damian Mooyman
3204ab5af3
BUG Fix orphaned pages reporting they can be viewed
2014-04-07 12:52:07 +12:00
Damian Mooyman
ecda66a1c4
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:39:47 +13:00
Damian Mooyman
ab78198946
Merge pull request #979 from ss23/SS2014005-3-1
...
FIX Do now allow arbitary class creation in CMS
2014-03-27 12:55:40 +13:00
Stephen Shkardoon
a67ed2799d
FIX Do now allow arbitary class creation in CMS
2014-03-19 19:27:39 +13:00
Stephen Shkardoon
8e50405871
FIX Prevent SQLi when no URL filters are applied
2014-03-19 19:05:13 +13:00
Simon Welsh
b497b8f548
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/reports/Report.php
2014-03-18 09:23:39 +13:00
Russell Michell
b4a1aa4537
FIX Fixes #965 . Allow user date-settings to show on GridField Page admin
...
- Relies on framework PR #2961 .
2014-03-17 10:40:08 +13:00
Simon Welsh
403b47fe6c
Merge pull request #951 from sheadawson/950-fileexists
...
FIX fileexists check
2014-03-16 20:29:12 +13:00
Simon Welsh
2503d1dca2
Merge pull request #911 from chillu/pulls/908-all-sections-canedit
...
Page edit access with CMS_ACCESS_LeftAndMain (fixes #908 )
2014-03-16 20:12:15 +13:00
Simon Welsh
5024a48f89
FIX: Reports with Parameter fields override ReportTitle and ReportDescription
...
Fixes #696
2014-03-16 19:09:47 +13:00
sheadawson
dc865399dc
FIX fileexists check via ajax didnt know what folder the file was being uploaded to. Fixes #950
2014-02-20 15:17:04 +11:00
Ingo Schommer
889e97e17d
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:56 +13:00
Hamish Friedlander
224033e518
FIX Limit ExtraMeta to only allow meta and link elements
2014-02-17 12:08:09 +13:00
Sam Minnee
d0a4fc2065
FIX: Fix failover to index template in ContentController::getViewer()
...
Historically, if you visit a foo action on Page, and Page_foo.ss doesn't exist, then it fails over
to Page.ss. The introduction of ContentController::getViewer() broke this, but this patch adds a
test for this case and fixes it.
It was identified by build failures on silverstripe/userforms when tested against the master branch.
2014-02-14 17:44:53 +13:00
Sean Harvey
0bb5b4c8a4
Merge branch '3.1'
2014-02-12 11:13:29 +13:00
Gus King
7b4cc316ef
Numerous PHPDoc fixes.
2014-02-10 15:35:13 -05:00
Gus King
457cadb103
Documented magic properties/methods of SiteTree and SiteConfig.
2014-02-09 19:13:04 -05:00
Ingo Schommer
683b099308
Merge pull request #914 from micmania1/900-page-templates-without-controller
...
NEW Locate page template without needing to define a controller
2014-02-07 14:20:30 +13:00
Russell Michell
7d7c75414c
NEW Track broken anchors
2014-01-31 12:44:59 +13:00
micmania1
47582b3e3c
getViewer will now locate and use the correct templates for pages which don't have their own controller
2013-12-20 20:52:11 +00:00
Ingo Schommer
07033548fc
Merge remote-tracking branch 'origin/3.1'
2013-12-19 20:22:26 +01:00
Ingo Schommer
1f17f4320d
Page edit access with CMS_ACCESS_LeftAndMain ( fixes #908 )
...
"Access to all sections" implies edit access in the CMS
2013-12-13 10:05:06 +01:00
Martijn
dec2be38fa
use Controller::join_links() for listview links
...
This fixes incorrect adding of the locale parameter when using translatable :
http://site.com/admin/pages/edit/show?locale=nl_NL/11
2013-12-06 15:45:15 +01:00
Ingo Schommer
6403be518a
Backwards compat OldPageRedirector
...
Regression from f972466880
.
Passes tests in 3.1, but fails in master due to Deprecation notices.
Tests needed adjustments because OldPageRedirector::find_old_page()
doesn't have the same method signature...
2013-12-06 14:28:08 +01:00
Ingo Schommer
9ca336bea3
Merge remote-tracking branch 'origin/3.1'
2013-12-02 20:44:57 +01:00
Ingo Schommer
ec41cb38ce
ValidationException support in CMS "Settings" UI
2013-12-02 16:38:46 +01:00
Ingo Schommer
6804461539
Merge pull request #898 from dnadesign/errorpagepermissions
...
FIX: ErrorPage generating empty responses for 403/401 requests
2013-11-22 11:49:37 -08:00
Loz Calver
8f720406b5
Implement History.js logic for "Cancel" action
2013-11-22 12:46:03 +01:00
Loz Calver
95d9257b1b
ENHANCEMENT: Add 'Cancel' button to 'Add Page' form
2013-11-20 20:15:08 +01:00
Will Rossiter
ddc2e3822b
FIX: ErrorPage generating empty responses for 403/401 requests
...
Previously by setting the response status code inside the action, this prevented response bodies from being included due to 403/401 being matched by SS_HTTPResponse::isFinished() (which stops popular
I assume SS_HTTPResponse::isFinished() is valid for the permission error use case (and I would be hesitant to change it) so this simply moves the declaration of the response status code till after the parent has populated the body of the response.
2013-11-18 16:32:15 +13:00
Martijn
0a854e9260
Make Settings Link in CMSSettingsController clickable
...
When SiteConfig has a GridField, you can't click on the Link to go back
2013-11-15 09:55:31 +01:00
Andrew Short
e17fb17520
Merge branch '3.1'
...
Conflicts:
lang/es.yml
2013-11-11 18:24:03 +11:00
Damian Mooyman
f9c3f4d1cc
Merge pull request #889 from chillu/pulls/2638-uploadfield
...
Disable UploadField change detection in assets/admin/add
2013-11-06 17:16:17 -08:00
Stephen Shkardoon
f972466880
Refactor old page redirector into an extension
2013-11-06 23:00:50 +13:00
Ingo Schommer
2d0ee2ca91
Disable UploadField change detection in assets/admin/add
...
See https://github.com/silverstripe/silverstripe-framework/issues/2638
2013-11-06 10:08:15 +01:00
Trevor
e3724e9207
Fix comment typo
2013-10-28 13:48:31 +11:00
Loz Calver
b6589ba9a9
NEW: Page types no longer require a controller, they can inherit the parent page type's
...
Use ClassInfo::ancestry() instead of get_parent_class()
Fall back to ContentController by default
2013-10-23 16:44:59 +01:00
Ingo Schommer
ef0f633f46
Merge remote-tracking branch 'origin/3.1'
2013-10-23 14:53:33 +02:00
Ingo Schommer
3d9fc2cc4c
Default CMSMain to Versioned::reading_stage("Stage")
...
Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
2013-10-23 14:29:24 +02:00
Ingo Schommer
c645d76b1f
Merge pull request #879 from sheadawson/833-currentPageID
...
Add hook for extensions to update current page id, before falling ...
2013-10-21 00:24:06 -07:00
sheadawson
1b5465809d
MINOR add hook for extensions to update current page id, before falling back to default
2013-10-21 17:42:45 +11:00
Ingo Schommer
0a1ffd3e1a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-10-20 13:51:19 +02:00
Ingo Schommer
aae6b2b296
Avoid encoded HTML breadcrumbs
2013-10-11 00:27:21 +02:00
Andrew Short
68d254c3c4
Add an extension hook for customising site tree hints.
2013-10-11 01:31:07 +11:00
Ingo Schommer
dd29936fee
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:10:20 +02:00
Andrew Short
b7476f2a46
BUG: Fix add new button not passing the correct parent ID.
...
The `%s` parent ID placeholder was being URL encoded, so it was not being
replaced properly when adding a new page. This fix separately adds
placeholder parameters to the URL to avoid this issue.
The fix is not ideal, but there is no easy way to indicate that some
URL parameters should be URL encoded and others should not while still
correctly constructing the URL.
2013-10-10 13:09:24 +11:00
Loz Calver
66bfff4d15
FIX Don't validate pages when restoring or reverting ( fixes #2449 )
...
Use new method
2013-10-03 16:54:38 +01:00
Ingo Schommer
2a4191d449
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8
Fixed report link escaping
2013-10-02 12:19:23 +02:00
Ingo Schommer
956b6de05c
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0
FIX ReportAdmin report links regression
...
Regression from 79996a76fe
,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-01 11:17:36 +02:00
Ingo Schommer
32478ab512
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-09-27 19:07:13 +02:00
Ingo Schommer
8a96bab70d
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-27 18:50:52 +02:00
Ingo Schommer
9a4a5d909d
Merge pull request #816 from kinglozzer/798-custom-page-icons
...
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798 )
2013-09-25 12:54:01 -07:00
Ingo Schommer
86339a551d
Clearer escaping in CMSMain
...
No direct security issue, but makes intent clearer
2013-09-24 21:37:26 +02:00
Ingo Schommer
e170f4c21b
FIX Escaping in "dependent pages" (SS-2013-009)
2013-09-24 21:37:26 +02:00
Ingo Schommer
79996a76fe
Clearer escaping in ReportAdmin
...
No direct security issue since report titles can't be set by the user
2013-09-24 21:37:26 +02:00
Ingo Schommer
29e502a63a
Hints for SiteTree.TreeTitle casting
...
Relates to SS-2013-009
2013-09-24 21:37:26 +02:00
Ingo Schommer
201f4881e6
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-12 17:16:29 +02:00
Ingo Schommer
4e031076be
Search callback for "add page" selector
...
Necessary since we now default $showSearch=true in TreeDropdownField.
See https://github.com/silverstripe/silverstripe-framework/pull/2364
2013-08-29 17:08:42 +02:00
Tom Densham
4f30fedafd
FIX: GridField button styling in reports
2013-08-29 13:56:29 +01:00
Damian Mooyman
5f828149c3
BUG Fixed instances of loosely defined SQL predicates not qualified by table name
...
Fixed duplicate SQL escaping on SiteTree::get_by_link
2013-08-29 13:59:45 +12:00
Ingo Schommer
6d694a550a
Merge pull request #837 from ARNHOE/3.1-siteconfigfix
...
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-28 02:20:47 -07:00
Sean Harvey
27749fdb7a
AssetAdmin: PHP warning trying to add empty values into CompositeField
...
If the logged in user doesn't have permission to add a Folder record,
AssetAdmin::getEditForm() tries to enter an empty value into the
children of a ComposteField. This breaks SSViewer with a
call_user_func invalid args PHP warning.
Only include these buttons when they're available to the user.
2013-08-27 14:30:39 +12:00
Arno Poot
920da0d120
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-24 12:33:38 +02:00
Ingo Schommer
c62f992dc3
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:28 +02:00
Ingo Schommer
3dc86f98a3
Fixed merge error
2013-08-20 22:25:24 +02:00
Ingo Schommer
ba57d42349
Merge remote-tracking branch 'origin/3.0' into 3.1.0
...
Conflicts:
code/controllers/ContentController.php
code/model/SiteTree.php
tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
Ingo Schommer
7ad9712f05
Merge remote-tracking branch 'origin/3.1'
2013-08-16 13:37:49 +02:00
Ingo Schommer
44fdf66834
Merge pull request #809 from ARNHOE/3.1-siteconfig
...
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07:00
Hamish Friedlander
71608f0d4a
FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself
2013-08-09 11:46:32 +02:00
Sam Minnée
d7d0cb45ae
Merge pull request #824 from hafriedlander/fix/archivedate
...
FIX ArchiveDate enforcement
2013-08-08 17:38:53 -07:00
Simon Welsh
b1664f86a4
FIX Check for stage and drafts in SiteTree::canView()
2013-08-09 10:45:09 +12:00
Hamish Friedlander
2fae9280e5
FIX ArchiveDate enforcement
2013-08-08 17:17:35 +12:00
Ingo Schommer
5eaeb7462a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
lang/en.yml
2013-08-07 17:20:28 +02:00
Ingo Schommer
99ba7bdb4e
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
lang/en.yml
templates/CMSPageHistoryController_versions.ss
2013-08-07 17:15:17 +02:00
Ingo Schommer
07cccc8e95
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
issues with unknown locales in Zend's CLDR database
2013-08-04 12:31:29 +02:00
Ingo Schommer
3f118ef08f
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 12:28:07 +02:00
Ingo Schommer
ab0f83c48d
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Renamed "lolcat" locale from "lc_xx" to "en@lolcat" (Transifex/CLDR notation)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 11:05:41 +02:00
Ingo Schommer
e0aa610172
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
templates/Includes/ReportAdmin_Content.ss
templates/ReportAdminForm.ss
2013-08-03 19:46:46 +02:00
Loz Calver
09b869f5d3
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension ( fixes #798 )
2013-07-31 09:30:58 +01:00
Arno Poot
afd9f28279
Updated siteconfig layout to be more like modeladmin
2013-07-26 17:45:28 +02:00
Simon Welsh
ff18abb994
Merge branch '3.0' into 3.1
...
Conflicts:
.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh
3a3e8f2faa
Adds LoginForm as an allowed action
...
Behaves as a form method defined on ContentController
2013-07-14 17:21:59 +12:00
Andrew Short
1710958207
Merge branch '3.1'
...
Conflicts:
.travis.yml
code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Hamish Friedlander
a5f00ae2c3
FIX Not checking stage in SiteTree#canView
...
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
a2c2be2ad5
Correct form name in CMSFileAddController, fixes upload
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2172
2013-07-02 09:33:38 +02:00
Ingo Schommer
0bd257c8fc
Merge pull request #770 from chillu/pulls/cmsform
...
Using new CMSForm class to allow for validation errors in CMS
2013-06-28 02:54:09 -07:00
Ingo Schommer
98750a9cf1
Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
...
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
aeacbc38aa
Fix AssetAdmin::$allowed_actions
2013-06-21 00:54:28 +02:00
Ingo Schommer
a29ce594a1
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:57 +02:00
Jeremy Thomerson
b8908efdf7
ENHANCEMENT: allow sites to override meta generator tag
2013-06-17 20:35:14 +00:00
Mike Parkhill
c7f14129ea
FIX #651 Broken redirection after creating new folder in assets
2013-06-13 14:58:09 +02:00
Ingo Schommer
2deb525d47
Using new CMSForm class to allow for validation errors in CMS
...
This class allows deferring handling of responses to the parent
controller's response negotiator implementation.
2013-06-13 07:44:37 +02:00
Ingo Schommer
0c4b2f8157
API SiteTree->validURLSegment() prioritizes extension votes
...
Tri-state, use NULL to ignore the extension result
2013-06-12 12:32:42 +02:00
g4b0
238f2908e5
BUG: fixed "regression" inserted with 9281ebc647
adding a new class to SiteTree elem (edit-disabled)
2013-06-03 13:46:10 +02:00
Ingo Schommer
c21c9cba0d
Merge remote-tracking branch 'origin/3.1'
2013-05-31 18:10:26 +02:00
Sean Harvey
206f09ab65
Merge pull request #757 from mparkhill/651-assets-broken-redirection
...
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 15:04:22 -07:00
Mike Parkhill
85f5a45951
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 17:21:07 +12:00
Sean Harvey
20f044cef0
BUG Fixing regression from silverstripe/sapphire/67d1327
...
Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
2013-05-26 12:31:15 +12:00
Simon Welsh
e8f6b416d7
Revert call to setCheckModelPermissions()
2013-05-25 13:56:02 +12:00
Sean Harvey
9c1a69ae08
Merge pull request #755 from patbolo/restored-page-correct-title
...
FIX Correct page title shown when restoring a page, instead of html of t...
2013-05-24 18:45:38 -07:00
jean
698a75d903
FIX Correct page title shown when restoring a page, instead of html of tree node
2013-05-25 11:37:26 +12:00
Will Rossiter
ae494b01bc
Merge pull request #259 from chillu/pulls/perms-opt-in
...
FIX: Respect model permissions in AssetAdmin
2013-05-24 15:44:55 -07:00
Russell Michell
9281ebc647
BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit() were unable to click on SiteTree items in the CMS.
...
- The 'disabled' attribute in <li> will now only render if the author _really_ can't do _anything_
2013-05-23 14:48:24 +12:00
Fred Condo
cd81d327ac
Return 410 for successfullyinstalled after install files are gone
...
It was possible to append '/successfullyinstalled' to any SilverStripe
URL (with the cms module present), and the code would run, including
republishing the 404 page.
Now, if the install.php file is gone, this controller method throws the
410 (Gone) status code. The 410 status is chosen rather than 404 to
mitigate the likelihood that crawlers such as the Googlebot will follow
stray links to this URI.
2013-05-21 15:11:57 -07:00
Ingo Schommer
b2e9353755
Merge pull request #701 from tractorcow/3.1-api-updaterelativelink
...
API Added SiteTreeExtension::updateRelativeLink
2013-05-17 05:05:03 -07:00
Mateusz Uzdowski
bccd2f8e51
API Add a missing alternatePreviewLink hook for SiteTree extensions.
2013-05-17 15:00:08 +12:00
Mateusz Uzdowski
6117057c59
Update doRollback messages to work well with the new reverts.
...
Currently reverts are not creating the new versions anymore - they are
simply copying the Version over. Remove incorrect message about new
version creation and remove the "cancel draft changes" message that's
not correct.
2013-05-16 08:43:12 +12:00
Sean Harvey
a681b8e4ab
BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link
2013-05-14 00:06:09 +12:00
Will Rossiter
7c68414fe7
FIX: Rename search locale variable to avoid conflicts with locale switcher.
...
Fixes http://open.silverstripe.org/ticket/6204
2013-05-11 19:31:02 +12:00
Simon Welsh
be25c302ac
FIX Escape the sitetree_link shortcode return value
2013-05-10 14:05:06 +12:00
Damian Mooyman
61312a5d7f
API Added SiteTreeExtension::updateRelativeLink
...
Updated SiteTreeExtension PHPDoc
Refactored out Translatable extension in RelativeLink
2013-05-10 12:22:22 +12:00
Sean Harvey
c7ebf76757
Page history panel: show appropriate message when viewing latest version
2013-05-07 17:14:28 +12:00
Sean Harvey
b4f2e35b32
Updating text for permission description to be accurate for 3.x
2013-04-30 17:58:47 +12:00
Ingo Schommer
c0302bc24d
Merge remote-tracking branch 'origin/3.1'
2013-04-29 08:59:11 +02:00
Ingo Schommer
878cf541b9
Better UI feedback on VirtualPage states ( fixes #1594 )
2013-04-16 11:56:33 +02:00
Ingo Schommer
2227ed3629
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:26:24 +02:00
Ingo Schommer
d7435cde71
Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix
...
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570 )
2013-04-08 07:58:49 -07:00
Ingo Schommer
da515b8f65
FIX Use SSViewer.theme_enabled in CMS logic
2013-04-08 19:29:09 +12:00
Will Rossiter
6e2906d01e
API: remove static related classes, now staticpublisher module
2013-04-06 17:26:15 +13:00
Loz Calver
ea446f2ade
Better error message when attempting to enter a blank URL Segment ( fixes silverstripe/silverstripe-cms#1570 )
2013-04-05 14:06:32 +01:00
Ingo Schommer
51c00e33e6
Merge remote-tracking branch 'origin/3.1'
2013-03-27 12:12:21 +01:00
Ingo Schommer
18201c05af
Fixed Config usage in ErrorPage
2013-03-27 12:00:55 +01:00
Ingo Schommer
8eb3840325
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
Ingo Schommer
51c8e8639e
API Marked statics private, use Config API instead ( #8317 )
...
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Ingo Schommer
1f14654649
CMSMain->LinkWithSearch() visibility
...
Required for tree links retaining search state
2013-03-19 22:13:10 +01:00
Ingo Schommer
c3b4d68664
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
code/controllers/SilverStripeNavigator.php
2013-03-19 14:04:24 +01:00
g4b0
9037aa8645
Re-indexed disallowed array because of json_encode issue with non-sequential array
2013-03-18 17:18:58 +01:00
uniun
5c933b40e5
BUG SilverStripeNavigator shows wrong message.
...
The message was always 'Published Site'.
Also there were no 'active' class on links.
2013-03-18 15:57:20 +02:00
Andrew Short
18f4f68101
Merge branch '3.1'
2013-03-15 21:59:52 +11:00
Andrew Short
b5725c7ace
Merge branch '3.0' into 3.1
2013-03-15 19:36:31 +11:00
Ingo Schommer
ec93643f49
NEW Set correct ParentID when creating page from list view
2013-03-14 19:00:56 +01:00
jean
2dd0e3f02e
NEW Restored duplicate and duplicated with children functionality, as in 2.4 See ticket #7602
...
Conflicts:
javascript/CMSMain.Tree.js
templates/Includes/CMSMain_TreeView.ss
2013-03-13 10:04:09 +01:00
Ingo Schommer
a5e84c0a06
Merge pull request #294 from dhensby/request-patch
...
BUG Request object now has URL changed
2013-03-07 11:32:40 -08:00
Ingo Schommer
0f8d7a0aa4
Removed CMSMain->CMSVersion(), using LeftAndMain instead
...
Implementation got more complex (see https://github.com/silverstripe/silverstripe-cms/pull/289 ),
including composer.lock file support. So trying to to duplicate too much.
2013-02-28 13:39:13 +01:00
Daniel Hensby
eb2e0d7877
BUG Request object now has URL changed
...
Instead of cloning the Request object and losing all the custom
attributes that don't come through the construct (eg: headers) we can
now set the URL alone.
2013-02-28 08:51:25 +00:00
Ingo Schommer
56208a59e5
Merge remote-tracking branch 'origin/3.1'
2013-02-27 13:32:55 +01:00
Sam Minnee
b7b62e5aea
FIX: Fixed create-folder function:
2013-02-26 13:39:48 +13:00
Daniel Hensby
e131a041d4
BUG Metadata heading removed from RediretorPage
...
Currently the empty metadata accordion stays on the RedirectorPage. This is now removed.
2013-02-20 13:32:55 +00:00
Ingo Schommer
c09bca6fac
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
lang/ja_JP.yml
lang/lt.yml
lang/pl.yml
2013-02-18 14:18:27 +01:00
Ingo Schommer
537b0c6117
Define $allowed_actions consistently
...
Required due to stricter $allowed_actions checks in 3.1
2013-02-18 15:12:46 +13:00
Ingo Schommer
53c2059a01
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
code/controllers/SilverStripeNavigator.php
2013-02-07 21:44:41 +01:00
Ingo Schommer
a0e965b7b4
Revert "FIX: updateCMSFields not accepting var by reference"
...
This reverts commit e56a78b160
.
2013-02-06 18:59:51 +01:00
Ingo Schommer
8c3f87bb8a
Results returned from FSP->publishPages()
...
Aids further processing and verbose display,
e.g. when the publication is triggered by a queuing mechanism.
2013-02-06 10:47:41 +01:00
Ingo Schommer
23eeb99075
FIX Clear Requirements before in-memory HTTP request for ErrorPage
...
For example, avoids issues where separate controllers (calling and called) operate on the same
set of files through Requirements::combine_files().
2013-02-06 10:43:42 +01:00
Ingo Schommer
b19a82b693
SiteTree on*() callbacks now consistently invoke on subclasses as well
...
Before this was only possible for some specific ones, like onBeforeWrite.
This excludes any callbacks with augment*() or update*() naming,
since these are assumed to be on extension only, with a corresponding
base method available on the class itself (e.g. "updateCMSFields()"
vs "getCMSFields()").
2013-02-06 10:43:31 +01:00
Ingo Schommer
97fbfd3f12
FIX Respect escaping rules on readonly fields in CMS history view
...
Avoids showing unescaped HTML on fields which didn't allow it otherwise,
e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
which got evaluated within the CMS. If this section contains any
JavaScript it gets executed and can disrupt CMS operation.
2013-02-04 17:16:15 +01:00
Michael Andrewartha
e56a78b160
FIX: updateCMSFields not accepting var by reference
...
updateCMSFields should be taking the fields var by reference.
@see https://github.com/silverstripe/sapphire/pull/1156
2013-02-04 12:55:29 +00:00
Ingo Schommer
00097a5d5d
NEW Clickable URL preview in CMS
...
- Refactored SiteTreeURLSegmentField to render controls in template
rather than JS for better clientside performance, and cleaner behaviour.
- Added dynamic ellipsis to start of URL, to retain most relevant
part of the URL (the last bits)
- Added "suffix" setting to field, which defaults to ?stage=Stage
- Removed prefix from edit view to leave more room for URL
Thanks to @sunnysideup for getting this started in
https://github.com/silverstripe/silverstripe-cms/pull/269
2013-02-04 12:12:28 +01:00
UndefinedOffset
119d8aa892
ENHANCEMENT: Do not display SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions
2013-02-01 14:16:19 -04:00
Ingo Schommer
931b726589
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-01-30 13:09:14 +01:00
Ingo Schommer
b25063b09c
Extracted ErrorPage default data to getter
...
Allows for less verbose overloading, while still keeping i18n capabilities
in place, which isn't possible with DataObject::$default_records
2013-01-30 13:07:11 +01:00
Ingo Schommer
eba4d205c3
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-01-30 12:44:40 +01:00
Ingo Schommer
416178b668
Reduced code duplication in ErrorPage (no functional changes)
2013-01-29 19:34:05 +01:00
Ingo Schommer
b15b98345f
Using new "Security.login_url" configuration value
2013-01-29 18:06:49 +01:00
Ingo Schommer
649de6e1bc
BUG Reinstated CMS "History" Preview (fixes ##8089)
2013-01-25 11:35:48 +01:00
Kirk Mayo
81cd0e6e04
BUG: Replaced extendedSQL with DataList as per ticket 8183
2013-01-24 08:45:30 +13:00
Ingo Schommer
317977a227
More useful default cols on "Pages" list ( fixes #8199 )
2013-01-22 15:37:20 +01:00
Ingo Schommer
8ab66c93b6
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/reports/Report.php
composer.json
2013-01-21 11:24:05 +01:00
Ingo Schommer
61f2ab7519
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-01-21 10:03:30 +01:00
Will Rossiter
06e8499070
Remove outdated ReportAdmin assets
2013-01-21 16:53:19 +13:00
unclecheese
cfc976bff8
MINOR: Grammar error
2013-01-17 14:31:35 -05:00
Ingo Schommer
8a9acaa5ba
Fixed "add page" type icons ( fixes #8190 )
2013-01-17 19:59:54 +01:00
Will Rossiter
56346a50bf
API: moved reports API to separate module
2013-01-17 21:58:03 +13:00
Ingo Schommer
93bee9422a
Don't duplicate SS_Report title in GridField
2013-01-14 17:12:27 +01:00
Ingo Schommer
76aeec70e7
NEW SiteTree->PreviewLink() for fine grained URL control
2013-01-14 17:12:23 +01:00
Andrew O'Neil
f9504ee983
ENHANCEMENT Writing caching metadata as HTML comments in FilesystemPublisher (through StaticPublisher::$include_caching_metadata) (ischommer)
2013-01-14 17:08:12 +01:00
Normann Lou
f674af0c73
BUG: dependentPages grid field not showing necessary columns and their values.
2013-01-09 22:35:54 +01:00
Ingo Schommer
ffc6d6ffad
BUGFIX Disable CMS preview for RedirectorPage ( fixes #7127 )
...
If the redirect is to an internal page, the preview iframe
will automatically load this new URL, causing the CMS edit
form to switch as well - effectively making it impossible
to edit a redirector page in the CMS as soon as it is saved
with an internal redirection target.
2013-01-09 21:44:52 +01:00
Ingo Schommer
fa78370ac4
Merge remote-tracking branch 'origin/3.0' into 3.1
2012-12-21 11:48:48 +01:00
Ingo Schommer
cb96255e80
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:18:18 +01:00
Ingo Schommer
cc536f644e
Fixed "last edited" display in CMS actions
2012-12-17 12:31:28 +01:00
Ingo Schommer
9403dd6e38
Respecting model permissions in AssetAdmin
2012-12-16 23:32:09 +01:00
Ingo Schommer
c2d31e55dd
BUG Hiding group selections in "Settings"
...
JS functionality was only applied to page-specific settings
with similar fields, but not to SiteConfig settings.
2012-12-15 20:01:05 +01:00
Ingo Schommer
5b2cc19704
Added placeholder text to group listboxes
2012-12-15 19:57:14 +01:00
Ingo Schommer
a8478d2e46
Merge remote-tracking branch 'origin/3.0' into 3.1
2012-12-14 10:55:51 +01:00
Ingo Schommer
74d63791b7
Fixed regression in SiteTree->getCMSActions()
...
Caused by toolbar recent changes
2012-12-14 01:21:54 +01:00
Ingo Schommer
1d470fe718
Removed duplciate success status feedback on CMS save/publish
...
We now have the CMS actions with two states for communicating
that they've saved correctly.
2012-12-13 23:29:17 +01:00
Mateusz Uzdowski
26cc14a930
API Rework the CMS actions to use alternating buttons and drop-ups.
...
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
2012-12-13 19:10:39 +01:00
Niklas Forsdahl
d42c0041d2
BUG: Fixed pagination functionality on root assets folder
...
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.
Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
2012-12-13 16:31:19 +02:00
Ingo Schommer
2e164eae51
API Report::get_reports() returns native array ( fixes #8096 )
...
Used to return ArrayList, but since 9d74c99e08 its no
longer using keys, which they functionality using these return
values rely on. Hence the breakage of ReportAdmin,
since no report was being detected as "current" by looking
through the array keys.
2012-12-13 00:46:17 +01:00
Ingo Schommer
8cd29b627c
Merge branch 'pulls/selectiongroup'
2012-12-11 11:08:30 +01:00
Mateusz Uzdowski
a9004b9978
Restore numbering to navigator items so we can use iterator.
...
Otherwise the numbering is by priority which is not traversable
(1000, 2000, 3000...).
2012-12-10 18:09:55 +01:00
Mateusz Uzdowski
230182fc77
Remove preview button from history section.
...
No longer works. Needs to be rewritten to work with side-by-side.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
47f41d80c6
API Machine-friendly name for CMS states navigator (stages).
...
Used programmatically by the side-by-side state switcher.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
aaae8c97e6
Explicitly mark the section as previewable.
...
Picked up by the forntend side-by-side preview JS.
2012-12-10 18:09:54 +01:00
Naomi Guyer
0711c321c5
Add side-by-side translation context.
2012-12-10 18:09:54 +01:00
Naomi Guyer
639f6e4d95
NEW Side by side editing functionality - first cut (os#7412)
...
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.
Relies on sapphire's f95fadc84416835302fe6c8448054960b5e7ec65
2012-12-10 18:09:54 +01:00
Ingo Schommer
1bf67fd942
Merge remote-tracking branch 'origin/3.0'
2012-12-10 18:09:34 +01:00
Mateusz Uzdowski
c0751df54e
BUG Remove handwritten SQL and use the ORM.
...
The custom SQL does not take subsites into account and breaks the CMS
on certain pages - under some circumstances the custom count will return
1 or more, while the set will be in fact empty because of augmentation.
2012-12-05 10:27:12 +13:00
Andrew O'Neil
6b6571cd28
BUGFIX: Only rely on request var ParentID, instead of using both $this->currentPage() and the request var. This will hopefully fix issues around the parent ID getting lost.
2012-12-04 11:16:40 +01:00
Ingo Schommer
f9a5601fa3
BUG Enforce "add page" restrictions, improve UI ( fixes #7879 )
...
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
2012-12-03 16:52:17 +01:00
Ingo Schommer
2cd46ff0ed
Use new SelectionGroup_Item API in "add page" UI
2012-11-30 15:34:10 +01:00
Ingo Schommer
027a41aec7
Consistent naming for root breadcrumb on page controllers ( fixes #8057 )
2012-11-29 14:43:37 +01:00
Ingo Schommer
e6e12fe00e
Merge branch '3.0'
...
Conflicts:
composer.json
2012-11-22 23:48:18 +01:00
Tim Klein
59719a46cc
MINOR removed reference to non existent js
...
cms/javascript/SitetreeAccess.js is no longer with us :)
2012-11-19 16:15:57 +13:00
Ingo Schommer
65fe8e5ae3
Fixed line length
2012-11-19 01:18:01 +01:00
Kirk Mayo
d58b23d6fa
BUG AssetAdmin filter array indices ( fixes #8014 )
2012-11-19 00:51:12 +01:00
Sean Harvey
4c73f23ddb
Removing deprecated FileList as it relies on TableListField
...
This has been moved to "legacytablefields" module
https://github.com/silverstripe-labs/legacytablefields
2012-11-16 12:42:04 +13:00
Sean Harvey
cef087f689
Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead
2012-11-15 14:41:17 +13:00
Sean Harvey
d236bb58eb
Removed deprecated SiteTree::prepopuplate_permission_cache()
...
This function is misspelled, and was marked deprecated. This commit
removes that function. Please use prepopulate_permission_cache()
instead (note the removal of the extraneous "p" in "prepopuplate")
2012-11-15 14:39:48 +13:00
Sean Harvey
94b37dbeb0
Fixing AssetAdmin to use static FormField::create_tag()
...
Instead of createTag() which is deprecated
2012-11-15 14:32:52 +13:00
Sean Harvey
33884acbc5
Removed deprecated ContentController::LangAttributes()
...
Use ContentLocale() instead and write attribute names suitable
to XHTML/HTML instead
2012-11-15 14:32:21 +13:00
Sean Harvey
555ecd7f24
Removed deprecated SiteTreeDecorator, use SiteTreeExtension instead
2012-11-15 14:31:54 +13:00
Sean Harvey
35bcf69c01
Removed deprecated Register::register() and unregister()
...
Report automatically includes reports instead, and
add_excluded_reports() can be used to exclude certain reports
2012-11-15 14:30:47 +13:00
Simon Welsh
d006c08db3
Reverts test code committed in a52514a3
2012-11-10 15:42:45 +13:00
Simon Elvery
6a69a2f71a
BUGFIX Ensure required lang and css are loaded when using SiteTreeURLSegmentField
2012-11-08 12:53:43 +10:00
Andrew O'Neil
b31188f252
APICHANGE: Use late static binding for Object::has_extension()
2012-11-07 11:08:36 +13:00
Andrew O'Neil
1722f00869
APICHANGE: add_extension() is now called directly on the class, instead of on Object
2012-11-07 11:08:36 +13:00
Ingo Schommer
a52514a306
ENHANCEMENT Tab style consolidation and design consistency
2012-11-06 22:24:01 +01:00
Sam Minnee
ef32310ef8
FIX: Allow 1024 chars for keywords, not a mere 255
2012-11-05 17:58:32 +13:00
Sean Harvey
79e6304ce1
Merge branch '3.0'
2012-11-05 15:13:06 +13:00
Stig Lindqvist
fa348d6666
MINOR Code refactoring of CMSMain::SearchForm() extracted some methods.
2012-11-02 23:52:24 +01:00
Ingo Schommer
600c73086b
Merge pull request #223 from adrexia/7883-File-Uploading-Notifications
...
BUG: File Uploading Notifications (fixes #7883 )
2012-11-02 14:08:20 -07:00
Ingo Schommer
53e92a080a
Merge pull request #226 from adrexia/asset-grid-filter
...
BUG: Filter in asset grid appears in incorrect place
2012-10-30 14:59:25 -07:00
Ingo Schommer
7131e167f1
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
code/model/RedirectorPage.php
2012-10-30 17:54:55 +01:00
Will Rossiter
b221f7ba7a
FIX Remove Metadata Label from RedirectorPage. ( Fixes #7959 )
2012-10-23 19:32:25 +13:00
Naomi Guyer
0d642af136
BUG: Filter in asset grid appears in incorrect place
...
Moved the filter component in the asset gridfield to after the sortable
header
2012-10-23 15:00:49 +13:00
Russell Michell
72543440cb
BUGFIX: Fixed SideReport for use with Postgres (using v8.4) which requires table/column-names to be quoted. MySQL seems OK with either/both
2012-10-19 16:04:32 +13:00
Naomi Guyer
d61f16d54a
BUG: File Uploading Notifications ( fixes #7883 )
...
* Moved allowed file types into a variable to be used in the template.
2012-10-16 18:43:10 +13:00
Sean Harvey
8a0ae5653f
Merge branch '3.0'
2012-10-15 10:10:52 +13:00
Sean Harvey
98197525c6
Remove use of backticks in BrokenLinksReport, always use ANSI quotes
2012-10-11 17:24:23 +13:00
Sam Minnée
de4f207534
Merge pull request #208 from halkyon/upload_assets_changes
...
Uploads go to "assets/assets" instead of root of assets
2012-10-10 13:24:06 -07:00
Ingo Schommer
17113039be
NEW Enable SiteTree::$nested_urls by default
2012-10-08 17:05:46 +02:00
Jeremy Bridson
76e569a8bb
ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change.
2012-10-05 16:27:13 +13:00
Ingo Schommer
0d03c62984
Merge remote-tracking branch 'origin/3.0'
2012-10-03 16:16:25 +02:00
Ingo Schommer
a6d09988ed
Merge pull request #214 from silverstripe-droptables/ssexpress
...
Tweaks to CMS required for Translatable
2012-10-02 02:10:47 -07:00
Robert Curry
9cf5a6f47a
BUG: Remove the is_null check on augmentValidURLSegment
...
Object::extend already does a check for NULL before it adds the results
to the array of return values. This was required for Translatable as the
result from Translatable::augmentValidURLSegment was being ignored.
2012-10-02 11:29:10 +13:00
Simon Welsh
03ae8e3728
Merge pull request #213 from sminnee/http-error-catching
...
FIX Use RequestHandler::httpError() for all HTTP errors.
2012-09-26 18:00:32 -07:00
Sam Minnee
39792debb8
FIX Use RequestHandler::httpError() for all HTTP errors.
...
https://github.com/silverstripe/sapphire/pull/827 adds some extension points for catching HTTP errors such as 404. This change fixes some issues where httpError() isn't used all the time. Note that the aforementioned pull request will be necessary to ensure that it works properly.
2012-09-27 12:56:56 +12:00
Sean Harvey
cb8c10a473
Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0
2012-09-27 10:49:03 +12:00
Roman
bde71c1b9c
Fixing permission issue with CMSSettingsController, where it won't show up for users with limited rights, even when they have the EDIT_SITECONFIG
permission
2012-09-25 22:13:31 +02:00
Sean Harvey
686f70330b
Merge pull request #210 from chillu/pull/sitetree-meta-removal
...
API Removed SiteTree.MetaTitle and MetaKeywords
2012-09-24 21:15:24 -07:00
Sean Harvey
345dbc8a4f
BUG Fixing broken links "admin/show", should be "admin/pages..."
2012-09-25 15:31:42 +12:00
Sean Harvey
d229fdcc6d
Merge branch 'removestatic' of git://github.com/wilr/silverstripe-cms into wilr-removestatic
2012-09-25 14:15:09 +12:00
Ingo Schommer
cbd31e3ab2
API Removed SiteTree.MetaTitle and MetaKeywords
...
They are irrelevant in terms of SEO, general page informancy,
clutter up the CMS UI, and encourage CMS authors to waste
their time filling them out.
[1] http://www.seomoz.org/learn-seo/title-tag
[2] http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/
2012-09-21 11:31:00 +02:00
Ingo Schommer
cebce51bc1
Merge branch 'open/7875' of git://github.com/jbridson/silverstripe-cms into jbridson-open/7875
2012-09-21 10:49:20 +02:00
Will Rossiter
a3007b618f
API moved StaticCache / StaticPublisher to module.
...
Removed all related functionality for exporting a static version of the website to the silverstripe-static module.
2012-09-21 19:59:31 +12:00
Sean Harvey
118b28dea1
BUG setFolderName in CMSFileAddController should default to the root
...
setFolderName expects a folder name relative to the root. Specifying
ASSETS_DIR will create a duplicate folder called "assets", so the
file gets uploaded into "assets/assets". Specifying "/" means the
file will get uploaded into the root instead, which is correct.
2012-09-21 16:00:35 +12:00
Ingo Schommer
df44239060
Method visibility according to coding conventions
2012-09-20 10:41:50 +02:00
Jeremy Bridson
05d5bd7508
ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen.
2012-09-20 13:22:12 +12:00
UndefinedOffset
a2d76c9305
BUG Remove page types from the "add new page here" menu if they appear in a hide_ancestor ( fixes #7712 )
2012-09-15 17:04:02 +12:00
Niklas Forsdahl
17db5baf19
BUG: Page type names not translated in pages overview search form
...
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-12 11:02:24 +02:00
Ingo Schommer
9b6ca79746
Fixed report title column localization
2012-09-12 11:02:24 +02:00
Ingo Schommer
9124d8ae1a
Fixed report title column localization
2012-09-11 12:49:27 +02:00
Damian Mooyman
02e95adb4c
BUG Consistently save SiteConfig, and refactor Translatable hooks
...
Squashed commit of the following:
commit a60eddfacc710d3047bd1d5107e5df0cc6dba93c
Merge: c847b55
76be14b
Author: Ingo Schommer <ingo@silverstripe.com>
Date: Fri Sep 7 17:02:47 2012 +0200
Merge branch '3.0-translation-migration' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-migration
commit 76be14b1fc
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date: Fri Aug 24 08:28:18 2012 +1200
FIXED: Indentation
commit 715b60387c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date: Fri Aug 24 08:25:14 2012 +1200
FIXED: Coding style inconsistencies
commit 6395f9030e
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date: Thu Aug 16 16:30:11 2012 +1200
FIXED: Issue where new SiteConfig instances weren't always saved to the database
commit aca242e31c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date: Thu Aug 16 14:22:56 2012 +1200
UPDATED: Refactored Translation module specific code out of the SiteConfig
2012-09-07 17:06:29 +02:00
Ingo Schommer
c847b55608
Merge pull request #195 from creamarketing/page-type-dropdown-translations
...
BUG: Page type names not translated in pages overview search form
2012-09-06 12:36:35 -07:00
Andrew O'Neil
f843dd56dc
BUGFIX: Fix site tree filter not showing parents of results more than a level deep in the hierachy
2012-09-05 14:35:48 +12:00
Niklas Forsdahl
2934423ebc
BUG: Page type names not translated in pages overview search form
...
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-04 09:00:04 +03:00
jean
53fdafb473
NEW 7839 Support for documents as a file type in Files and images
2012-09-04 11:26:09 +12:00
Hamish Friedlander
af2c890168
Merge pull request #190 from silverstripe-rebelalliance/open/5971
...
NEW Add warning if viewed SiteTree object class is obsolete
2012-09-02 14:12:23 -07:00
Ingo Schommer
1cd82e2db1
BUG Enforce $allowed_children in controllers on page creation ( fixes #7694 )
...
Original bug fix contributed by @kmayo-ss
2012-09-02 18:20:22 +02:00