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
15,071 Commits 31 Branches 527 Tags 162 MiB
1f632a10c9
Commit Graph

15071 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
1f632a10c9 BUG Replace direct reference to $_REQUEST['url'] with request object getter 2015-09-29 12:10:39 +13:00
Damian Mooyman
3e8237b17e Merge pull request #4638 from scott1702/update-changelog 
Update changelog to include removal of CMSFileAddController
 2015-09-29 11:00:07 +13:00
scott1702
33f181f72a Update changelog to include removal of CMSFileAddController 
Fix error in drag/drop functionality
 2015-09-29 09:58:01 +13:00
Damian Mooyman
914f06c2dd Merge pull request #4623 from open-sausages/pulls/move-addfile-ui 
Moved upload files page to main files area
 2015-09-28 13:38:16 +13:00
scott1702
3f85c57013 Move 'upload new file' section to main files area 
Optimise and fix drag drop on upload fields

Combine 3 tabs from the 'insert media' dialog box into 1
 2015-09-28 12:02:33 +13:00
Loz Calver
23bd11dd91 Merge pull request #4582 from tractorcow/pulls/4.0/showqueries-params 
API showqueries=1 now shows parameters
 2015-09-24 16:27:16 +01:00
Sam Minnée
9fdd8f43db Merge pull request #4627 from tractorcow/pulls/4.0/trait-autoloading 
API Support trait loading
 2015-09-24 15:02:14 +12:00
Sam Minnée
709ca2e2f5 Merge pull request #4599 from open-sausages/features/dbfile 
API Implementation of RFC-1 Asset Abstraction
 2015-09-24 14:41:42 +12:00
Damian Mooyman
ac27836d2b API Implementation of RFC-1 Asset Abstraction 2015-09-24 12:57:28 +12:00
Damian Mooyman
f26c220d86 API Support trait loading 2015-09-24 11:57:45 +12:00
Ingo Schommer
7156718219 Merge pull request #4590 from tractorcow/pulls/4.0/make-compositedbfield-useful 
API Refactor CompositeDBField into an abstract class
 2015-09-22 11:11:30 +12:00
Damian Mooyman
10dece653f API Consolidate DataObject db methods 
BUG Fix namespace and getField on composite fields
 2015-09-22 10:38:12 +12:00
Damian Mooyman
9872fbef4d API Refactor CompositeDBField into an abstract class 
API Refactor ClassName into DBClassName
API Update PolymorphicForeignKey to use new CompositeDBField and DBClassName

CompositeDBField is now an interface to nested fields on an underlying dataobject, allowing field manipulation to be performed at the field and dataobject level without having to synchronise them manually.
 2015-09-22 10:28:07 +12:00
Damian Mooyman
43430e27cf Merge pull request #4607 from nickspiel/master 
Changed extractTags from protected to public
 2015-09-17 14:07:33 +12:00
Nick Spiel
970345b086 Changed extractTags from protected to public 2015-09-16 18:02:51 +10:00
Damian Mooyman
a0ad723cb5 Merge pull request #4603 from patricknelson/issue-freshen-log-api 
API (minor): Freshening up SS_Log API documentation...
 2015-09-16 14:31:14 +12:00
Damian Mooyman
34b71cf6c8 Merge remote-tracking branch 'origin/3' 2015-09-15 13:42:17 +12:00
Damian Mooyman
71b8aec306 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-15 13:35:51 +12:00
Damian Mooyman
c4710b2272 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/GroupImportForm.php
	admin/code/MemberImportForm.php
	tests/model/DataListTest.php
 2015-09-15 13:18:47 +12:00
Damian Mooyman
3c617e4dd0 Merge pull request #4587 from scott1702/split-view 
Disable split view mode when not enough room to show preview
 2015-09-15 12:14:52 +12:00
Damian Mooyman
8ddb4c7ffe Merge remote-tracking branch 'origin/3.1.14' into 3.1 2015-09-15 11:07:14 +12:00
Damian Mooyman
00caeb700d Added 3.1.14 changelog 
Update translations
 2015-09-15 10:58:15 +12:00
