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,091 Commits 31 Branches 527 Tags 162 MiB
c303c6354b
Commit Graph

15091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Damian Mooyman
88fe25a5d1 Merge pull request #4668 from scott1702/font-icons 
Add 'thumbnails' font-icon
 2015-10-08 10:38:22 +13:00
scott1702
4f72b5cfb6 Add thumbnails font-icon 2015-10-08 10:22:14 +13:00
Damian Mooyman
d6f3115276 Merge pull request #4656 from spekulatius/fixing-phpdoc-blocks 
fixing phpdoc blocks to refering to Objects to built-in types of PHP
 2015-10-07 16:00:24 +13:00
Damian Mooyman
c724d551a1 Merge pull request #4657 from spekulatius/adding-space-before-casting 
adding a space before casting into a different type
 2015-10-07 16:00:04 +13:00
Damian Mooyman
254c5297d0 Merge pull request #4658 from spekulatius/remove-trailing-spaces 
remove trailing spaces in the codebase
 2015-10-07 12:20:35 +13:00
Peter Thaleikis
6ef03d29bb removing a bunch of trailing spaces in the source code 2015-10-06 18:31:58 +13:00
Peter Thaleikis
7d5b4dedd1 adding a space before casting into a different type 2015-10-06 18:28:08 +13:00
Peter Thaleikis
c13dfc2fa0 fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-10-06 18:28:04 +13:00
Damian Mooyman
ffed9a5ac2 Merge pull request #4645 from scott1702/insert-media 
Sticky footer on insert media/link elements
 2015-10-01 15:51:07 +13:00
scott1702
23baa288ba Sticky footer on insert media/link elements 2015-10-01 15:35:56 +13:00
Sam Minnée
32e343d668 Merge pull request #4639 from tractorcow/pulls/4.0/fix-controller-url 
BUG Replace direct reference to $_REQUEST['url'] with request object getter
 2015-09-29 12:55:53 +13:00
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