Commit Graph

2488 Commits

Author SHA1 Message Date
Will Rossiter
1a3a8d0a0c MINOR: removed duplication of variable and conditional that would never pass
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:24 +13:00
Luke Hudson
5ba4e2d09c ENHANCEMENT: Updated automatic regression tests (Salad)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Luke Hudson
1d50542d6f MINOR: Make Salad accept "login" or "log in"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101870 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Luke Hudson
a32b6237ed BUGFIX: Update Salad tests to match behaviour
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101869 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:23 +13:00
Sam Minnee
b6a41ebc19 BUGFIX #5295: Update CMS site name in LHS via Ajax after siteconfig save.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Andreas Piening
b9b4acabaf BUGFIX: keep ModelAdmin from importing data twice
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
a59fcdd430 MINOR Removed unnecessary console.*() from cms javascript files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
97a0abb2cc MINOR Removed unnecessary "show" icons in "Roles" and "Member" ComplexTableFields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101752 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Sean Harvey
4469b0028a BUGFIX RedirectorPage types shouldn't appear in "Pages with no content" side report in the CMS Pages tab
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:22 +13:00
Ingo Schommer
0e2c39593f MINOR Fixed getElementsByClassName() usage in AssetTableField.js (fixes #5256)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101723 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:21 +13:00
Ingo Schommer
e507f9488b BUGFIX Only show "Roles" tab in admin/security if user has APPLY_ROLES permissions (fixes #5258)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:21 +13:00
Mateusz Uzdowski
fb16cc63f6 BUGFIX: put back into the SSNavigator the archived site link (#5251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:19 +13:00
Mateusz Uzdowski
0449a6bc7d BUGFIX: remove the unnecessary DOM manipulation, this is legacy code due to SilverStripeNavigator changes (open #5250)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:18 +13:00
Mateusz Uzdowski
ba3fbe101b BUGFIX: IE does not accept TD element without a table, repacking into DIV (open #5228)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101602 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Sean Harvey
c8945d9819 BUGFIX Fixed closing </div> which should have been a </td> for dragfile in AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101375 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Sam Minnee
11392e5bb2 BUGFIX: Make SS_ReportWrapper::sourceRecords()' arguments optional
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer
f8ff13ad9e MINOR Fixed multifile.js non-standard forEach() reference, using jQuery.each() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Sam Minnee
e3dd9c9af3 MINOR: Fixed test that was relying on bug fixed in r101116
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101132 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Sam Minnee
9ac87ea4fc MINOR: Fixed test that was relying on bug fixed in r101116
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:17 +13:00
Ingo Schommer
5271e54972 MINOR Fixed wrong default value for AssetAdmin (see r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
67e55a7f99 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Sam Minnee
fd42eae95b MINOR: Use castingHelper() rather than castingHelperPair() to look for a field presence.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:16 +13:00
Ingo Schommer
4e8aa378b9 MINOR Fixed merge error from r99117
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101076 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
3e9424ac27 MINOR Fixed permission language code regression
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
3ed6e4df05 MINOR Adjusted CMSMain->getRootForm() to SiteConfig API changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100974 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
63ab9385dc ENHANCEMENT Added Hebrew (he_IL) language to cms (thanks Oren, Yotam, tzvika, Amir, ohad)
ENHANCEMENT Added Lithuanian (lt_LT) language to cms (thanks Irmantas, Mindaugas, Donatas, Andrius)
MINOR Updated languages in cms from translate.silverstripe.org

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100892 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
6306dfb628 MINOR Updated cms/ lang files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:15 +13:00
Ingo Schommer
d8736b9386 MINOR Using jquery.live instead of livequery in MemberImportForm.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Ingo Schommer
6378a0fece MINOR Using jquery.live and behaviour.js instead of livequery in ModelAdmin.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
2b99e45627 BUGFIX: Fixed notice level error with folder ID
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Will Rossiter
b033c1839c BUGFIX: fixed file uploading not uploading any files at all
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:14 +13:00
Ingo Schommer
bc0934ae10 MINOR Moved PermissionCheckboxSetField specific javascript logic from MemberTableField.js to new sapphire/javascript/PermissionCheckboxSetField.js file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
3cb46c28b5 MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:10 +13:00
Ingo Schommer
5e42eee71a MINOR Improved help texts around permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:09 +13:00
Ingo Schommer
13ee9391bf ENHANCEMENT Better editing of roles through SecurityAdmin instead of a new "Roles" tab. Removed (previously unreleased) PermissionRoleAdmin. (see #4757)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100776 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:08 +13:00
Mateusz Uzdowski
131c271f9c BUGFIX: some sections dont have a tree at all, but they still use LeftAndMain as their base class (eg report admin). Added a guard.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100724 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Tom Rix
2128b4cf1e BUGFIX reload page if broken link tracking values changed during a save. Ticket #1363
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100722 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
abe4049c3d BUGFIX Unsetting 'ID' parameter in MemberTableField->addtogroup() to avoid confusion between Group and Member records (regression from r100716) (from r100720)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100721 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Ingo Schommer
9466e07335 BUGFIX Fixed MemberTableField->addtogroup() to fetch existing Member records by ID or $unique_identifier_field instead of relying on the (now removed) "auto-merging" in Member->onBeforeWrite() (see r100705) (from r100716)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100719 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Mateusz Uzdowski
3f6a4dedfd BUGFIX: moving the ajaxupdatesort JS response code from php to js to get rid of eval. Also disable the "loading" on the moved element when we are done, in case we are repositioning other than the selected item - otherwise the progress indicator is displayed indefinitely.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100701 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
16f4e99af9 BUG FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100699 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
c3006cc448 BUG FIX: column name capitalised
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Geoff Munn
ff236fe98d BUG FIX: column names quoted properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:07 +13:00
Sean Harvey
2a9be51b90 MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100537 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
79ce73c757 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Mateusz Uzdowski
98cec468b2 BUGFIX: replacing calls to deprecated Upload functions - using validator instead (related to r100057)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
56a32fe5c6 MINOR Reverted r100484 as it was causing too many problems
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100485 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
df46043a67 MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100484 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Sean Harvey
bed912822c BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Will Rossiter
e1fc79444f MINOR: added lang file for cs_CZ
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100372 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00