tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity
1,018 Commits 31 Branches 527 Tags
Commit Graph

453 Commits

Author SHA1 Message Date
Sam Minnee
13547d82a1 ENHANCEMENT Added SetSize() method to Image class so that we can call it from the template 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@74212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:38 +13:00
Sam Minnee
205e64eaf1 Merged r73261 from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:38 +13:00
Sean Harvey
7adb9ce17d BUGFIX: Allow translation of front-end content into all languages, not just common ones (Merged from r64943) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73367 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:38 +13:00
Sean Harvey
8335201279 MINOR Added TODO item for an alternative approach at looking at Text->FirstParagraph (Merged from r64274) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73366 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:38 +13:00
Sean Harvey
8c2037a677 ENHANCEMENT Text->FirstParagraph?() now works for <div> containers in HTML, as you may not always have paragraph tags. 
MINOR Added phpDoc comments above Text->FirstParagraph?() to note down the assumptions made with this method.

(Merged from r64271)



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73365 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:38 +13:00
Sean Harvey
4a11206b3f BUGFIX Added missing action 'DeleteImageForm' to Image::$allowed_actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73319 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
8c98055d26 BUGFIX Added missing action 'EditImageForm' to Image::$allowed_actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73305 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
1eb4aecad7 BUGFIX Fixed too strict permission checking on Image::$allowed_actions. Replaced broken * permission check with explicit method names 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73302 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
b5302a0f9d BUGFIX Fixed array to string conversion caused by patch committed in r73272 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73298 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
e9217a7c1d BUGFIX Validating $_FILES in Image::loadUploadedImage() (Original patch was applied to Upload->validate() in trunk - r73254) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73295 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
4dbe5c60ee BUGFIX Using $allowed_actions in Image_Uploader (Merged from r73255) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73280 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
a4e1df6f7a BUGFIX Added isDev() and Permission::check() directives to DatabaseAdmin (Merged from r73251) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73273 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:37 +13:00
Sean Harvey
19ceaa905a BUGFIX Fixed Director::makeRelative() to accept https:// protocol 
BUGFIX Fixed GET-parameter replacement in Director::is_absolute_url()
ENHANCEMENT Added Director::is_relative_url() and Director::is_site_url()
BUGFIX Validating $_FILES array in Director::direct()

