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

4451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damian Mooyman
708e70624c Update translations 2014-11-08 17:06:10 +13: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
Sam Minnée
93d09d4dbb Merge pull request #1127 from halkyon/sprintf_missing 
BUG sprintf missing on exception in SilverStripeNavigator
 2014-11-03 14:40:12 +13:00
Sean Harvey
56142b8bba BUG sprintf missing on exception in SilverStripeNavigator 2014-11-03 14:09:27 +13:00
Loz Calver
7fc5a29f35 Merge pull request #1119 from micmania1/fix-broken-links-dependent-pages 
FIX Broken links on dependent pages tab
 2014-10-23 23:24:11 +01:00
micmania1
8310135923 FIX Broken links on dependent pages tab 2014-10-23 21:53:12 +00:00
Ingo Schommer
286dfe4d86 Fixed duplicate CSS scoping in AssetAdmin.scss 2014-10-16 10:36:31 +13:00
Ingo Schommer
3b93310163 Recompiled CSS with compass 1.0 
Minor syntactical changes, like alphabetical ordering of filters, uppercasing of hex colours. See http://compass-style.org/blog/2014/08/15/omg-compass-1-0/.
Shouldn't include any user-visible changes, but helps to avoid confusion with the next person trying to modify the CSS (Luke is currently struggling with that)
 2014-10-16 10:35:58 +13:00
Damian Mooyman
dd98317b67 Merge pull request #1113 from eimanavicius/master 
Fixes #1112 protected method call
 2014-10-08 08:45:25 +13: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
Sam Minnee
f486c3250b MINOR: Fixed copyright year 2014-09-18 12:59:20 +12:00
Ingo Schommer
ae4601be54 Merge pull request #1096 from gander/3.1 
Update pl.yml for ContentController.StartEditing
 2014-09-01 08:19:41 +12:00
Will Rossiter
b838f8161f Merge pull request #1092 from halkyon/removing_deprecated 
Removing deprecated method
 2014-08-31 17:34:55 +12:00
Gander
6d50b26757 Update pl.yml for ContentController.StartEditing 
For over a year, here is an error, resulting in the display of the broken link to the Polish version of CMS, after installation.
 2014-08-26 21:43:41 +02:00
Will Rossiter
3f902eb9fc Merge pull request #1093 from dhensby/patch-1 
Implement `TemplateGlobalProvider` on `SiteConfig`
 2014-08-23 09:24:26 +12: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
Damian Mooyman
fa90658b7c Merge pull request #1090 from halkyon/travis_reformat 
Reformat .travis.yml
 2014-08-22 15:46:11 +12:00
Sean Harvey
4d0e4b78f4 Reformat .travis.yml 2014-08-22 14:04:50 +12:00
Sean Harvey
23e70009d8 Merge pull request #1083 from mateusz/fix-link-tracking 
API Change broken link hihglighting to write to database.
 2014-08-15 13:10:01 +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
Sean Harvey
8baa126c1b Merge pull request #1077 from mateusz/link-tracking 
Refactor the link-tracking code and move it from framework.
 2014-08-14 14:11:28 +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
Sean Harvey
e4d9f62dd4 Merge pull request #1079 from mateusz/merge-back 
Merge 3.1 back
 2014-08-14 10:07:14 +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
Damian Mooyman
fc6f0fecc5 Set minimum firefox version for travis support 2014-08-11 18:26:15 +12:00
Simon Welsh
ae8911d7ae Merge pull request #1074 from wilr/modularizesiteconfig 
API: Extract siteconfig out to an external module.
 2014-08-09 15:44:55 +10:00
Will Rossiter
18d6c538a7 API: Extract siteconfig out to an external module. 2014-08-09 17:29:50 +12:00
Damian Mooyman
87146eac92 Merge pull request #1073 from sunnysideup/patch-8 
fix spelling of pages from pags to pages
 2014-08-08 08:58:27 +12:00
Nicolaas
7eeb59a52f fix spelling of pages from pags to pages 
fix spelling of pages from pags to pages
 2014-08-07 20:33:19 +12:00
Damian Mooyman
0884151f6a Merge pull request #1072 from madmatt/pulls/changed-pages 
Fix changed pages filter to match SiteTree's 'MODIFIED' label
 2014-08-07 17:10:59 +12:00
madmatt
4e5b1966d3 Fix changed pages filter to match SiteTree's 'MODIFIED' label 2014-08-07 16:48:06 +12:00
Sean Harvey
3a5c5efc7c Merge pull request #1069 from tractorcow/pulls/3.1/fix-cmsmain-getlist 
BUG Fix CMSMain::getList to correctly respect filter result
 2014-08-07 13:43:42 +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
Mateusz U
84fcf02f79 Merge pull request #1071 from tractorcow/pulls/3.1/fix-asset-search 
BUG Fix search range for asset filter
 2014-08-06 14:47:29 +12:00
Damian Mooyman
1c48cb6aae BUG Fix search range for asset filter 2014-08-06 13:26:23 +12:00
Damian Mooyman
407033b076 Update translations 2014-08-05 15:01:52 +12:00
Damian Mooyman
acf376e267 Merge pull request #1068 from jakxnz/1067-cmsfieldaddcontroller-geteditform 
#1067 No updateEditForm hook on CMSFieldAddController::getEditForm()
 2014-08-05 08:39:06 +12:00
Mateusz U
3e1904acd8 Merge pull request #1070 from tractorcow/pulls/3.1/framework-3347-test 
Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347
 2014-08-01 13:21:51 +12:00
Damian Mooyman
42755ebf5b Tests for https://github.com/silverstripe/silverstripe-framework/pull/3347 2014-08-01 12:04:58 +12:00
Jakx.nz
20df063f43 #1067 No updateEditForm hook on CMSFieldAddController::getEditForm() 2014-08-01 10:37:11 +12:00
Damian Mooyman
1b0add3ecf Merge pull request #1063 from stojg/pull/published-pages-cmsfilter 
NEW Adding CMS sitetree filter to see the current 'live' site
 2014-07-29 14:56:26 +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
Ingo Schommer
d140fa0b5e Merge pull request #311 from tractorcow/3.2-pdo-connector 
API New Parameterised Database ORM for Silverstripe 3.2. Ticket #7429
 2014-07-28 08:46:16 +12:00
Damian Mooyman
4967d3dbf6 Merge pull request #1056 from stojg/issue/cms-1049 
BUG: Delete parent page, child pages cannot be found anymore
 2014-07-25 17:26:52 +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