Commit Graph

116 Commits

Author SHA1 Message Date
Ingo Schommer
0661fa6ceb MINOR Renaming CMSMenu entries 2011-04-28 22:48:55 +12:00
Sam Minnee
3498e41b0a Merge branch '2.4'
Conflicts:
	_config.php
	code/AssetAdmin.php
	code/AssetTableField.php
	code/CMSBatchAction.php
	code/CMSBatchActionHandler.php
	code/CMSMain.php
	code/CMSSiteTreeFilter.php
	code/CommentAdmin.php
	code/CommentTableField.php
	code/GroupImportForm.php
	code/LeftAndMain.php
	code/MemberImportForm.php
	code/MemberTableField.php
	code/ModelAdmin.php
	code/PermissionRoleAdmin.php
	code/ReportAdmin.php
	code/SecurityAdmin.php
	code/SideReport.php
	code/reports/BrokenLinksReport.php
	code/sitefeatures/MathSpamProtection.php
	code/sitefeatures/PageComment.php
	code/sitefeatures/PageCommentInterface.php
	code/sitefeatures/SSAkismet.php
	css/cms_left.css
	css/cms_right.css
	css/layout.css
	css/silverstripe.tabs.css
	images/loading.gif
	javascript/AssetAdmin.js
	javascript/AssetTableField.js
	javascript/CMSMain_left.js
	javascript/CMSMain_right.js
	javascript/LangSelector.js
	javascript/LeftAndMain.Tree.js
	javascript/LeftAndMain.js
	javascript/LeftAndMain_right.js
	javascript/MemberImportForm.js
	javascript/MemberTableField.js
	javascript/ModelAdmin.js
	javascript/PageCommentInterface.js
	javascript/ReportAdmin_left.js
	javascript/ReportAdmin_right.js
	javascript/SecurityAdmin_right.js
	javascript/SideReports.js
	javascript/SideTabs.js
	javascript/SitetreeAccess.js
	javascript/TranslationTab.js
	javascript/WidgetAreaEditor.js
	javascript/lang/cs_CZ.js
	javascript/lang/en_US.js
	javascript/lang/sk_SK.js
	javascript/tinymce_ssbuttons/editor_plugin_src.js
	javascript/tinymce_ssmacron/editor_plugin_src.js
	lang/en_US.php
	templates/Includes/AssetAdmin_left.ss
	templates/Includes/AssetTableField.ss
	templates/Includes/CMSMain_left.ss
	templates/Includes/CommentTableField.ss
	templates/Includes/ModelAdmin_left.ss
	templates/Includes/SecurityAdmin_left.ss
	templates/PageCommentInterface.ss
	templates/PageCommentInterface_singlecomment.ss
	templates/ReportAdminForm.ss
	tests/CMSMainTest.php
	tests/CMSMainTest.yml
	tests/LeftAndMainTest.php
	tests/MemberTableFieldTest.php
	tests/MemberTableFieldTest.yml
	thirdparty/multifile/multifile.js
