tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-07 20:09:31 +02:00
Code Issues Projects Releases Wiki Activity
14,944 Commits 29 Branches 517 Tags 147 MiB
89571d92d7
Commit Graph

14944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
89571d92d7 Merge pull request #4640 from memdev/fix-permission-undefined-var 
BUG: Permission::checkMember() use of undefined variable $codes
 2015-10-07 16:01:58 +13:00
Damian Mooyman
ac24c6aa99 Merge pull request #4662 from patricknelson/issue-3181-button-type 
FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press.
 2015-10-07 12:12:46 +13:00
Patrick Nelson
12c423909f FIX (partial) for #3181 where non-submit buttons are being activated on "enter" key press (relates to CMS issue at https://github.com/silverstripe/silverstripe-cms/issues/1288). 2015-10-06 15:03:49 -04:00
Damian Mooyman
3b192ea67c Merge pull request #4649 from cjsewell/3.1 
FIX: Typo in curr methods PHPDoc
 2015-10-05 16:14:47 +13:00
Corey Sewell
4a70ffea06 FIX: Typo in cur methods PHPDoc 2015-10-05 15:58:46 +13:00
Loz Calver
ab5aaf5afc Merge pull request #4630 from marcokernler/paginated-list-total-items 
Total Items of a Paginated List
 2015-10-01 09:19:26 +01:00
Manuel Teuber
5224fc460c FIX: Permission::checkMember() use of undefined variable $codes 2015-09-29 23:49:29 +02:00
Daniel Hensby
a964e7636e Merge pull request #4629 from stevie-mayhew/pulls/get-response-regression 
BUGFIX: fix response regression in initiation of request handler
 2015-09-25 12:20:31 +01:00
Marco Kernler
5c04dc5d67 ENHANCEMENT - Added new method to display the number of total items in a paginated list within templates 2015-09-25 09:03:04 +02:00
Stevie Mayhew
c0be44d238 BUGFIX: fix response regression in initiation of request handler 2015-09-25 09:11:25 +12:00
Loz Calver
1aa1d65932 Merge pull request #4610 from tractorcow/pulls/3/suppress-custom-theme 
Minor: Suppress custom themes in Formtest
 2015-09-24 16:17:11 +01:00
Damian Mooyman
0b5a57389b Merge pull request #4619 from ntd/pr2 
Allow to handle nested params in search context
 2015-09-24 12:37:49 +12:00
Nicola Fontana
c39cf2d55f Do not hang on nested parameters in search context 2015-09-23 09:12:02 +02:00
Damian Mooyman
d0fe105045 Merge pull request #4617 from spekulatius/readibility 
improve readability
 2015-09-21 08:37:11 +12:00
Peter Thaleikis
4c19c183fe improve readibility 2015-09-20 20:18:48 +12:00
Hamish Friedlander
a59a90c6b5 Merge pull request #4609 from tractorcow/pulls/3.1/fix-classinfo-breakage 
BUG Fix ClassInfo::table_for_object_field
 2015-09-17 14:45:17 +12:00
Damian Mooyman
e97b14ea65 Minor: Suppress custom themes in Formtest 2015-09-17 14:23:52 +12:00
Damian Mooyman
c9ba6e5d00 BUG Fix ClassInfo::table_for_object_field 2015-09-17 13:39:42 +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
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
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
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
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
Loz Calver
b87c2ae78d Merge pull request #4589 from johndalangin/patch-3 
Typo Correction
 2015-09-07 10:56:27 +01:00
johndalangin
1b661c9f17 Typo Correction 2015-09-07 17:08:49 +08:00
Loz Calver
50e798fb51 Merge pull request #4586 from camfindlay/patch-29 
DOCS fix to ensure 3.2.0 beta 1 content links work correctly
 2015-09-07 09:25:06 +01:00
Loz Calver
d0b53b5135 Merge pull request #4585 from javabrett/patch-1 
Update 02_Composer.md
 2015-09-07 09:23:08 +01:00