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,020 Commits 29 Branches 403 Tags 28 MiB
57d7655f80
Commit Graph

3020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeremy Bridson
778fd28877 BUGFIX:Trac #6854 / #7115 - aligned action buttons in filter panel with the designs. 2012-04-11 16:01:15 +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
Sean Harvey
8b44955c6e BUGFIX Removed double check of find_old_page() in ModelAsController 2012-04-11 14:51:33 +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
Wolf Vollprecht
a18b9bd85e ENHANCEMENT: Flyout menu to directly choose the pagetype one wants to add. 2012-04-09 21:08:15 +02:00
Ingo Schommer
4524d1c594 MINOR Fixed usage of deprecated Form->dataFieldByName() 2012-04-05 23:00:04 +02:00
Ingo Schommer
a6c586ae20 MINOR Using new PjaxResponseNegotiator in CMSMain 2012-04-05 22:27:47 +02:00
Ingo Schommer
3341a181c7 MINOR Using SS_HTTPRequest->isAjax() instead of deprecated RequestHandler API 2012-04-05 14:45:26 +02:00
Ingo Schommer
108ea1d0e6 Merge branch 'silverstripe-big-o-SSF-65' 2012-04-04 23:03:10 +02:00
Normann Lou
c1b248e2cf ENHANCEMENT SiteTree->getStatusFlags() which makes SiteTree->getTreeTitle() extensible 2012-04-04 23:02:53 +02:00
Ingo Schommer
de573e087d MINOR Using late static binding instead of Object::create() calls 2012-04-04 18:29:11 +02:00
Sean Harvey
070c9c22aa BUGFIX Removed used of deprecated Name() method in AssetAdmin 2012-04-04 12:05:38 +12:00
Stig Lindqvist
89bc4fa2ea Merge pull request #84 from halkyon/json_changes 
MINOR Fixed broken test from json changes
 2012-03-30 17:36:16 -07:00
Sean Harvey
ded3fd8d68 MINOR Fixed broken test from json changes 2012-03-30 16:25:21 +13:00
Ingo Schommer
651441225f Merge pull request #80 from halkyon/e_strict_support 
Fixes to method arguments in cms classes for E_STRICT support
 2012-03-28 02:48:17 -07:00
Ingo Schommer
a4f56b98d2 Merge pull request #81 from halkyon/e_deprecated_fixes 
Remove use of deprecated ereg_replace() and use preg_replace()
 2012-03-28 02:47:09 -07:00
Ingo Schommer
e55d8bc5d6 Merge branch 'integration-merge27march' 2012-03-27 18:07:58 +02:00
jbridson
c6bfd0ae42 MINOR:changed the heading 'add pages' to add page trac #7026 2012-03-27 14:57:39 +02:00
Normann Lou
1311ba2720 BUGFIX: Empty error message on renaming a page and confirming url is changed accordingly (trac ticket 7068) 2012-03-27 14:57:39 +02:00
jbridson
9bb3104253 BUGFIX:fixed padding issues with navigation tabs on Asset Admin 2012-03-27 14:57:39 +02:00
jbridson
ddcf979fb5 BUGFIX:Trac Ticket #7015 - removed unnecessary scrollbars from files and images filter and increased height of search field to accommodate the dropdown. 2012-03-27 14:57:39 +02:00
jbridson
bdb832ef4a BUGFIX:SSF-30 - Fixed dropdown cutoff in all browsers. 2012-03-27 14:57:39 +02:00
Ingo Schommer
1827dc6727 API CHANGE Removed SiteTree->HomepageForDomain and related functionality ($write_homepage_map and generate_homepage_domain_map()), use new 'homepagefordomain' module instead (fixes #6902) 2012-03-27 14:50:09 +02:00
Ingo Schommer
c6b259e856 MINOR Redirect to page edit view after rolling back to a specific version in CMSPageHistoryController (fixes #6912) 2012-03-27 14:50:09 +02:00
Sean Harvey
1ab76865ea MINOR Remove use of deprecated ereg_replace() and use preg_replace() instead. 2012-03-27 22:52:33 +13:00
Ingo Schommer
1c2ccaecb1 Merge pull request #78 from halkyon/uploadfile_allowed_extensions 
ENHANCEMENT Indicate which file extensions are allowed to be uploaded
 2012-03-27 02:30:51 -07:00
Sean Harvey
0ea9451014 MINOR Fixes to method arguments in cms classes for E_STRICT support. 2012-03-27 21:42:54 +13:00
Sean Harvey
7c9a1304a5 ENHANCEMENT Sort extension names by alphabetical order in CMSFileAddController::getEditForm() 
ENHANCEMENT Ensure _t() used for "Allowed extensions" english text.
 2012-03-27 13:45:43 +13:00
Sean Harvey
9e54124145 ENHANCEMENT Indicate which file extensions are allowed to be uploaded when choosing a file to upload. 2012-03-27 10:18:05 +13:00
Sean Harvey
8166c26a8f MINOR Fixed grammar in "Foldername" popup when adding a folder in 
AssetAdmin. Should be "Folder name".
 2012-03-27 09:57:29 +13:00
Sean Harvey
10f030de67 BUGFIX When adding a top level folder in AssetAdmin, ensure you are 
taken back to the top level folder view. Currently there is a non-object
error adding a root level folder.
 2012-03-27 09:54:47 +13:00
Ingo Schommer
f2f45d62e7 Merge pull request #76 from sminnee/prevent-widget-error 
BUGFIX: Prevent JS errors when widget area is loaded (note: doesn't actually fix it fully yet)
 2012-03-26 06:25:59 -07:00
Sam Minnee
42b7ab1930 BUGFIX: Prevent JS errors when widget area is loaded (note: doesn't actually fix it fully yet) 2012-03-24 16:38:34 +13:00
Will Rossiter
a39231f952 MINOR: add icon to ajax button in AssetAdmin 2012-03-24 14:30:10 +13:00
Sam Minnée
66123a2b67 Merge pull request #74 from mattgunn/patch-1 
Prevents notice error when parent page isn't set
 2012-03-23 18:08:06 -07:00
Matt Gunn
4e9cbe0771 Prevents notice error when parent page isn't set 2012-03-24 13:56:05 +13:00
Sean Harvey
ecee3cc772 Merge pull request #73 from simonwelsh/cms_dir 
MINOR Move definition of CMS_DIR and CMS_PATH into cms/_config.php
 2012-03-23 16:15:26 -07:00