tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
3,078 Commits 29 Branches 403 Tags 28 MiB
dccde5f512
Commit Graph

3078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ingo Schommer
bacbb8a8d0 Merge pull request #89 from halkyon/modelascontroller_fix 
BUGFIX Removed double check of find_old_page() in ModelAsController
 2012-04-11 06:41:40 -07:00
Ingo Schommer
59366769ae Merge pull request #92 from ajoneil/estrict 
MINOR: Fix E_STRICT warnings
 2012-04-11 06:38:47 -07:00
Stig Lindqvist
587de186d0 Merge pull request #90 from halkyon/redirectorpage_changes 
BUGFIX Adding RedirectorPage.js to cms module (was in sapphire) and swapping out old behaviour.js usage
 2012-04-11 04:10:01 -07:00
Ingo Schommer
69e819a417 BUGFIX Moved 'rollback' logic back from CMSPageHistoryController to CMSMain (used in edit mode as well), removed unnecessary performRollback(), and introduced PJAX response handling to ensure the edit view is loaded correctly regardless of context (edit or history mode) (fixes #7108) 2012-04-11 10:19:54 +02:00
Ingo Schommer
39208d15e0 MINOR i18n for revert confirmation messages, improved wording 2012-04-11 10:19:54 +02:00
Sam Minnee
ca4e8e1bdb BUGFIX: Fixed sort order of files and images GridField 2012-04-11 18:13:45 +12:00
Andrew O'Neil
12b30ff538 MINOR: Fix E_STRICT warnings 2012-04-11 18:09:11 +12:00
Normann Lou
81cc214f66 BUGFIX SSF-124 remove one of the duplicated 'Any' options which also cause that search on the second 'Any' broke. 2012-04-11 17:43:46 +12:00
Normann Lou
35da0e9b46 BUGFIX SS-124 SearchForm clear button fixed 2012-04-11 17:37:28 +12:00
Normann Lou
bfb99aea6c MINOR SSF-124 move the trunk of html code (commented out) to the position of the third tab so if it is commented in someday, it wont break the default selected tab. 2012-04-11 17:21:24 +12:00
Jeremy Bridson
778fd28877 BUGFIX:Trac #6854 / #7115 - aligned action buttons in filter panel with the designs. 2012-04-11 16:01:15 +12:00
Normann Lou
1cf2e2ca12 MINOR SSF-124 added missing ";" for keep SilverStripe Code Convention 2012-04-11 15:53:04 +12:00
Sam Minnee
7213d2b7dc MINOR: Clarified meaning of SiteTree:: 2012-04-11 15:48:17 +12:00
Sean Harvey
240627b504 BUGFIX Adding RedirectorPage.js to cms module (was in sapphire) and 
fixing to use entwine/jquery instead of old behaviour
 2012-04-11 15:32:41 +12:00
Normann Lou
afdac50ef1 MINOR SSF-124 correct inline document for a newly added routine. 2012-04-11 15:08:39 +12:00
Normann Lou
653625914d ENHANCEMENT SSF-124 make tab select pages list view if the current url is 'listchildren' otherwise use the default action defined in TabSet.js 2012-04-11 15:01:31 +12:00
Sean Harvey
8b44955c6e BUGFIX Removed double check of find_old_page() in ModelAsController 2012-04-11 14:51:33 +12:00
Normann Lou
7900da4d9d MINOR SSF-168 add Pagination to the report list so it show the bottom bar 2012-04-11 12:44:11 +12:00
Normann Lou
c7aa3e1f98 Merge branch 'integration' of github.com:silverstripe-big-o/silverstripe-cms into integration 2012-04-11 12:19:26 +12:00
Normann Lou
7c44e95287 BUGFIX SSF-124 the $filterOn pass-as-reference variable name should be consist with where its value is altered so as the variable is correctly assigned 
MINOR SSF-124 correct inline document
 2012-04-11 12:18:58 +12:00
Normann Lou
6218aaef82 BUGFIX SSF-124 the $filterOn pass-as-reference variable name should be consist with where its value is altered so as the variable is correctly assigned 2012-04-11 12:16:23 +12:00
Normann Lou
3d0566638a BUGFIX: SSF-124 filter on a value only if this value is not an empty string 2012-04-11 12:12:57 +12:00
Ingo Schommer
bc4208097f Merge pull request #87 from halkyon/advancedsearchform_removal 
API CHANGE Removed AdvancedSearchForm, extend SearchForm for custom adva...
 2012-04-10 03:39:59 -07:00
Ingo Schommer
44f2b88bd4 Merge pull request #86 from halkyon/deprecated_fixes 
MINOR Fixing deprecated ereg functions with preg in SideReport and Widget
 2012-04-10 03:38:38 -07:00
Sean Harvey
55bbda3a39 API CHANGE Removed AdvancedSearchForm, extend SearchForm for custom advanced search functionality instead. 2012-04-10 22:35:15 +12:00
Ingo Schommer
f021b9eec1 BUGFIX Writing version in SiteTree->doRestoreToStage, regression from 9451993d (fixes #7107) 2012-04-10 12:27:08 +02:00
Sean Harvey
d914ee0f2c MINOR Fixing ereg functions with preg in SideReport and Widget 2012-04-10 22:16:17 +12:00
Normann Lou
bfb81fb89f BUGFIX SSF-124 fix issue that listchildren links for third level pages lost default ajax event bind 2012-04-10 16:21:26 +12:00