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
11,036 Commits 31 Branches 527 Tags 162 MiB
6eda25a090
Commit Graph

31 Commits

Author SHA1 Message Date
Ingo Schommer
f7400198d7 Merge pull request #1315 from dhensby/patch-4 
FIX Adding preview method to CsvBulkLoader
 2013-03-20 07:24:52 -07:00
Ingo Schommer
99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php
 2013-03-19 13:56:04 +01:00
Stephen Shkardoon
143317cc86 BUG SQL Injection in CsvBulkLoader (fixes #6227) 
Diff should speak for itself, looks like this will have to be implemented in all supported branches.
 2013-03-20 00:45:05 +13:00
Daniel Hensby
0d57f7b19a FIX processAll method respects $preview flag 
The preview flag is now respected more thoroughly to stop writing of related objects
 2013-03-19 11:23:58 +00:00
Daniel Hensby
3020576f08 FIX Adding preview method to CsvBulkLoader 
Currently the CsvBulkLoader doesn't implement the preview method even though it's processor function has the $preview flag.
 2013-03-19 11:05:10 +00:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Mateusz Uzdowski
5186a0cea3 BUGFIX: remove unnecessary setComponent call - no longer used (os6175) 2012-04-12 17:04:24 +12:00
Fred Condo
d370423825 Clean up trailing ?> per coding standard 
All sapphire but the lang directory
 2012-02-12 12:40:16 -08:00
Ingo Schommer
1225426e75 MINOR Fixed @package declarations 2011-03-29 18:07:58 +13:00
Ingo Schommer
3d901bb0cc MINOR Documentation in CSVBulkLoader 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@108048 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:40 +13:00
Sam Minnee
aa4503845f MINOR Documentation in CSVBulkLoader (from r108048) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112712 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-18 22:42:12 +00:00
Sam Minnee
c52f67aae5 MINOR ajshort: Replaced usage of the deprecated split() function with preg_split(). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79568 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-18 09:34:17 +00:00
Andrew O'Neil
635e2c3df6 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:44:11 +00:00
Sean Harvey
8989e89b4e ENHANCEMENT Allow setting unique check callback function on the importer class, to be consistency with relation callbacks 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71977 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-18 02:37:00 +00:00
Ingo Schommer
d26f08b481 MINOR merged branches/2.3 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-04 22:38:32 +00:00
Sam Minnee
a3d3fb65a9 Updated SQL queries to be ansi compatable 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66401 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 00:31:06 +00:00
Sam Minnee
2984355f43 Merged branches/2.3 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66395 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-22 03:33:00 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-18 01:48:37 +00:00
Saophalkun Ponlu
4bc5848734 API CHANGE: Updated CsvBulkLoader to have hasHeaderRow = true by default, even when a columnMap is specified 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64806 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-28 03:17:22 +00:00
Sam Minnee
cbc228f9a2 API CHANGE: Created CSVParser class and updated CSVBulkLoader to use it 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63563 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 00:27:58 +00:00
Ingo Schommer
0eff9f7e62 MINOR Reverted my email address with something more spambot safe from r63489 ;) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63530 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-02 10:29:41 +00:00
Sean Harvey
c5ed0c3c2e MINOR removed < and > characters from @author phpdoc token 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63492 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-02 00:38:53 +00:00
Sean Harvey
673ce66e90 MINOR Filled in Ingo's email for phpdoc since he failed to do it himself 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63489 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-02 00:34:04 +00:00
Ingo Schommer
57ef082a74 FEATURE Added BulkLoader_Result for better inspection of import results, replacing the simple numeric count result format. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62396 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-15 14:21:43 +00:00
Sam Minnee
d072e280e4 Merged branches/roa into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62321 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-12 04:49:15 +00:00
Sam Minnee
a29b53a31a MINOR: Remove commented out code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61702 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-28 05:09:21 +00:00
Sam Minnee
18fe7ccdaf Updated CSV bulk loader to import unix/windows files on a mac server 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61698 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-28 05:00:34 +00:00
Saophalkun Ponlu
f6754178d9 uncommmented processRecord that process each record because it was mistakenly commented previously 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61135 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-20 03:55:23 +00:00
Saophalkun Ponlu
727a1f52fc change the return type of processAll of CsvBulkLoader from DataObjectSet to int, the number of affected row 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61122 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-20 02:38:45 +00:00
Ingo Schommer
d1561b82aa MINOR Moved BulkLoader and CsvBulkLoader from sapphire/tools to sapphire/dev 
MINOR Removed sapphire/tools

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60398 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 05:36:54 +00:00