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
13,735 Commits 31 Branches 527 Tags 162 MiB
058a08f84f
Commit Graph

13735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
d474671d09 Merge branch 'pr/3570' into 3.1 2014-10-22 08:50:51 +13:00
Devlin
478edfa0c6 BUG Upload: File versioning with existing files 
reinsert oldFilePath = relativeFilePath in while loop
 2014-10-22 08:48:55 +13:00
Sean Harvey
93b84358c8 Merge pull request #3568 from tractorcow/pulls/3.1/fix-behat 
BUG Fix static call to protected instance method
 2014-10-21 11:23:23 +13:00
Damian Mooyman
49cb38dfc1 BUG Fix static call to protected instance method 2014-10-20 17:04:25 +13:00
Sean Harvey
dc919dc3d9 Merge pull request #3558 from kinglozzer/pulls/tagless-backends-fix 
FIX: Tag-less cache backends error on flush
 2014-10-16 11:55:55 +13:00
Sean Harvey
95963b19b8 Merge pull request #3559 from g4b0/patch-2 
Update versioning.md
 2014-10-16 11:54:46 +13:00
Sean Harvey
b7045344a8 Merge pull request #3560 from g4b0/patch-3 
Update fixtures.md
 2014-10-16 11:54:09 +13:00
Ingo Schommer
6bd7da9d33 Recompiled CSS with compass 1.0 
Minor syntactical changes, like alphabetical ordering of filters, uppercasing of hex colours. See http://compass-style.org/blog/2014/08/15/omg-compass-1-0/.
Shouldn't include any user-visible changes, but helps to avoid confusion with the next person trying to modify the CSS (Luke is currently struggling with that)
 2014-10-16 10:33:49 +13:00
Gabriele Brosulo
1770161550 Update fixtures.md 
syntax error
 2014-10-15 15:31:32 +02:00
Gabriele Brosulo
8a7a25edf5 Update versioning.md 
Removed parent::onAfterPublish(); because Page parents does not implement it. The old code generate this error:

