Sam Minnee
|
66be7c939b
|
ENHNANCEMENT: Move cuke/ to salad/ (from r103375)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111663 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:15:05 +00:00 |
|
Sam Minnee
|
7ee0ad5fa6
|
BUGFIX Using try/catch in MemberTableField->saveComplexTableField() similiar to parent implementation, which means trying to save a Member duplicate doesn't end up in a fatal error (fixes #5444) (from r103336)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111662 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:14:56 +00:00 |
|
Sam Minnee
|
cdfbc8a604
|
BUGFIX: static publishing now uses the last non-null theme, OR the value defined in StaticPublisher::static_publisher_theme. (from r103255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111661 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:14:49 +00:00 |
|
Sam Minnee
|
88db7a6a50
|
BUGFIX: the decorator was not completely removed, which caused trouble for tests running later in the same batch (from r103214)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111660 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:14:42 +00:00 |
|
Sam Minnee
|
5926dcc234
|
BUGFIX: realtime publishing now enabled by default (from r103127)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111659 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:14:31 +00:00 |
|
Sam Minnee
|
9c9a42bf89
|
BUGFIX: correct mollom field mapping (from r103037)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111658 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:14:17 +00:00 |
|
Sam Minnee
|
ec63a1092f
|
MINOR: reverted wrong change (from r102901)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111657 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:14:05 +00:00 |
|
Sam Minnee
|
fd6a0f8fd3
|
ENHANCEMENT: added language (Ticket #5390) (from r102899)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111656 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:13:58 +00:00 |
|
Sam Minnee
|
9b2e9b6164
|
BUGFIX Fixed CTF sorting in ModelAdmin results (was failing because of missing 'ResultAssembly' GET parameters (from r102712)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111655 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:12:50 +00:00 |
|
Sam Minnee
|
b85dab39ce
|
BUGFIX: delete from published site never calls canDeleteFromLive(). (via marcus #5364) (from r102386)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111654 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:12:42 +00:00 |
|
Sam Minnee
|
d41220d778
|
BUGFIX: fixed invalid HTML output from page comments template (from r102320)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111653 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:12:36 +00:00 |
|
Sam Minnee
|
186f59b059
|
BUGFIX: Fix Salad tests (from r102265)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111652 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:12:29 +00:00 |
|
Sam Minnee
|
3a7b510127
|
BUGFIX #5255 LeftAndMain should include the correct editor.css file so typography from user selected theme in SiteConfig is shown in TinyMCE (from r102038)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111651 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:12:19 +00:00 |
|
Sam Minnee
|
ba7955862b
|
MINOR Saving TinyMCE editor focus in tinymce_ssbuttons plugin when sidepanel is opened (see #5263) (from r101974)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111650 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:11:44 +00:00 |
|
Sam Minnee
|
e33bfb2755
|
ENHANCEMENT: Updated automatic regression tests (Salad) (from r101871)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111649 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:11:04 +00:00 |
|
Sam Minnee
|
7316586899
|
MINOR: Make Salad accept "login" or "log in" (from r101870)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111648 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:10:59 +00:00 |
|
Sam Minnee
|
99b0fe04f3
|
BUGFIX: Update Salad tests to match behaviour (from r101869)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111647 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:10:48 +00:00 |
|
Sam Minnee
|
171b16e6c9
|
BUGFIX: keep ModelAdmin from importing data twice (from r101795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111646 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:10:33 +00:00 |
|
Sam Minnee
|
dea5cdd64e
|
MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields (from r101752)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111645 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:10:22 +00:00 |
|
Sam Minnee
|
fc50b2df08
|
BUGFIX RedirectorPage types shouldn't appear in "Pages with no content" side report in the CMS Pages tab (from r101737)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111644 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:09:26 +00:00 |
|
Sam Minnee
|
261b4b9a6c
|
BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions (fixes #5258) (from r101719)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111643 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:09:10 +00:00 |
|
Sam Minnee
|
6f0743fbb2
|
BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField (from r101375)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111642 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:08:13 +00:00 |
|
Sam Minnee
|
f00a0a1570
|
BUGFIX: Make SS_ReportWrapper::sourceRecords()' arguments optional (from r101189)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111641 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:07:24 +00:00 |
|
Sam Minnee
|
d53ea50620
|
MINOR Fixed multifile.js non-standard forEach() reference, using jQuery.each() instead (from r101135)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111640 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:07:20 +00:00 |
|
Sam Minnee
|
6b9544b22f
|
MINOR: Fixed test that was relying on bug fixed in r101116 (from r101132)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111639 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:07:16 +00:00 |
|
Sam Minnee
|
000308fca1
|
MINOR: Fixed test that was relying on bug fixed in r101116 (from r101117)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111638 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:07:10 +00:00 |
|
Sam Minnee
|
18add377f2
|
MINOR Fixed wrong default value for AssetAdmin (see r101106) (from r101111)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111637 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:07:04 +00:00 |
|
Sam Minnee
|
c49b38f615
|
MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review. (from r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111636 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:06:57 +00:00 |
|
Sam Minnee
|
da16a507ae
|
MINOR: Use castingHelper() rather than castingHelperPair() to look for a field presence. (from r101091)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111635 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:06:50 +00:00 |
|
Sam Minnee
|
10081b2911
|
MINOR Fixed merge error from r99117 (from r101076)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111634 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2010-10-04 06:06:44 +00:00 |
|
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 |
|