Commit Graph

3106 Commits

Author SHA1 Message Date
Ingo Schommer
108ba69366 Merge branch 'master' into 7094-combine-tree-edit-view 2012-04-18 14:19:58 +02:00
Ingo Schommer
503fa0ac7c ENHANCEMENT Updated YML translations from translate.ss.org, removed unapproved langs with little or no translations, updated master strings, fixed line break problem in lang files generated by i18nYMLConverter module 2012-04-18 13:37:24 +02:00
Jeremy Bridson
1e25637acb ENHANCEMENT:Trac#7166 - styled the new combined tree and edit view. 2012-04-18 13:36:15 +12:00
Sean Harvey
0656d14c43 Merge pull request #103 from ajoneil/remove-pre-53-support
MINOR: Remove checks for PHP <5.3.2, as it's no longer supported
2012-04-17 16:19:40 -07:00
Andrew O'Neil
d1c500a5f9 MINOR: Remove checks for PHP <5.3.2, as it's no longer supported 2012-04-18 10:36:55 +12:00
Ingo Schommer
0f7dd7922f API CHANGE Removed $controller context from SiteTree->CMSTreeClasses(), now handled through closures in the specific LeftAndMain usage instead (to handle separate contexts for links and determining "current page") 2012-04-17 22:59:11 +02:00
Ingo Schommer
75da9fd7cb MINOR Renamed .ss-tabset to .cms-tabset in CMS templates in order to have more entwine flexibility 2012-04-17 22:59:11 +02:00
Ingo Schommer
6aeac37906 API CHANGE Combined "Pages" and "Edit Page" into a single menu entry
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
2012-04-17 22:59:08 +02:00
Ingo Schommer
dcdb0b4731 Merge pull request #95 from simonwelsh/silverstripe-cms
---

ssmacron had a reference to sapphire. Rather than trying to figure out how to make it variable, moving the plugin into third party means the path doesnt need it. ssbuttons is also moved and now all the tinyMCE related JS is in sapphire.

See also https://github.com/silverstripe/sapphire/pull/310

Conflicts:
	javascript/tinymce_ssbuttons/editor_plugin_src.js