Error at framework/core/Object.php line 761: Uncaught Exception: Object->__call(): the method 'onafterpublish' does not exist on 'MyPage' (http://ssdev-master.zk/admin/pages/edit/EditForm)
 2014-10-15 15:25:13 +02:00
Loz Calver
570f261302 FIX: Tag-less cache backends error on flush 2014-10-15 11:41:15 +01:00
Sam Minnée
73c52a6eeb Merge pull request #3539 from halkyon/hhvm_nginx_docs2 
Adding documentation for installing HHVM with nginx on Linux
 2014-10-15 18:14:00 +13:00
Sam Minnée
3d9fa205fe Merge pull request #3547 from kinglozzer/pulls/3546-apply-relation 
Fix DataQuery::applyRelation for multiple relations of the same class (fixes #3546)
 2014-10-15 18:00:19 +13:00
Sean Harvey
bd7f13b3cf Merge pull request #3537 from tractorcow/pulls/3.1/cms-login-dialog 
API Enable reauthentication within the CMS if a user session is lost
 2014-10-14 16:21:10 +13:00
Damian Mooyman
53c40a94fa API Enable re-authentication within the CMS if a user session is lost 
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
 2014-10-14 15:19:48 +13:00
Sean Harvey
afaeda32a1 Merge pull request #3549 from tractorcow/pr/3545 
API Tweak in SSViewer::flush
 2014-10-14 11:57:46 +13:00
Damian Mooyman
793784e9d7 BUG Fix flushing of SSViewer cache via testing 2014-10-14 09:47:05 +13:00
Loz Calver
c52e94e98e Fix DataQuery::applyRelation for multiple relations of the same class (fixes #3546) 2014-10-13 19:46:37 +01:00
Loz Calver
97170dd42d Better tests for SSViewer::flush & Flushable 2014-10-13 09:44:14 +01:00
Sean Harvey
f86b0bbca0 Merge pull request #3459 from jdemeschew/3356-fix-js-not-properly-included 
Fix #3356 js not properly included
 2014-10-13 16:41:37 +13:00
Sean Harvey
22bdc1e35b Merge pull request #3543 from spekulatius/patch-1 
Update permission.md
 2014-10-13 16:09:54 +13:00
spekulatius
450ccb9781 Update permission.md 
Throws warning without call of parent::init()
 2014-10-13 15:00:50 +13:00
Sean Harvey
07c8085e5d Merge pull request #3530 from kinglozzer/pulls/flush-invalidate-partial-cache 
FIX: Deliberately clear partial cache blocks on flush (fixes #1383)
 2014-10-11 09:46:56 +13:00
Sean Harvey
6cda801ec3 Adding documentation for installing HHVM with nginx on Linux 2014-10-10 15:00:21 +13:00
Loz Calver
48eb0e67e6 FIX: Deliberately clear partial cache blocks on flush (fixes #1383) 
Move property to top of class definition

Move property to top of class definition
 2014-10-09 21:44:01 +01:00
Sean Harvey
6bfbbdcb38 Merge pull request #3534 from jelicanin/3.1 
FIX: i18n support in LookupField
 2014-10-10 08:56:35 +13:00
Milan Jelicanin
bad9aa1a48 FIX: i18n support in LookupField 
Fixed i18n support in LookupField when value is empty (read-only complement of DropdownField)
 2014-10-09 17:43:29 +02:00
Sean Harvey
1e422eef0a Merge pull request #3531 from nhorstmeier/patch-1 
Update remove extra );
 2014-10-09 10:47:37 +13:00
muskie9
5f0dba5398 Update remove extra ); 2014-10-08 15:32:05 -05:00
Sean Harvey
b58d42f722 Merge pull request #3523 from michalkleiner/patch-1 
fixed anonymous function declaration
 2014-10-02 14:42:53 +13:00
Michal Kleiner
1c09d31719 fixed anonymous function declaration 
uses changed to use
 2014-10-02 11:51:23 +13:00
Sean Harvey
776f6976c9 BUG Text::BigSummary() fails with undefined $data when $plain = false 2014-10-01 16:02:28 +13:00
Sean Harvey
461481d56a Merge pull request #3517 from InfinityIo/fix/ConfigureFromEnv-typos 
Fixed typos in ConfigureFromEnv.php
 2014-09-30 17:10:54 +13:00
Nik
808878a2d4 Fixed typos in ConfigureFromEnv.php 2014-09-30 16:43:43 +13:00
Sean Harvey
c57c24eb81 Merge pull request #3464 from InfinityIo/rewrite_hash_links-SSTemplateParser-fix 
Fix over-eager rewrite_hash_links regexp in SSTemplateParser
 2014-09-26 18:14:08 +12:00
Nik
5258b84e5c Updated SSViewerTest to test for SSTemplateParser rewrite_hash_links fix 2014-09-26 17:41:27 +12:00
Sean Harvey
e37d9223ee Merge pull request #3509 from tractorcow/pr/3364 
Added tests that check comparisonClause()
 2014-09-26 12:28:12 +12:00
torleif
75ec0c4791 Added tests that check comparisonClause() 
AS requested by tractorcow: https://github.com/silverstripe/silverstripe-postgresql/pull/26

Tested on MySQL (succeeds as expected)  Tested on PostgreSQL (and fails as expected, but passes with patch). The fixes test only DataQueryTest related items for consistency, e.g. by avoiding DataObject calls.
 2014-09-26 12:11:33 +12:00
Sean Harvey
e3056ed831 Merge pull request #3486 from jeffreyguo/pulls/html-field 
Updated html field to support quotes
 2014-09-26 11:16:42 +12:00
Sean Harvey
f7af0d8955 Merge pull request #3398 from dnadesign/fixsortableheader 
API: Add ClassInfo::table_for_object_field to return the table name for ...
 2014-09-26 11:14:33 +12:00
Sean Harvey
c55e4fe7e2 Merge pull request #3475 from AntonyThorpe/PHPUnitDocs 
Update testing/index.md for clearer PHPUnit installation instructions
 2014-09-26 11:11:19 +12:00
Nicolaas
ea62bf9eed Adding link to UserVoice 2014-09-26 11:07:38 +12:00
Will Rossiter
61ec808604 Set $lock_out_after_incorrect_logins out of the box 2014-09-26 10:49:53 +12:00
Will Rossiter
920978df99 API: Add ClassInfo::table_for_object_field 
Returns the table name for a field in a class hierarchy.

This issue raised itself with GridFieldSortableHeader not supporting sorting on fields from parent class fields.
 2014-09-26 10:38:31 +12:00
Sean Harvey
2c25358828 Merge pull request #2866 from kinglozzer/2862-uploadfield-editform-height 
FIX: UploadField height calculation fix (fixes #2862 & #2863)
 2014-09-26 10:30:52 +12:00
Sean Harvey
a20813da9e Merge pull request #3508 from tractorcow/pulls/3.1/fix-unsavedrelationlist 
FIX use @param $colName in column call
 2014-09-26 09:53:31 +12:00
Gabrijel Gavranović
cf456d6625 FIX use @param $colName in column call 2014-09-26 09:18:29 +12:00
Sean Harvey
ee717c7f66 Merge pull request #3287 from IgorNadj/3.1 
ENH making /dev extendable
 2014-09-25 18:34:21 +12:00
Sean Harvey
409aebf0af Merge pull request #2515 from guttmann/html-text-absolutelink-placeholders 
HTMLText AbsoluteLink parse placeholders
 2014-09-25 16:07:41 +12:00
Will Rossiter
1d219aad7c Merge pull request #3506 from christopherdarling/patch-1 
DOCS: removed reference to deprecated :Negation filter
 2014-09-25 08:42:28 +12:00