tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
3,294 Commits 31 Branches 527 Tags 162 MiB
65c7894b26
Commit Graph

3294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
65c7894b26 MINOR Added jquery.cookie library to allow saving of last selected jQuery UI tab (from r92507) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93548 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:48 +13:00
Ingo Schommer
87689aa8e3 MINOR Moved jsparty/jquery/themes to sapphire/thirdparty/jquery-ui-themes 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93547 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:48 +13:00
Ingo Schommer
27abbbf4ff MINOR Moved jsparty/jquery/ui to sapphire/thirdparty/jquery-ui 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93546 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:46 +13:00
Ingo Schommer
2a1b6fec84 MINOR Moved jsparty/jquery/jquery.js to sapphire/thirdparty/jquery 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93544 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:43 +13:00
Ingo Schommer
70af168f6a MINOR Added sapphire/thirdparty/firebug-lite (from r92496) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93543 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:43 +13:00
Ingo Schommer
2093c7641c BUGFIX: applied patch from #4381. Observable doesnt play nice with jQuery (manual jsparty merge from r90857) (from r92571) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93542 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:43 +13:00
Ingo Schommer
1507151799 MINOR Added sapphire/thirdparty/behaviour (from r92497) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93541 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:43 +13:00
Ingo Schommer
20be1c03ec MINOR Added Zend_Log thirdparty dependency (merge from r84322) (merged from r92549) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93532 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:43 +13:00
Ingo Schommer
9478ca7622 MINOR Replaced sapphire/thirdparty/Zend external with piston-managed version (merged from r92492) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93530 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:43 +13:00
Ingo Schommer
85fa7441ca MINOR Added simpletest thirdparty library (previously included as an external) (merged from r92857) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93527 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:39 +13:00
Ingo Schommer
1b85594524 MINOR Re-added sapphire/thirdparty/spyc library 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93526 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:39 +13:00
Ingo Schommer
ff61020b20 MINOR Re-added sapphire/thirdparty/simplepie library 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93525 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:39 +13:00
Ingo Schommer
07d868851b MINOR Re-added sapphire/thirdparty/jsmin library 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93524 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:39 +13:00
Ingo Schommer
9183c02d07 MINOR Re-added sapphire/thirdparty/json dependency 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93521 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Andrew O'Neil
2c262c4d4b BUGFIX: Fix javascript error on IE8 by forcing IE7 compat mode. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93514 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Sean Harvey
2987a6a8e3 MINOR Update the main.php PHP version numbers at the top doc block 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93449 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Sean Harvey
f76acee01c BUGFIX Fixed dev/build not redirecting properly on first install of SS website on IIS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93259 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Sean Harvey
1bdba39dda BUGFIX Fixed newlines for Windows when logging errors in LogErrorFileFormatter 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93161 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Ingo Schommer
4452101790 API CHANGE Refactored hiding of Permissions added in r92428. Added PermissionCheckboxSetField?->setHiddenPermissions() (from r92865) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92878 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Normann Lou
65b1bc4839 APICHANGE: add the ability to remove some permissions specified by their code in the rendered field html of PermissionChecksetBoxField and full-covered unit tests of this ability. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92428 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Andrew O'Neil
e9e63a3bbd BUGFIX: Fix TreeDropdownFields throwing an exception. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92411 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Andrew O'Neil
ad52766d6b MINOR: Increase size of URL length to be lowest common denominator of maximum length in modern browsers. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92351 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Sean Harvey
71fb665ed3 BUGFIX Fixed newlines working properly across different platforms - Windows, for example, won't work properly with just \n so use PHP_EOL for a cross-platform solution 
MINOR Fixed appropriate failing tests to use PHP_EOL

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92220 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:38 +13:00
Sean Harvey
047b3deb41 MINOR Added ComplexTableField::setController() which makes testing useful for switching between controllers 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92134 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sean Harvey
c34ef6d562 BUGFIX More robust checks on the current member in Member::canEdit() and Member::canDelete() if there is no logged in member 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92129 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sam Minnee
00c8f9418c BUGFIX: Fixed regexp in anchor link rewriting 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@92077 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Tom Rix
bd7ae8282d MINOR added stubs to allow widgets to use treedropdown fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sean Harvey
797715ef78 BUGFIX Fixed Group::collateFamilyIDs() when working with MSSQL 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91775 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sam Minnee
f9c0ce652d BUGFIX: Include salt in legacy password encryptor (from r91743) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91746 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sam Minnee
45bbebe19f BUGFIX: Made use of new BasicAuth::protect_entire_site() consistent. (from r91658) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91659 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sam Minnee
ac239d6a0b BUGFIX: Don't enable site-wide protection by default (from r91609) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91613 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:37 +13:00
Sam Minnee
723d075ffd API CHANGE: Replaced BasicAuth::enable() with BasicAuth::protect_entire_site() 
API CHANGE: BasicAuth::requireLogin() no longer has an option to automatically log you in.  You can call logIn() on the object returned, instead. (from r91603)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91612 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
65c1c6fd20 NOTFORMERGE Fixed merge error from r91576 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91592 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
07fc3650a3 ENHANCEMENT Pluggable password encryption through PasswordEncryptor class (#3665) (merged from r90949) 
BUGFIX Fixed password hashing design flaw in Security::encrypt_password(). Removing base_convert() packing with unsafe precision, but retaining backwards compatibilty through pluggable encryptors: PasswordEncryptor_LegacyPHPHash (#3004) (merged from r90949)
API CHANGE Deprecated Security::encrypt_passwords() (merged from r90949)
API CHANGE Deprecated Security::$useSalt, use custom PasswordEncryptor implementation (merged from r90949)
API CHANGE Removed Security::get_encryption_algorithms() (merged from r90949)
API CHANGE MySQL-specific encyrption types 'password' and 'old_password' are no longer included by default. Use PasswordEncryptor_MySQLPassword and PasswordEncryptor_MySQLOldPassword
API CHANGE Built-in number of hashing algorithms has been reduced to 'none', 'md5', 'sha1'. Use PasswordEncryptor::register() and PasswordEncryptor_PHPHash to re-add others. (merged from r90949)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91576 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
2a1abcae2a BUGFIX Legacy password hash migration in MemberAuthenticator::authenticate() which fixes the precision problems mentioned in #3004 when a user logs in (from r90950) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91572 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
710f701645 MINOR Moved Security::encryptallpasswords() to EncryptAllPasswordsTask (merged from r90948) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91564 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Carlos Barberis
19bc05a9d8 BUGFIX: changed condition to display uploaded File 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91549 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Will Rossiter
137a67845c FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Luke Hudson
a2bff54f17 NOTFORMERGE revert accidental commit 91456 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Luke Hudson
4093933fb3 Add core to project before branching 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91456 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Sean Harvey
8b65a55b55 BUGFIX MigrateSiteTreeLinkingTask returns duplicate results from databases like MSSQL - remove any duplicates that may be around 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91418 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
8bb3797f04 MINOR BUGFIX Disabling security token in HtmlEditorField?->FlashForm?(), its not passed in by the ajax request (merged from r91392) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91394 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Tom Rix
8497ce85d8 MINOR merged in 91306 from trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91307 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Sean Harvey
5fc556867e MINOR Whitespace change 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91261 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
856a7f32ab MINOR reverted changes to i18nTextCollector, and updated documentation (merged from r91211) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Andrew O'Neil
e2a3cb2e20 BUGFIX: Return correct error when 404 page doesn't exist and page is not found. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91209 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
654af798ee MINOR removed concurrent editing (merged from r91198) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91204 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
88a8c04d9b BUGFIX Returning TRUE on Translatable->hasTranslation() if called on a record that is in the current locale (merged from r91032) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91156 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Sam Minnee
c9a6d3a1b0 API CHANGE: Added Lower and Upper methods to Varchar, Text, and Enum 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91048 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:34 +13:00
Sam Minnee
601430653a BUGFIX: Don't failover to standard value in ViewableData_Customised if the customised value is defined but isn't set. $obj->customise(array('Content'=>'')) should set Content to '' 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91047 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:34 +13:00