tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-06 19:39:39 +02:00
Code Issues Projects Releases Wiki Activity
15,249 Commits 29 Branches 517 Tags 147 MiB
0675b1d82f
Commit Graph

15249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
aada7a7334 Merge pull request #4716 from dm-0/patch-1 
Update 01_Code.md
 2015-10-29 12:13:34 +13:00
scott1702
9f9d0089df Send user to new area when inserting url 2015-10-29 11:37:59 +13:00
Damian Mooyman
1303fc5ff3 Merge pull request #4717 from chillu/pulls/3.2/fix-inlineformaction 
BUG Fix broken InlineFormAction
 2015-10-29 11:11:36 +13:00
Damian Mooyman
db16248b9a BUG Fix broken InlineFormAction 2015-10-29 10:48:49 +13:00
Damian Kissick
0197b46001 Update 01_Code.md 
Corrected 'submiting' spelling
 2015-10-28 21:28:45 +13:00
Damian Mooyman
82f2f63a01 Merge pull request #4714 from mparkhill/patch-1 
Fix broken link to DataObject api
 2015-10-28 12:00:41 +13:00
Michael Parkhill
e44f22c6b2 Fix broken link to DataObject api 2015-10-28 11:52:35 +13:00
Damian Mooyman
bf966a78ab Merge pull request #4713 from patricknelson/issue-4712-image-doc 
FIX for #4712: Dropping in some PHP documentation on return types for dynamically generated image methods.
 2015-10-28 11:51:40 +13:00
Patrick Nelson
293d84721e FIX for #4712: Dropping in some PHP documentation on return types for dynamically generated image methods. 2015-10-27 18:42:03 -04:00
Damian Mooyman
7710edf412 Merge pull request #4707 from chillu/pulls/revert-formfield-extrafields 
Revert FormField->extraClass() inclusion of disabled/readonly
 2015-10-27 10:12:43 +13:00
Will Rossiter
267ec9bb97 Merge pull request #4706 from christopherdarling/patch-4 
DOCS: correct config setting for custom editor.css
 2015-10-27 09:16:46 +13:00
Ingo Schommer
b5c10fd27d Revert FormField->extraClass() inclusion of disabled/readonly 
Introduced in d1ea74e40d, but too high risk in terms of causing
CSS or JS side effects when implemented on a FormField level.
 2015-10-27 08:15:27 +13:00
Christopher Darling
a1e343629b DOCS: correct config setting for custom editor.css 
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
 2015-10-26 11:02:47 +00:00
Loz Calver
417bccfe8d Merge pull request #4698 from SpiritLevel/patch-2 
DOCS : spelling
 2015-10-23 09:11:25 +01:00
scott1702
1f64631bfc Update asset admin toolbar 2015-10-23 17:39:42 +13:00
Ingo Schommer
ecacf52863 Merge pull request #4697 from open-sausages/features/dbfile-uploadfield 
New AssetField for uploading to a DBFile database field
 2015-10-23 17:20:55 +13:00
Damian Mooyman
d1ea74e40d API Implement AssetField to edit DBFile fields 2015-10-23 16:57:44 +13:00
Ingo Schommer
1ec5f0e0a1 Merge pull request #4699 from open-sausages/features/dbfile-generated-files 
API Restore JS Minification
 2015-10-23 16:51:56 +13:00
Damian Mooyman
3e7eecf978 API Remove SQLQuery 2015-10-23 16:26:04 +13:00
Damian Mooyman
e17a49f8a5 API Restore JS Minification 
BUG Fix incorrect cache on CacheGeneratedAssetHandler
 2015-10-23 14:14:38 +13:00
David Alexander
e88032a7aa DOCS : spelling 2015-10-23 13:49:03 +13:00
Ingo Schommer
f252cfad20 Merge pull request #4680 from open-sausages/features/dbfile-generated-files 
API Generated files API
 2015-10-23 13:19:56 +13:00
Damian Mooyman
fe3d23f0d4 BUG Fix GeneratedAssetHandler crashing on expired resources 2015-10-23 11:46:58 +13:00
Damian Mooyman
f9892c628c API Generated files API 
API Refactor Requirements_Backend to use new APL
 2015-10-23 10:07:48 +13:00
Loz Calver
b960a3e1f8 Merge pull request #4694 from open-sausages/pulls/php-5.5-min 
Increase minimum required PHP version to 5.5
 2015-10-22 11:27:25 +01:00
