tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-16 22:46:20 +02:00
Code Issues Projects Releases Wiki Activity
12,526 Commits 30 Branches 526 Tags 154 MiB
7361d0a6ac
Commit Graph

916 Commits

Author SHA1 Message Date
Ingo Schommer
b56ca812dc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/security/MemberTest.php
 2013-10-23 14:53:29 +02:00
Ingo Schommer
55729dfc27 Removed deprecated log/email logic from Debug (fixes #2573) 
Was deprecated in 2009 with a682ab9c0e,
and removed in 2012 with 9eca2d676f
 2013-10-23 11:22:34 +02:00
Stephen Shkardoon
d2360ec8aa MINOR typo where display_errors wasn't checked properly 2013-10-23 22:00:05 +13:00
colymba
f89f203392 Raised minimum PHP Veresion to 5.3.3 2013-10-23 11:10:42 +03:00
Ingo Schommer
25b6175e67 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	forms/FormField.php
 2013-10-20 13:52:56 +02:00
Damian Mooyman
371ccca350 BUG Less misuse of error control operator (@) 
This is necessary to prevent get_last_error() from returning suppressed errors when retrieving values from nested arrays
 2013-10-18 14:30:51 +13:00
zauberfisch
48049647d8 formatted install.php5 according to SilverStripe coding conventions (spaces) 2013-10-16 21:17:22 +01:00
zauberfisch
0b4c3946ff formatted install.php5 according to SilverStripe coding conventions (tabs instead of spaces, no 1 line if with else, ...) 2013-10-16 21:11:06 +01:00
zauberfisch
c4810b8e0f changed install.php5 to respect line length limit according to SilverStripe coding conventions 2013-10-16 21:00:20 +01:00
zauberfisch
e357fa298e suggest that arg_separator.output to be &, if set to something else it may result in issues with url parameters 2013-10-16 20:37:15 +01:00
Ingo Schommer
c05b7c2c8f Installer regression from dd49834 2013-10-16 11:28:33 +02:00
Ingo Schommer
8727d1b1eb Merge remote-tracking branch 'origin/3.1' 2013-10-10 12:11:50 +02:00
Daniel Hensby
a8c9fffed4 Appending to debug.log file 
Until now debug.log files were loaded into memory, concatenated and then re-written to disk. This is an intensive operation on a large file.

I've added the `FILE_APPEND` flag to append to this file instead.
 2013-10-10 11:07:58 +01:00
Ingo Schommer
6e8ec778c3 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	lang/en.yml
 2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/install/install.php5
	docs/en/index.md
	tests/core/CoreTest.php
 2013-10-07 16:18:20 +02:00
Sean Harvey
dd49834b9e BUG Fixing installer not checking display_errors correctly. 
Fixes issue #2479. Installer sets display_errors on, but it checks
the changed value and not the original one set in php.ini.
 2013-10-04 10:05:28 +13:00
Ingo Schommer
a4c6ae3e90 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:33 +02:00
Ingo Schommer
4a3a88710f Merge remote-tracking branch 'origin/3.1.0' into 3.1 
Conflicts:
	dev/BehatFixtureFactory.php
	model/Hierarchy.php
	tests/behat/features/bootstrap/FeatureContext.php
	tests/core/CoreTest.php
 2013-08-22 13:00:25 +02:00
Ingo Schommer
40c239076b Merge remote-tracking branch 'origin/3.0' into 3.1.0 
Conflicts:
	model/Hierarchy.php
 2013-08-22 12:55:47 +02:00
Simon Welsh
c66cc952d2 Correct line length and indentation 2013-08-21 21:27:16 +12:00
Simon Welsh
151baeede1 Correct line length and indentation 2013-08-21 18:54:05 +12:00
Ingo Schommer
2a35f2f928 Merge remote-tracking branch 'origin/3.1' 2013-08-07 17:34:11 +02:00
Ingo Schommer
afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
 2013-08-07 17:14:47 +02:00
Ingo Schommer
c0f5007d57 Create folder if required in dev/generatesecuretoken 2013-08-07 16:59:18 +02:00
Ingo Schommer
b159284c6c Fixed "session started" error on install.php 2013-08-07 16:28:54 +02:00
Hamish Friedlander
2110493466 Merge branch '3.0' into 3.1 2013-08-07 09:43:52 +12:00
Hamish Friedlander
a685a8dee9 FIX Include flushtoken when install redirects to successfullyinstalled 2013-08-02 11:00:26 +12:00
Hamish Friedlander
0a79ac3592 Merge branch 'origin/3.1' 
Conflicts:
	templates/forms/CheckboxSetField.ss
	templates/forms/FormField_holder.ss
	templates/forms/OptionsetField.ss
 2013-07-19 16:25:38 +12:00
Ingo Schommer
bdbd61cb22 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-07-11 15:14:07 +02:00
Ingo Schommer
c2c8498c64 BehatFixtureFactory 5.3.8 compat (wrong usage of is_a()) 2013-07-11 15:13:37 +02:00
Simon Welsh
fbce9fd7cd Merge branch '3.1' 
Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js
 2013-07-05 10:22:58 +12:00
Ingo Schommer
474dde8012 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	docs/en/reference/grid-field.md
 2013-06-24 14:39:09 +02:00
Craig Weber
d8b106e6ee FIX: TestRunner was not cleaning up DB on failure 
When a unit test being run by PHPUnit encountered a fatal error,
TestRunner::tearDown was never being called. This resulted in tmpdb schemas
littering the database from failed test runs. This changeset fixes the issue
by registering TestRunner::tearDown as a shutdown function, so that it gets
called even in the event of a PHP Fatal Error.
 2013-06-24 01:15:09 +02:00
Ingo Schommer
94b4237372 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:33 +02:00
Ingo Schommer
0da70dafa4 Enforce 'dev' environment for test runs 
Otherwise tests like ControllerTest will fail because Deprecation notices
 2013-06-19 00:13:02 +02:00
Ingo Schommer
4ebd5ab740 Merge pull request #2057 from jthomerson/enhancement_3.1_do_not_run_abstract_test_cases 
ENHANCEMENT: Do not attempt to run abstract test classes
 2013-06-07 07:54:05 -07:00
Ingo Schommer
7791f20f49 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
 2013-06-05 15:17:06 +02:00
Ingo Schommer
f8b1c08c67 Behat: Copy fixture identifier to "Name" or "Title" by default 
This makes fixture setup less verbose, particularly for behat
tests (e.g. with "Given a page 'About Us'")
 2013-06-05 14:32:42 +02:00
Jeremy Thomerson
12cade8126 ENHANCEMENT: Do not attempt to run abstract test classes 
There is no reason to try to run test cases of a class that is abstract.  By
skipping them we allow developers to create abstract test case classes that
have test functions in them.  This is especially helpful when someone is
testing multiple implementations of the same service interface.  Most of their
tests can be in the abstract class, and then they can create concrete test
classes for each of their implementations and inherit all of the testing that
is built into the abstract class.
 2013-06-03 20:25:08 +00:00
Ingo Schommer
d5510f54b3 Merge pull request #2041 from Mark-M/patch-1 
FIX Deprecation $manifest not in global scope
 2013-06-03 00:30:26 -07:00
Ingo Schommer
88536998b9 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
 2013-05-31 18:08:59 +02:00
Ingo Schommer
5d97f615ce Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-31 17:52:24 +02:00
Mark-M
1a19e27bd0 FIX Deprecation $manifest not in global scope 
$manifest is not in the global scope, patched it to use SS_ClassLoader to get the manifest instead.
 2013-05-31 15:32:10 +02:00
Damian Mooyman
0ee79d43db BUG Fixed major issue with testing dataobjects that implement TestOnly and extend non-TestOnly dataobjects. Database regeneration would incorrectly populate the ClassName column 2013-05-27 16:39:57 +12:00
Simon Welsh
e90012787d Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1 
Conflicts:
	docs/en/changelogs/3.1.0.md
 2013-05-25 20:07:54 +12:00
Nightjar
5ec8158977 Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations 2013-05-25 20:03:36 +12:00
Sam Minnée
f6fbd78cd9 Merge pull request #1786 from colymba/3.0-htaccess-fix 
vendor folder is blocked only if outside themes
 2013-05-24 23:50:41 -07:00
Stephen Shkardoon
ab224a0e1c Fix return the member ID for logInWithPermission 
Will now return the ID, as per the doc-block comment
 2013-05-25 17:16:10 +12:00
Stephen Shkardoon
aa3699ff0a Deprecate magic_quotes and fix bad install opts 
Change the in_array call to not do bad things with strict casting off
Add a deprecated message if you run with magic_quotes on
Change the requirement for magic_quotes to an error
 2013-05-25 12:42:52 +12:00
Daniel Hensby
ac989cc3c0 Regression due to previous patch 
Fixing installer regression due to patch #1972
 2013-05-24 15:29:39 +01:00