2012-04-16 12:09:35 +02:00
Sean Harvey
75dcc5b357 Merge pull request #102 from ajoneil/report-admin-ajax-link
MINOR: Use ajax to load reports
2012-04-15 19:08:58 -07:00
Sean Harvey
d807331a0f Merge pull request #101 from ajoneil/pages-cms-title
MINOR: Fix Pages title
2012-04-15 19:08:43 -07:00
Andrew O'Neil
4057956a8b MINOR: Use ajax to load reports 2012-04-16 11:17:55 +12:00
Andrew O'Neil
fb5f94860e MINOR: Fix Pages title 2012-04-16 11:00:48 +12:00
Ingo Schommer
020c8cd923 Merge branch 'yml-lang-file' 2012-04-15 20:55:46 +02:00
Ingo Schommer
d9e74084cf MINOR Removed empty language defynition 2012-04-15 20:54:51 +02:00
Ingo Schommer
ce1ed8ec56 MINOR Using SS locale notation for new YAML files (underscore instead of dashed) 2012-04-15 20:40:01 +02:00
Ingo Schommer
de258e82c2 MINOR Updated lang file based on new YML generation 2012-04-15 16:49:31 +02:00
Ingo Schommer
52e69dd1fd MINOR Removed usage of deprecated $priority argument for _t() 2012-04-15 16:49:31 +02:00
Ingo Schommer
2dc0e72c00 ENHANCEMENT Caching expensive CMSMain->SiteTreeHints() call on disk 2012-04-15 16:49:31 +02:00
Ingo Schommer
d9c4aa8583 MINOR Using new DataObject::fieldLabels() caching in SiteTree 2012-04-15 16:49:30 +02:00
Ingo Schommer
81d7d844db MINOR Removed legacy PHP translations 2012-04-15 16:49:30 +02:00
Ingo Schommer
169d125b90 MINOR Converted YML lang files 2012-04-15 16:49:30 +02:00
Ingo Schommer
88daa4f450 MINOR Updated translations from translate.silverstripe.org 2012-04-15 16:49:30 +02:00
Will Rossiter
4718f14ecc MINOR: look for framework version in framework path rather than CMS path 2012-04-15 14:56:45 +12:00
Simon Welsh
a0e320d9f2 API-CHANGE Update Readme to match renaming of sapphire to framework 2012-04-15 10:56:40 +12:00
Simon Welsh
c4e018928e API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:56:40 +12:00
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +12:00
Sean Harvey
dccde5f512 Merge pull request #100 from silverstripe/trac-6901
Trac #6901
2012-04-14 03:30:42 -07:00
Will Rossiter
d4750c2a96 MINOR: group ShowInMenus and ShowInSearch check boxes. Fixes #6901 2012-04-14 18:16:47 +12:00
Will Rossiter
8531525789 MINOR: remove $template var as sapphire/07d2d52 will pick this up automatically 2012-04-14 18:15:49 +12:00
Ingo Schommer
dc0168d01b MINOR Removed $params argument to DataObject->getCMSFields(), please use FormScaffolder directly (fixes #7135) 2012-04-13 15:55:32 +02:00
Ingo Schommer
b127419f76 MINOR HTML5 for BlankPage.ss default template 2012-04-13 15:34:14 +02:00
Will Rossiter
121e7d3784 Merge pull request #98 from silverstripe-big-o/breadcrumbs-tabs-overflow-Trac6882
ENHANCEMENT: Created include for back button. Fixes #6882
2012-04-12 22:51:27 -07:00
Jeremy Bridson
4443d0042a ENHANCEMENT:Trac 6882 - created include for back button and altered the templates accordingly 2012-04-13 16:05:48 +12:00
Ingo Schommer
e91d49036b MINOR Using loadPanel() rather than removed duplicate loadForm() method 2012-04-12 23:55:37 +02:00
Ingo Schommer
9b79827972 MINOR Decoupling dialog logic from tinymce_ssbuttons plugin to allow for lazy loaded dialogs 2012-04-12 22:26:04 +02:00
Ingo Schommer
f26d0bc158 MINOR Removed SideReportsForm JS logic, interface element no longer exists 2012-04-12 14:50:23 +02:00
Ingo Schommer
2592d62a4c Merge pull request #94 from silverstripe-big-o/report-fixes
ENHANCEMENT: replacing ReportAdmin report listing paginator with a new f...
2012-04-12 05:14:30 -07:00
Simon Welsh
517bf3198b API-CHANGE Move tinymce plugins in thirdparty 2012-04-12 20:49:43 +12:00
Julian Seidenberg
203bfc9e99 ENHANCEMENT: replacing ReportAdmin report listing paginator with a new footer GridField component 2012-04-12 16:13:24 +12:00
Sean Harvey
6b3d8904e3 BUGFIX Fixed broken test LeftAndMain caused by createTag being called
statically in AssetAdmin, when it shouldn't be
2012-04-12 13:04:01 +12:00
Sam Minnee
52710ebd93 MINOR: Added SHOW_DELETED_PAGES Polish translation. (#4407) 2012-04-12 12:43:11 +12:00
Sam Minnée
117b8c3f97 Merge pull request #93 from halkyon/e_strict_fixes
E_STRICT compliance fixes for CMS module
2012-04-11 16:30:46 -07:00
Sean Harvey
8325d73665 MINOR Fixing method signatures not compliant with the parent 2012-04-12 11:23:15 +12:00
Sean Harvey
5e567cbf80 BUGFIX Declare StaticPublisher::set_static_publisher_theme() and
StaticPublisher::static_publisher_theme() as static, since they're only
called statically. This is a fix for E_STRICT compliance.
2012-04-12 11:21:21 +12:00
Sean Harvey
74b341ee56 MINOR Fixed stray newline at the top of CMSMain 2012-04-12 09:46:26 +12:00
Mateusz Uzdowski
03a8aa546e BUGFIX Only load existing languages in custom TinyMCE plugins to avoid the tinymce_gzip.php logic stalling (fixes #7035) 2012-04-11 18:36:32 +02:00
Ingo Schommer
73a466c927 Merge branch 'integration' 2012-04-11 16:25:46 +02:00
Ingo Schommer
363dc9a4a9 MINOR Searching both Title and Filename in AssetAdmin (fixes #7013, see pull request #71) 2012-04-11 16:18:38 +02:00
Ingo Schommer
57d7655f80 Merge pull request #91 from silverstripe-big-o/silverstripe-cms
---

...the designs.

Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
2012-04-11 16:17:51 +02:00