Ingo Schommer
7d17068062 Increase minimum required PHP version to 5.5 
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
 2015-10-22 23:11:16 +13:00
Damian Mooyman
6ff29065b3 Merge pull request #4688 from camfindlay/patch-31 
DOCS Module standard 1.0
 2015-10-21 09:01:35 +13:00
Damian Mooyman
cd12ce584a Merge pull request #4690 from camfindlay/patch-32 
FIX only use sethasemptydefault if exists.
 2015-10-20 16:04:46 +13:00
Cam Findlay
c3641587a5 FIX only use sethasemptydefault if exists. 
Backport of #4672 with a slight rewrite incase of subclasses of the field.
 2015-10-20 12:39:04 +13:00
Damian Mooyman
bfc4d06c1d Merge pull request #4591 from kinglozzer/symfony-yaml 
Load YAML component via composer, remove Spyc
 2015-10-20 09:10:42 +13:00
Loz Calver
977642daa9 Remove Spyc YAML library 
Also had to fix some fixture files - none of the YAML spec versions actually support tabs anyway
 2015-10-19 17:07:34 +01:00
Loz Calver
c303c6354b Update YAML component, load via composer 2015-10-19 17:06:25 +01:00
Loz Calver
1167802b79 Merge pull request #4687 from chillu/pulls/4.0/monolog-warning-constant 
Fix Monolog constant use
 2015-10-19 11:56:59 +01:00
Cam Findlay
a555817d6f DOCS Module standard 1.0 
Adding the module standard to 3.2+ docs.
 2015-10-19 11:44:31 +13:00
Ingo Schommer
c8a0347b78 Fix Monolog constant use 
Changed from WARN to WARNING in 1.0
594ed9cdcb,
looks like it was just a typo on our part (given the change happened in 2011)
 2015-10-19 08:58:22 +13:00
Damian Mooyman
f5f2861dc5 Merge pull request #4684 from dhensby/pulls/multiline-enum 
Allow multi-line enum declarations
 2015-10-16 09:45:34 +13:00
Daniel Hensby
1974e79d71 Allow multi-line enum declarations 2015-10-15 16:23:19 +01:00
Sam Minnée
43b19f2d23 Merge pull request #4682 from open-sausages/features/dbfile-file 
BUG Fix regressions in fulltextsearch
 2015-10-15 11:58:34 +01:00
Damian Mooyman
27a8afe78b BUG Fix regressions in fulltextsearch 2015-10-15 16:33:32 +13:00
Ingo Schommer
d52f28a9d7 Merge pull request #4679 from open-sausages/pulls/4.0/dbfile-file-dataobject 
BUG Fix file link tracking for new asset abstraction
 2015-10-15 15:56:22 +13:00
Damian Mooyman
d884c859d1 BUG Fix file link tracking for new asset abstraction 2015-10-15 12:15:00 +13:00
Damian Mooyman
193fc9e469 Merge pull request #4675 from kinglozzer/pulls/checktable 
Only notify users about PDO native mode once
 2015-10-15 11:18:05 +13:00
Loz Calver
862429e5d7 Only notify users about PDO native mode once 2015-10-14 09:53:51 +01:00
Ingo Schommer
f8f4ed03b6 Merge pull request #4652 from open-sausages/pulls/4.0/dbfile-file-dataobject 
API Implementation of RFC-1 Asset Abstraction (DataObject Refactoring)
 2015-10-14 15:51:34 +13:00
Damian Mooyman
be239896d3 API Refactor of File / Folder to use DBFile 
API Remove filesystem sync
API to handle file manipulations
 2015-10-13 11:57:39 +13:00
Ingo Schommer
421d1b53b0 Merge pull request #4674 from ss23/parentidfix 
Fix page reordering bug with ParentID
 2015-10-13 11:35:52 +13:00
Stephen Shkardoon
6030854725 Fix page reordering bug with ParentID 
If you are viewing PageA in the CMS, but move PageB into PageC,
the edit form will recieve an edit form ParentID of PageC.
This is incorrect, as only PageB had it's ParentID change.
 2015-10-12 20:10:48 +13:00
Daniel Hensby
592140364c Merge pull request #4673 from patricknelson/issue-4392-cache-headers-3.2 
FIX #4392: Ensure headers are checked first before being clobbered by globally maintained state.
 2015-10-12 00:11:19 +01:00
Damian Mooyman
cc4d92e91a Merge remote-tracking branch 'origin/3.2.0' into 3.2 2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568 Added 3.2.0 changelog 2015-10-12 08:44:34 +13:00