Damian Mooyman
61429c17a6
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
2018-04-13 10:03:47 +12:00
Damian Mooyman
87d69ba753
ENHANCEMENT Use i18n template for page tree title
2018-04-10 10:30:49 +12:00
Jason Korth
e554e82afa
adjustment to show Page Type title on SiteTree mouseover
2018-04-09 21:52:07 +01:00
Damian Mooyman
48f53a522a
Merge remote-tracking branch 'origin/4.1' into 4
2018-04-05 08:38:24 +12:00
Damian Mooyman
c6af8856c8
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# code/Controllers/ContentController.php
2018-04-05 08:37:48 +12:00
Daniel Hensby
cf5a0984ad
FIX Correct SilverStripeNavigator correctly in templates
2018-03-22 14:40:14 +00:00
Damian Mooyman
354d72165e
Update CMS for versioned enhancements ( #2122 )
2018-03-14 16:34:46 +13:00
Daniel Hensby
d02c15150b
Merge branch '4.1' into 4
2018-02-21 14:02:52 +00:00
Daniel Hensby
47fdc4c589
Merge branch '4.0' into 4.1
2018-02-21 14:02:17 +00:00
Damian Mooyman
289d6a87a2
MINOR Simplify i18n keys
2018-02-21 10:32:13 +13:00
Robbie Averill
9ebea37b33
NEW Add extension point to CMSMain::Breadcrumbs
2018-02-20 14:28:25 +13:00
Damian Mooyman
3be0478e1c
BUG Fix behaviour towards versioned but unstagable records
2018-02-20 11:03:23 +13:00
Daniel Hensby
9d77d32dea
Merge pull request #2099 from creative-commoners/pulls/4.0/dont-alias-this
...
MINOR Stop aliasing $this in history controller callbacks
2018-02-15 10:01:52 +00:00
Robbie Averill
e3a7a1ffed
MINOR Stop aliasing $this in history controller callbacks
2018-02-15 13:38:29 +13:00
Damian Mooyman
b291306c03
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# client/dist/js/bundle.js
2018-02-15 09:24:08 +13:00
Chris Joe
a3873a6422
Merge pull request #2093 from open-sausages/pulls/4.1/mind-if-i-button
...
Replace save draft / save & publish buttons with save, publish
2018-02-12 10:47:14 +13:00
Aaron Carlino
ca8b728580
replace save draft / save & publish buttons with save, publish
2018-02-09 12:18:57 +13:00
Robbie Averill
b084fe8177
NEW Convert page history notice to use Bootstrap 4 info alert
2018-02-07 16:47:24 +13:00
Damian Mooyman
23a23043bc
Fix successfullyinstalled() ( #2069 )
...
Cleanup ContentController.php
2018-01-12 14:39:27 +13:00
Damian Mooyman
227ce39414
Merge branch '4.0' into 4
2017-12-18 16:16:20 +13:00
Damian Mooyman
210213a455
Fix search behaviour
2017-12-13 18:16:34 +13:00
Damian Mooyman
073cb77500
Trim some unnecessary API
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
8a04e9c46b
Fix wrong/confusing url segment
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
b391db4977
Fix search view
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
042dbbb13d
Remember pages view type
2017-12-13 17:10:39 +13:00
Damian Mooyman
c2d54a571d
Fix up code style, fix tests
...
Add in missing service definitions
2017-12-13 16:36:01 +13:00
Aaron Carlino
8ee5d9f5ce
ENHANCEMENT Cache canCreate
2017-12-13 16:26:36 +13:00
Loz Calver
7efe667a48
FIX: VirtualPage not using target page's template ( fixes #2039 ) ( #2041 )
...
* FIX: VirtualPage refreshFromCopied creates duplicate URLSegments on first write
* FIX: VirtualPage not using target page's template (fixes #2039 )
2017-12-06 11:59:30 +13:00
Lee Bradley
1fedc5fc10
API Make CMSMain::getSiteTreeFor()
default to null
nodeCount ( #2029 )
2017-11-28 10:09:27 +13:00
Lee Bradley
d3fa8946be
Issue-2034: Fix for Page icons using data urls
...
Fixes #2034
Code was getting the icon twice, both in SiteTree &
LeftAndMainPageIconsExtenstion.
Now just uses `SiteTree::getPageIconURL()`
Tweaked to use `sprintf` instead of double quotes
2017-11-23 15:42:31 +00:00
Robbie Averill
4d0632892b
FIX Add warning state to revert action in CMS page history
2017-10-27 17:32:00 +13:00
Damian Mooyman
7b71b2868e
Merge pull request #1999 from open-sausages/pulls/4.0/you-cannot-see-what-you-cannot-see
...
FIX revert to this button after archiving
2017-10-24 09:46:08 +13:00
Christopher Joe
689c198fbe
FIX revert to this button after archiving
2017-10-20 09:26:35 +13:00
Damian Mooyman
77b26b36fd
BUG Fix page icons in vendor modules
2017-10-19 15:41:12 +13:00
Damian Mooyman
c8f95182cb
Fix icon urls
2017-10-10 17:03:22 +13:00
Damian Mooyman
49fd3391fe
BUG Prevent icons CSS being included twice
2017-10-05 10:04:57 +13:00
Chris Joe
fb9ad4453e
Merge pull request #1973 from open-sausages/pulls/4.0/update-classinfo-usages
...
Update usages of ClassInfo
2017-09-20 16:29:37 +12:00
Damian Mooyman
fa0b559a7b
Update usages of ClassInfo
...
Add missing unit tests for SiteTreeFolderExtension
2017-09-20 15:20:17 +12:00
Damian Mooyman
496b9c8c04
API Implement insert-anchor modal
2017-09-20 13:35:25 +12:00
Robbie Averill
d18568c395
FIX Ensure client config merging includes existing parent "form" attributes
2017-09-15 09:12:53 +12:00
Saophalkun Ponlu
4f3b4f7626
FIX Fine-tune button styles
2017-09-13 10:44:11 +12:00
Damian Mooyman
4b26ed6a83
BUG Prevent treeview loading repeatedly on each page edit form
...
Fixes #1949
2017-09-05 11:52:04 +12:00
Damian Mooyman
1273059b4c
Fix campaign form validation errors
2017-09-04 14:47:45 +12:00
Damian Mooyman
9350b4a425
BUG Fix inconsistent breadcrumbs in CMS section
...
Fixes #1867
2017-08-28 13:03:56 +12:00
Saophalkun Ponlu
d0fd96d4e6
FIX Remove entry points to tree in search mode
2017-08-28 11:00:41 +12:00
Andrew Aitken-Fincham
46abf8ffd5
sanitize namespaced classes for page icon css
2017-08-24 12:00:33 +01:00
Saophalkun Ponlu
d03edb208e
FIX Search in page edit should now redirect to (full) table view
2017-08-24 13:50:05 +12:00
Loz Calver
9a9b4e205c
Merge pull request #1929 from robbieaverill/pulls/4.0/replace-stat-usage
...
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 10:26:45 +01:00
Robbie Averill
f2e22ef18a
Replace use of Configurable stat() with config()->get(), will be deprecated in future
2017-08-23 09:46:46 +12:00
Damian Mooyman
e078e6623d
Restore deferred cms tree loading
2017-08-21 13:59:26 +12:00
Robbie Averill
fc0362087e
FIX Remove legacy sprintf style translations in favour of placeholders
2017-08-02 13:42:52 +12:00
Robbie Averill
f8ea7f27cf
Remove sprintf translations in CMSMain in favour of named parameters
2017-08-02 13:40:08 +12:00
Daniel Hensby
0758f66932
Merge branch '3' into 4
2017-07-25 14:54:33 +01:00
Damian Mooyman
b0380d8766
Un-hard code ViewState argument
2017-07-25 12:57:46 +12:00
Saophalkun Ponlu
fca3ba73f5
FIX Pages search now defaults to list view
2017-07-25 12:57:46 +12:00
Aaron Carlino
fbb63e68e1
Remove whitespace
2017-07-21 10:10:53 +12:00
Aaron Carlino
cc6b44223e
BUGFIX: ContentController still using global $project;
2017-07-21 09:56:41 +12:00
Robbie Averill
fb6e6162ca
FIX Use better inheritance based logic for deciding which active tab to display in edit page
2017-07-18 13:19:04 +12:00
Robbie Averill
dd4d5740b8
FIX Ensure tab states are reflected when switching on page edit screen
2017-07-16 22:46:11 +12:00
Daniel Hensby
732bdd2734
Merge branch '3' into 4
2017-07-15 16:21:51 +01:00
Robbie Averill
1cf8a67f21
NEW Use injector for creating SSViewer
2017-07-13 21:20:00 +12:00
Sam Minnee
ce730319ec
NEW: Remove use of MODULE_DIR constants
...
This relies on
https://github.com/silverstripe/silverstripe-framework/pull/7065
2017-06-28 16:34:05 +12:00
Damian Mooyman
2251138bed
Merge pull request #1862 from robbieaverill/pulls/4.0/fix-missing-memberauthenticator
...
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-28 12:10:28 +12:00
Jonathon Menz
77ec2b90c6
API Removed ErrorPage
...
Removed ErrorPage class and references so it can be split off in to a separate module. Please install https://github.com/silverstripe/silverstripe-errorpage when upgrading to SS4 to preserve ErrorPage functionality. Closes https://github.com/silverstripe/silverstripe-framework/issues/4149
2017-06-26 10:01:54 -07:00
Robbie Averill
8d23cfc2aa
FIX Ensure LoginForm on ContentController can load the member authenticator correctly
2017-06-23 11:22:01 +12:00
Damian Mooyman
c2c75aa9e3
Fix and upgrade all tests
...
Fix link tracking
2017-06-21 16:29:40 +12:00
Damian Mooyman
95e304a4ca
Upgrade usage of global methods
2017-06-20 17:12:18 +12:00
Damian Mooyman
21e204cc59
App object refactor
2017-06-20 17:12:18 +12:00
Antony Thorpe
fdbe38d444
Bugfix: SS4 Right click, add page fails
...
`addForm` receives both POSTs and GETs. Set the form's `strictFormMethodCheck` to false to avoid `405 Method Not Allowed` error response. Issue #1846 .
2017-06-15 13:53:38 +12:00
Simon Erkelens
b2fd014216
Make CMS Compatible with Authentication Refactor work
...
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
Damian Mooyman
f82f0844c1
API Add insert internal link modal
2017-05-30 11:00:32 +12:00
Damian Mooyman
23e1aa8c45
API Refactor inherited permissions ( #1811 )
2017-05-12 12:47:46 +12:00
Damian Mooyman
1efb325b4d
Merge pull request #1813 from open-sausages/pulls/4.0/remove-deprecated-methods
...
Remove APIs with target deprecation of 4.0
2017-05-09 11:36:49 +12:00
Ingo Schommer
4923a2597b
Replaced usage of ResetFormAction ( #1812 )
...
See https://github.com/silverstripe/silverstripe-framework/pull/6883
2017-05-09 11:11:08 +12:00
Ingo Schommer
484a4ec4f6
API Removed deprecated RootURLController:set_default_homepage_link
2017-05-08 21:17:36 +12:00
Ingo Schommer
de41e14518
API Removed deprecated ModelAsController::find_old_page()
2017-05-08 21:14:38 +12:00
Aaron Carlino
359179025d
Reorganise i18n keys
2017-05-08 17:57:24 +12:00
Uncle Cheese
29805ee446
New namespaced i18n keys
2017-04-27 11:43:04 +12:00
Uncle Cheese
6fb1012eb8
Ran upgrader for lang files
2017-04-27 11:43:04 +12:00
Ingo Schommer
cf2b0417cb
Fix coding conventions
2017-04-22 11:44:49 +12:00
Damian Mooyman
d75a3cb0e9
API Update site tree hierarchy to use a MarkingSet and template
2017-04-12 08:57:09 +12:00
Ingo Schommer
9cad8ba01b
Fixed linting
2017-04-12 08:21:02 +12:00
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path
...
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
2017-04-06 13:40:46 +12:00
Saophalkun Ponlu
b8db45055c
Enhancement Refactor archive message to a separate method
2017-04-05 12:45:41 +12:00
Saophalkun Ponlu
5b90141c03
ENHANCEMENT Update archive warning message
2017-04-04 11:26:46 +12:00
Damian Mooyman
393d392de1
Merge pull request #1775 from open-sausages/pulls/4.0/6626-remove-jquery-datepicker
...
HTML5 Date and Time Fields
2017-04-04 10:57:16 +12:00
Ingo Schommer
d07115e665
Use new DateField->setHTML5()
...
See https://github.com/silverstripe/silverstripe-framework/issues/6626
2017-04-03 12:01:12 +12:00
Damian Mooyman
98e77a48a9
API Rename SiteTree::description() to SiteTree::classDescription() to prevent clash
...
Fixes #1733
2017-03-29 11:55:44 +13:00
Damian Mooyman
91933b6c66
Update class namespace
2017-03-28 14:01:02 +13:00
Damian Mooyman
5ce98aced2
API Upgrade to rely on silverstripe/versioned module
2017-03-28 10:35:14 +13:00
Damian Mooyman
5092e0fc65
Add dependency on admin module
2017-03-10 16:33:32 +13:00
Damian Mooyman
8537d6ddb1
Simplify code to use dataFields()
2017-02-28 16:34:46 +13:00
Christopher Joe
2fafff084f
Fix history comparison fields will now show diff properly, rather than escaped html diff
2017-02-28 16:26:11 +13:00
Damian Mooyman
4885736b0e
API Upgrade CMS to use new Config API
2017-02-28 11:30:22 +11:00
Ingo Schommer
6bae804744
API Use symfony/cache
...
See https://github.com/silverstripe/silverstripe-framework/issues/6252
2017-02-26 14:57:52 +13:00
Damian Mooyman
945eba8efb
Update CMS for new i18n API
2017-02-09 16:11:11 +13:00
Damian Mooyman
c7214b4dcd
Auto-convert to psr2
2017-01-31 13:59:35 +13:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend
2017-01-26 11:39:20 +13:00
Damian Mooyman
732b1f0a57
BUG Fix reference to Install_deleteinstallfiles
...
Fixes #1719
2017-01-25 18:03:18 +13:00
Colin Tucker
00c81d8672
Changed init() visibility to protected
2017-01-22 09:35:14 +11:00
Paul Clarke
333b4b3e79
add icon to page in menu
2017-01-11 17:36:30 +13:00
Will Rossiter
5bb430ef43
Remove references to ss-ui
2017-01-11 17:36:30 +13:00
Colin Tucker
9959ef63f2
Fix double-escaped ampersands in CMSMain_TreeView and CMSMain::LinkPageAdd
2017-01-10 15:41:26 +11:00
Mike Cochrane
2108d8ef08
Use SiteTree instead of Page class in more places. Allows developers to extend SiteTree directly.
2017-01-03 20:38:45 +13:00
Daniel Hensby
7a296a541b
Merge branch '3'
2016-12-28 17:00:32 +00:00
Damian Mooyman
bf58c5aef4
API Update to use new form submission handling ( #1691 )
2016-12-09 16:00:46 +13:00
Mike Cochrane
c5fb7127ac
FIX Page History 'Comparing versions' banner missing
...
The 'Comparing versions' banner was inserted before the "Title" field. If there is no "Title" field the banner is missing. If the "Title" field isn't the first field then the banner is in the incorrect place.
2016-11-04 17:55:24 +13:00
Daniel Hensby
5bd7662cb4
Merge branch '3'
2016-11-03 15:32:47 +00:00
Damian Mooyman
e5550dd680
BUG Fix search not respecting view mode
2016-10-27 17:05:36 +13:00
Damian Mooyman
8c87ea6b79
API Update listview / treeview to use pjax instead of deferred loading
...
Fixes #1645
2016-10-27 17:05:36 +13:00
Damian Mooyman
424008cff4
BUG Fix installer for 4.0 ( #1644 )
2016-10-26 14:44:25 +13:00
Sam Minnée
75b185092e
FIX: Remove reference to Object class. ( #1634 )
...
The Object class is due to be removed and so this removes dependence on it.
2016-10-25 10:01:21 +01:00
Damian Mooyman
d54ae8bb26
API Consolidate "Delete from draft" and "Archive" actions into a consistent behaviour ( #1653 )
...
API Update to support new versioned dataobject behaviour
2016-10-25 13:22:31 +13:00
Christopher Joe
5df580578a
Fix double nested alert message
2016-10-16 14:19:58 +01:00
Christopher Joe
712849c732
Fix page form layout
2016-10-11 13:51:44 +13:00
Paul Clarke
b8b35de82d
Replace Layout classes with Flexbox classes
2016-10-11 13:51:44 +13:00
Damian Mooyman
d1dbe91247
API Update for DataObjectSchema changes
2016-10-06 18:10:54 +13:00
Damian Mooyman
1ce243ccc1
API Cleaned up versioned status checks
2016-10-06 10:31:25 +13:00
Sam Minnee
0a561f1656
MINOR: class name references
...
- Replace get_class($this) with static::class
- Replace __CLASS__ with self::class
2016-09-28 11:55:15 +13:00
Sam Minnee
11888a006a
FIX: Remove references to Object::$class
...
To reduce dependence on a ‘god ancestor’ class we should use get_class()
instead.
2016-09-27 18:02:25 +13:00
Loz Calver
3d827543a8
NEW: Allow pages to specify the controller they use
2016-09-22 14:37:51 +01: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
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
Christopher Joe
c411c500a5
Fix for pages admin add to campaign modal
2016-08-23 12:39:01 +12: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
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