scott1702
48c48d703d Disable split view mode when not enough room 2015-09-15 10:28:37 +12:00
Damian Mooyman
8c99659e3f Merge pull request #4563 from assertchris/split-bulk-loader-imports-to-reduce-memory-consumption 
Splitting BulkLoader imports to reduce memory consumption
 2015-09-15 10:22:45 +12:00
Christopher Pitt
1c5089f7fc Splitting BulkLoader imports to reduce memory consumption 2015-09-15 10:06:06 +12:00
Patrick Nelson
051c69ba32 API (minor): Freshening up SS_Log API documentation and removed $extras param which was not being used anyway. 2015-09-14 11:00:19 -04:00
Damian Mooyman
b7f3095098 Merge pull request #4602 from SpiritLevel/patch-2 
FIX: #103 in silverstripe-installer
 2015-09-14 15:06:36 +12:00
David Alexander
81ca74bc30 FIX: #103 
See also #58
 2015-09-14 13:41:32 +12:00
Damian Mooyman
7e76f769b1 Merge pull request #4600 from patricknelson/issue-4597-gridfieldconfig-injector 
FIX for #4597: Ensuring GridFieldConfig_RelationEditor is instantiated via Injector, not via "new" keyword.
 2015-09-14 10:14:05 +12:00
Patrick Nelson
5cc0878dc1 FIX for #4597: Ensuring GridFieldConfig_RelationEditor is instantiated via Injector, not via "new" keyword. 2015-09-11 17:57:13 -04:00
Damian Mooyman
ee639deedb API showqueries=1 now shows parameters 2015-09-11 16:59:18 +12:00
Damian Mooyman
6699f65b3f Merge pull request #4594 from kinglozzer/uploadfield-attach-nonexistent 
FIX: UploadField error when attempting to attach non-existent file IDs
 2015-09-11 16:33:42 +12:00
Damian Mooyman
2d182cba26 Merge pull request #4598 from scott1702/3 
fix gridfield overflow
 2015-09-11 12:07:23 +12:00
scott1702
37e0f55124 fix gridfield overflow 2015-09-11 11:22:30 +12:00
Ingo Schommer
f935f2f25e Merge pull request #3 from silverstripe-security/fixes/ss-2015-020 
[ss-2015-020]: Prevent possible Privilege escalation
 2015-09-10 16:51:13 +12:00
Damian Mooyman
7367cf54c4 [ss-2015-020]: Prevent possible Privilege escalation 2015-09-10 13:01:24 +12:00
Damian Mooyman
45b22c788e BUG Fix missing framework/admin/tests 2015-09-10 11:06:15 +12:00
Loz Calver
06cc18526a FIX: UploadField error when attempting to attach non-existent file IDs 2015-09-09 09:24:56 +01:00
Damian Mooyman
143e4eae5f Fix travis php version back to 5.4 2015-09-09 17:46:42 +12:00
Damian Mooyman
812b5ecb62 Fix merge regressions 2015-09-09 16:18:39 +12:00
Damian Mooyman
13e1f52b37 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-09 16:14:28 +12:00
Damian Mooyman
6ad277c412 Fix merge regressions 2015-09-09 16:12:12 +12:00
Damian Mooyman
b552a7370f Merge remote-tracking branch 'origin/3' 
Conflicts:
	tests/model/ImageTest.php
 2015-09-09 15:44:47 +12:00
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
 2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
 2015-09-09 14:35:29 +12:00
Ingo Schommer
4c73721bab Merge pull request #1 from silverstripe-security/fixes/ss-2015-016 
[ss-2015-016]: Fix XSS in install.php
 2015-09-09 09:48:56 +12:00
Daniel Hensby
00385792c5 Merge pull request #4588 from tractorcow/fix/3.1/admin-tests 
BUG Fix missing framework/admin/tests
 2015-09-08 09:57:53 +01:00
Christopher Pitt
751d77386c Merge pull request #2 from silverstripe-security/fixes/ss-2015-015 
[ss-2015-015]: Fix insecure returnURL in DatabaseAdmin
 2015-09-08 10:53:59 +12:00
Damian Mooyman
d8fd64c3e2 [ss-2015-016]: Fix XSS in install.php 2015-09-08 10:08:28 +12:00
Damian Mooyman
7192932022 [ss-2015-015]: Fix insecure returnURL in DatabaseAdmin 2015-09-08 09:48:09 +12:00