Commit Graph

1995 Commits

Author SHA1 Message Date
Sam Minnee
8ea6dddba5 MINOR Fixed permission language code regression (from r101062)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:32 +00:00
Sam Minnee
5176cdd4f0 MINOR Adjusted CMSMain->getRootForm() to SiteConfig API changes (from r100974)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:15 +00:00
Sam Minnee
f8f18f40aa Several merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:04:21 +00:00
Sam Minnee
c12ebeb9fe BUG FIX: column names quoted properly (from r100699)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111630 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:27 +00:00
Sam Minnee
aa81a40b6e BUG FIX: column name capitalised (from r100689)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111629 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:22 +00:00
Sam Minnee
7945c46b49 BUG FIX: column names quoted properly (from r100688)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111628 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:15 +00:00
Sam Minnee
75c64136ad MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536 (from r100537)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:08 +00:00
Sam Minnee
f04470ddf0 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php (from r100530)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:53:25 +00:00
Sam Minnee
00a5a5bd5b Reverted r111624
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:52:58 +00:00
Sam Minnee
ba163b83ae MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated (from r100484)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111624 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:51:54 +00:00
Sam Minnee
cb5cb90889 BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish! (from r100394)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:33 +00:00
Sam Minnee
ca52d729b8 MINOR: added lang file for cs_CZ (from r100372)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111622 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:26 +00:00
Sam Minnee
2010923fe2 MINOR add extendability to SecurityAdmin (from r100360)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:00 +00:00
Sam Minnee
fc340c51a5 BUGFIX #5023 AssetAdmin::sync() is now used to sync tasks, as it works when the user only has access to the AssetAdmin controller instead of going to dev/tasks/FilesystemSyncTask which can only be run by administrators or if the site is in dev mode (from r100335)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111620 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:48:29 +00:00
Sam Minnee
d41d84c3e6 ENHANCEMENT: allow ordering of page commented to be configurabled (from r100327)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:47:38 +00:00
Sam Minnee
70105f066e ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload (from r100058)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:47:30 +00:00
Sam Minnee
65aa49d564 BUGFIX Setting default $groups in MemberTableField::AddForm() in addition to MemberTableField_Popup::__construct() - this was broken by r99777 (from r99993)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111617 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:47:08 +00:00
Sam Minnee
a1cbf0cddf BUGFIX: Use underscores in names of combined .js (#3581) (from r99887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:09 +00:00
Sam Minnee
325a57eea6 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions. (from r99789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:01 +00:00
Sam Minnee
4a613c0e02 ENHANCEMENT: added new PageCommnet to yml so we have different amounts of moderated/unmodereated
BUGFIX: really testing deletemarked now. (from r99679)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:42:32 +00:00
Sam Minnee
d98563e80d MINOR add pass thru group and sort methods (from r99497)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:41:57 +00:00
Sam Minnee
aa6e1c3341 BUGFIX: Correct StaticPublisher filenames, now works with nested URLS (from r99465)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:35:19 +00:00
Sam Minnee
f60941648b MINOR Moved timezone coupling in SS_Report labels into timezoneawareness module (from r99178)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:33:42 +00:00
Sam Minnee
405a9c4563 MINOR Localized reports (from r99137)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111610 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:32:22 +00:00
Sam Minnee
994e60aea8 BUGFIX: Fix not being able to print/export reports (from r98684) (from r99128)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:31:35 +00:00
Sam Minnee
b1cc843801 MINOR: Bugfix in previous commit (from r98660) (from r99127)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:53 +00:00
Sam Minnee
11fac7c0c6 MINOR refactored setting/getting strict hierarchy setting. (from r98654) (from r99126)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111607 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:48 +00:00
Sam Minnee
c8f22503fc BUGFIX: Fixed cache prepopulation on sitetree load. (from r98651) (from r99125)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:34 +00:00
Sam Minnee
2d02afc3f4 MINOR more unit tests around loose hierarchy (from r98509) (from r99121)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111605 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:27:20 +00:00
Sam Minnee
4c510624b1 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161) (from r99119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:27:08 +00:00
Sam Minnee
201e6a5d7c ENHANCEMENT batchactions can now implement confirmationDialog() to provide a custom confirmation dialog to the front end.
MINOR added above confiration to batch setting expiry (from r97215) (from r98211)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111603 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:25:44 +00:00
Sam Minnee
81a6ebfed0 MINOR: removed junk mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111602 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:24:58 +00:00
Sam Minnee
b212b5c98b FEATURE set file metadata on upload. (from r97780) (from r99117)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:21:21 +00:00
Sam Minnee
5b2897381b BUGFIX: Fix navigator links not opening in new windows. (from r97510) (from r99116)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111600 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:21:14 +00:00
Sam Minnee
b7b0e1ab0b BUGFIX: Closing TinyMCE image, link or flash panel when loading form (ticket #4907) (from r98690)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111599 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:21:04 +00:00
Ingo Schommer
0d66807586 MINOR Removed debug coe
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 04:32:09 +00:00
Ingo Schommer
e65b892e31 MINOR Don't use FormResponse in CMSMain::save_siteconfig()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:57:55 +00:00
Ingo Schommer
9df87f3a88 BUGFIX Fixed resizing of $('.LeftAndMain') on edit forms by triggering a delayed resize on first load
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:57:32 +00:00
Ingo Schommer
229ab4609f MINOR Don't move $('#Form_VersionsForm') buttons to top, they disappear
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:45:59 +00:00
Ingo Schommer
69ca614fa4 BUGFIX Checking for existence of $('SwitchView') (fixes #5282) (from r108436)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108828 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:36:44 +00:00
Ingo Schommer
2143443472 BUGFIX: Fixed bug in r97395 (from r97508) (from r99115)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:15:46 +00:00
Ingo Schommer
802ad59f2a MINOR Fixed FilesystemPublisherTest to have self-contained extension settings, and not rely on static publishing being enable in mysite/_config.php already. Fixed login permissions for doPublish() calls in test case. (from r99347)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:11:45 +00:00
Ingo Schommer
1be6520e51 MINOR Removed nested mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 02:46:05 +00:00
Ingo Schommer
139c3e8c40 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395) (from r99114)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 02:45:23 +00:00
Ingo Schommer
42f237bb8f ENHANCEMENT: added PageComment for CommentAdminTest (from r99069)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106140 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:43:20 +00:00
Ingo Schommer
c850ba9aca ENHANCEMENT: CommentAdmin unitest (from r99066)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106138 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:36:49 +00:00
Ingo Schommer
5c9641fc01 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106136 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:34:55 +00:00
Ingo Schommer
653d162939 MINOR pingStatus ping frequency reduced
MINOR updated lang file for SiteConfig
MINOR improved documentation in StaticPublisher
MINOR improved documentation in CMSMain surrounding reports and siteconfig
MINOR migrated headers in SiteConfig to i18n'd (from r86429) (from r99112)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:34:52 +00:00
Ingo Schommer
9a05d59f35 MINOR Added Requirements for SilverStripeNavigator (see r99080) (from r99098)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:33:26 +00:00
Ingo Schommer
90ff55870c MINOR make static caching smarter around cacheSubdirs (from r99076)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:32:57 +00:00