(Merged from r73250)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@73272 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:36 +13:00
Will Rossiter
a76f104af1 MINOR: notice level fix for undefined var in text field 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@72084 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:36 +13:00
Sam Minnee
3d302182b6 Merged db/build fix for auto_increment 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@67482 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:36 +13:00
Andrew O'Neil
903326869a Merged bugfixes from asfonz branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65261 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:35 +13:00
Sam Minnee
701ae9a4d9 BUGFIX: Don't allow calling of magically added methods via URL unless explicitly listed in allowed_actions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64988 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:35 +13:00
Normann Lou
0431518314 BUGFIX: Fixed HTTP/1.0 support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64722 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:35 +13:00
Andrew O'Neil
766ce65d0b MINOR: PHP notice fixes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64638 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:35 +13:00
Andrew O'Neil
4c73c41ca9 BUGFIX: Allow disabling of updateCMSFields() on SiteTree so subclasses that want decorators to have access to 
their added fields can call it themselves. 


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64634 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:34 +13:00
Andrew O'Neil
069c4464ad Add macron about native name of maori 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@64130 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:34 +13:00
Sean Harvey
000749a9d7 BUGFIX Revert r61631 for Translatable but kept SiteTree changes instact from that revision since they are still useful 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@61815 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:33 +13:00
Michael Andrewartha
0f615b7bc6 API CHANGE: Decorators on SiteTree can now define updateCMSActions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@61625 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:33 +13:00
Michael Andrewartha
3989cb9eee API CHANGE: Decorators on SiteTree can now define updateCMSActions 
BUGFIX: Don't show publish button when editing translatable page, as it is broken

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@61624 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:33 +13:00
Michael Andrewartha
8041948e65 merged from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@60651 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:39:33 +13:00
Josh Kosmala
a3274c9a31 Overwriting Date.php to output US Date format 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@59710 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:37:46 +13:00
Andrew O'Neil
9aaa4064ae BUGFIX #2504 - Fixed translation interface not working in CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@54465 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:46 +13:00
Will Rossiter
c063363b23 Don't mark a test site as being in dev mode if set_test_servers matches 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@53366 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:45 +13:00
Sam Minnee
4005bc6fc5 Made has_one, has_many, and many_many methods more reliable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@53068 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:44 +13:00
Sam Minnee
1ccaefaf16 Make double-redirects a warning rather than an error, since they are usually benign. 
Don't redirect from /home to / if you've already called a redirection.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@53059 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:43 +13:00
Sam Minnee
6edc1b6f99 Fixed ContentController where ->dataRecord is empty 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52712 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:43 +13:00
Sam Minnee
b3128b280f Don't strtolower ->action, as it had too many side-effects. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52445 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:43 +13:00
Sam Minnee
4ea643b2e2 #2387 - Fields specified in DataObjectDecor not saved in some cases 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52441 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:43 +13:00
Sam Minnee
cbd6d34b36 Fix to ManifestBuilder when running site on windows in a directory containing \r or \t or \n 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52391 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:42 +13:00
Ingo Schommer
13670979ac BUGFIX disable third party browscap by default (#2336) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52387 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:42 +13:00
Sam Minnee
38b489ce26 Show security id errors on test sites as well as dev 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52384 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:42 +13:00
Sam Minnee
f634ac7e58 Improved behaviour of contentcontrollerInit when extensions are applied to subclasses of SiteTree 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52343 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:41 +13:00
Sam Minnee
72eb00f4b1 #2314 - Fixed SQLMap implementation so that Group::map() returns appropriate data, and the group dropdown on the access tab works. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@52217 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:39 +13:00
Sam Minnee
e04de594af Make Object::hasMethod() and Object::__call() case-insensitive, and added tests for it 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@51455 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:38 +13:00
Sam Minnee
6dac7dfee2 Fixed HomepageForDomain behaviour when entering multiple domains 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@51429 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:38 +13:00
Ingo Schommer
ab92e9ef01 Merged revisions 50957 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/trunk

........
  r50957 | ischommer | 2008-03-12 22:34:27 +1300 (Wed, 12 Mar 2008) | 1 line
  
  #2283 Permissions are a bit broken - what happened to all the CMS permissions?
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50951 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:38 +13:00
Ingo Schommer
3e4cb5eea4 Merged revisions 50949 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/trunk

........
  r50949 | ischommer | 2008-03-12 22:21:49 +1300 (Wed, 12 Mar 2008) | 1 line
  
  FEATURE added hasDatabaseField()
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50943 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:37 +13:00
Sam Minnee
9d902aa8cd Merged revisions 50641,50645,50815 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk

........
  r50641 | mrickerby | 2008-03-06 14:21:47 +1300 (Thu, 06 Mar 2008) | 1 line
  
  fixing typo in parameter name $validate --> $validator
........
  r50645 | mrickerby | 2008-03-06 15:06:47 +1300 (Thu, 06 Mar 2008) | 1 line
  
  made $messageType parameter of Validator::validationError optional, and added API docs to explain what (apparently) is going on
........
  r50815 | mrickerby | 2008-03-11 10:48:13 +1300 (Tue, 11 Mar 2008) | 1 line
  
  fixing bug with in-memory child objects not having their parent ID field updated via the ->add() method
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50909 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:37 +13:00
Ingo Schommer
c1fc0bcaaa Merged revisions 50838 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/trunk

........
  r50838 | ischommer | 2008-03-11 13:39:44 +1300 (Tue, 11 Mar 2008) | 1 line
  
  fixed PHP notices
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50832 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00
Ingo Schommer
f70dfdcbaa documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50807 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00
Ingo Schommer
f369a2bb4d added $searchable_fields in preparation for a more generic search implementation, currently limited to Member.php and MemberTableField.php (mainly to fix bugs caused by r49774 and r47856) 
fixed weird indentation formatting in Member.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50798 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00
Sam Minnee
72a8fb3f03 Added 'anchor' option to link inserter 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50776 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00
Ingo Schommer
c5dd22d7d2 added database indexes for AuthorID and PublisherID 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50716 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00
Andrew O'Neil
a089e77a28 #2295 - DataObjectSets cannot be iterated over multiple times concurrently 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50676 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00
Sam Minnee
8cfb7bce21 #2277 - Fixed notice-level error on controllers that are direct subclasses of controller 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2@50345 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:34:36 +13:00