2011-02-15 11:50:24 +13:00
Ingo Schommer
95a917e04d MINOR Translations in CMSMain_left.ss
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@108442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:46 +13:00
Ingo Schommer
43cee9f504 MINOR Updated translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107876 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Ingo Schommer
6e19dfd435 ENHANCEMENT Added Latvian (Latvia) translation to cms (thanks Kristaps and Andris!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@107875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:44 +13:00
Ingo Schommer
383358fa05 MINOR Translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@105277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:39 +13:00
Ingo Schommer
fc19125698 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104987 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer
8c40e6f4a3 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer
4ff657e03f MINOR Translations in PageCommentInterface.ss (fixes #5598, thanks Pike)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@104970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:35 +13:00
Ingo Schommer
8de4ccbf0b MINOR Updated cms translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@103836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:32 +13:00
Carlos Barberis
ebea43ebd8 ENHANCEMENT: added language (Ticket #5390)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:26 +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
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
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
Will Rossiter
87a810755e BUGFIX: use localized prefix to compare group codes rather than hard coded english string. MINOR: updated lang file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@100370 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:53:06 +13:00
Ingo Schommer
e65429d6a6 MINOR Localized reports
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@99137 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:54 +13:00
Ingo Schommer
905da3febf ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm (merged and rewritten from r98750)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@98756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:43 +13:00
Ingo Schommer
16f9491f94 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Ingo Schommer
99e9581d2b MINOR Updated master translation file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97487 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:23 +13:00
Sam Minnee
d85d2bd1c9 MINOR: Made delete from draft batch action text more consistent with published. (from r91839)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
f1bac8fd67 ENHANCEMENT: Renamed Author column to User in the page version history to better reflect that they might not have been authors, and just iniators of workflow actions. (from r89015)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:13 +13:00
Ingo Schommer
1700c77476 MINOR Translations (from r105277)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112469 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:49:47 +00:00
Ingo Schommer
2bdf183521 API CHANGE Removed ImageEditor functionality, please use thirdparty modules, e.g. "silverstripe-pixlr" (http://github.com/nyeholt/silverstripe-pixlr) (from r104987)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112462 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:48:00 +00:00
Ingo Schommer
0ac0beca47 MINOR Added translations for BrokenLinksReport, ReportAdminForm.ss, AssetTableField.ss (fixes #5527, thanks Martimiz) (from r104980)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112461 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:46:53 +00:00
Ingo Schommer
5f393e761c MINOR Translations in PageCommentInterface.ss (fixes #5598, thanks Pike) (from r104970)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:45:13 +00:00
Ingo Schommer
3b50f8d3f3 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title (from r97597)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:19:49 +00:00
Ingo Schommer
99eb135198 MINOR: Made delete from draft batch action text more consistent with published. (from r91839) (from r96813)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102675 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:53:50 +00:00
Ingo Schommer
63efbf372b ENHANCEMENT: Renamed Author column to User in the page version history to better reflect that they might not have been authors, and just iniators of workflow actions. (from r89015) (from r96793)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102483 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 09:59:01 +00:00
Ingo Schommer
37a914641b ENHANCEMENT Added help texts for MemberImportForm and GroupImportForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-11 02:22:45 +00:00
Ingo Schommer
fe66ca6861 MINOR Updated language master table, including all changes from jsrewrite refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:46:00 +00:00
Tom Rix
9c67f3e028 MINOR update lang files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91249 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-11 00:40:34 +00:00
Ingo Schommer
c59911dce2 MINOR Correct labels for "delete from draft" batch actions (#4420)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90825 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-04 22:56:29 +00:00
Tom Rix
1d281472ab MINOR i18n'd a whole bunch of the new permission codes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90493 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-30 01:43:34 +00:00
Tom Rix
8e2a5bf7c6 MINOR update batchactions to state how many failed to process
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-30 00:55:37 +00:00
Tom Rix
bb59c48078 MINOR categorized reports, fixed a few translations issues.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-29 02:50:47 +00:00
Tom Rix
85d722d275 MINOR permissions on Groups and Roles are now handled by a checkbox set field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90342 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-28 23:03:35 +00:00
Ingo Schommer
f9e7ec9674 MINOR Updated master language tables
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@86034 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-10 03:58:35 +00:00
Rainer Spittel
b6d739106c MINOR: removed typo in $lang['en_GB']['ModelAdmin']['CREATEBUTTON']
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-18 23:48:17 +00:00
Ingo Schommer
5a8b98e3b7 ENHANCEMENT Added translation for Arabic (Saudi Arabia) - thanks to Talal Al Asmari
ENHANCEMENT Added translation for Estonian (Estonia) - thanks to Marti, Tanel, Tiit and Teet
ENHANCEMENT Added translation for Malay (Malaysia) - thanks to castd, Su Yin and Emil

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@78071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-28 04:39:29 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:11:18 +00:00
Ingo Schommer
9b3b147475 MINOR Updated translations
MINOR Added translations for Catalan - thanks to Bernat and Alex
MINOR Added translations for English (uk) - thanks to Matt and Marti
MINOR Added translations for Spanish (Latin America) - thanks to Antonio, ruben, Miguel, Luis, Carlos, Luciano
MINOR Added translations for Spanish (Mexico) - thanks to Nacho and Antonio
MINOR Added translations for Spanish (Arguentinia) - thanks to Carlos and Luciano
MINOR Added translations for Indonesian - thanks to Fajrin, Lewi, Wirawan, Bima
MINOR Added translations for Norwegian Bokmal - thanks to Emil, Siv, Eskild, Andreas, Johannes, Jana, Carl G.
MINOR Added translations for Serbian (Serbia) - thanks to Jonan and Oliver

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@72774 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-10 12:41:50 +00:00
Sean Harvey
34a50e3de6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@71276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-02-03 03:46:15 +00:00
Ingo Schommer
bdccea54e1 MINOR Updated translations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-13 22:03:39 +00:00
Ingo Schommer
b7ffc6ed5d MINOR Updated language master tables
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70005 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-12 04:59:57 +00:00
Ingo Schommer
d0bb15c41e ENHANCEMENT Added Japanese translation (Thanks Hiroki, Daisuke, Fijii, Shiva, Daniel and Minoru!)
MINOR Updated translations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69994 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-12 04:35:39 +00:00
Ingo Schommer
300435fb13 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-10 11:36:30 +00:00
Ingo Schommer
7b3068ac4f MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@69703 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-05 06:17:59 +00:00
Sean Harvey
c5241fa487 ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 04:55:23 +00:00
Ingo Schommer
1cb3bbd8b2 MINOR Updated master language tables
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65075 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-02 20:05:35 +00:00