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
4,659 Commits 31 Branches 527 Tags 162 MiB
7d96dcd02b
Commit Graph

81 Commits

Author SHA1 Message Date
Ingo Schommer
25a0c3e7fb ENHANCEMENT: in referencing a file in combine_files() it should fall back to standard requirement tags if combining has been disabled eg dev mode (from r107091) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112549 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 03:09:15 +00:00
Ingo Schommer
ad84f07af0 BUGFIX Checking for the same combined filename in Requirements::combine_files() to avoid irrelevant error messages (from r106225) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 03:01:03 +00:00
Ingo Schommer
9c68b954fd BUGFIX More specific regex in Requirements->includeInHTML() to avoid duplicating information by matching HTML5-style <header> tags instead of <head> (fixes #5640) (from r105667) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112500 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:49:52 +00:00
Ingo Schommer
2943c75156 MINOR Using ASSETS_DIR and THEMES_DIR constant in Image, ManifestBuilder, Requirements, File (fixes #5619) (from r105282) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112493 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:37:41 +00:00
Sam Minnee
2e66aff365 BUGFIX: Fixed file-write testing issues in requirements combined file generation (from r100982) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111556 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:28:48 +00:00
Sam Minnee
dd44a010cf BUGFIX: Don't make CMS loading slow if the combined javascript files can't be written. (from r100979) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111554 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:28:02 +00:00
Ingo Schommer
0dd37f0da9 MINOR Removed double slashes from path in Requirements_Backend::process_combined_files() (from r100618) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105608 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:19:00 +00:00
Ingo Schommer
f3ce3e1e85 BUGFIX Fixed filemtime() check in Requirements_Backend::process_combined_files() not getting the right path (from r100616) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105607 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:18:48 +00:00
Ingo Schommer
3ac0edc117 MINOR Requirements_Backend::process_combined_files() only needs one location where the combined file is (from r100615) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105606 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:18:29 +00:00
Ingo Schommer
86e799f008 BUGFIX Proper check for combined file path in Requirements_Backend::process_combined_files() (from r100614) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105605 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:18:14 +00:00
Ingo Schommer
94801d75ff ENHANCEMENT Stored combined files in assets/_combinedfiles by default (from r100536) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105600 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:17:05 +00:00
Ingo Schommer
656eccc7a4 MINOR Removed Requirements:: static call and replace with instance (from r100533) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105598 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:16:33 +00:00
Ingo Schommer
9a438d26b0 ENHANCEMENT #3387 Requirements now has a new static function called Requirements::set_combined_files_folder() for setting where the combined files should belong (from r100528) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105596 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:15:43 +00:00
Ingo Schommer
7d8ac7662b MINOR Removed end php tag for Requirements and RequirementsTest (from r100514) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105591 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:14:00 +00:00
Ingo Schommer
9c03cc7fe1 API CHANGE Refactored Requirements to use Requirements_Backend at all times - this makes testing far easier. Thanks tobych! 
MINOR Updated RequirementsTest to test Requirements_Backend instead of global statics (from r100513)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105590 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:13:45 +00:00
Ingo Schommer
6460d09570 MINOR Fixed phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@103385 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-23 00:11:41 +00:00
Sean Harvey
395f87f545 BUGFIX: include customHeadScripts in clear rule. (from r94437) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95614 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-12-16 05:41:38 +00:00
Ingo Schommer
af41180177 MINOR Fixed capitalization of JSMin.php include 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92870 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 05:58:32 +00:00
Ingo Schommer
a11db29672 MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92502 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:29:59 +00:00
Andrew Short
79773042be API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog. 
MINOR: Replaced usage of renamed classes with the new namespaced name.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90075 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-26 03:06:31 +00:00
Sean Harvey
0617ab65c0 Merged in Requirements::combine_files() fix from branches/2.3 - r83048 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86684 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-18 03:15:25 +00:00
Sam Minnee
38349122d6 BUGFIX: Removed deprecated (and slower) eregi_replace 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@84164 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-08-11 08:54:57 +00:00
Sam Minnee
73cfe3ab84 API CHANGE: Added increase_time_limit_to(), which respects safe_mode. 
API CHANGE: Added no-arg option to increase_memory_limit_to()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80241 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-28 02:36:46 +00:00
Sean Harvey
161e7a35c7 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77020 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-17 23:15:31 +00:00
Sean Harvey
be8f29c5e9 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76915 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-15 00:11:25 +00:00
Sean Harvey
b20b6e0f95 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76269 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-06 06:36:16 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Sean Harvey
76b5adc979 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75579 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-28 23:52:15 +00:00
Sean Harvey
ec9765d9f2 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75572 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-28 23:40:35 +00:00
Sam Minnee
8fcdcfa2eb BUGFIX: Don't load SapphireTest unnecessarily, as this is a slow operation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75147 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-27 00:19:16 +00:00
Ingo Schommer
496ada9c9d BUGFIX Fixed wrong reference in RequirementsBackend::unblock_all() (see #3587) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73749 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-29 01:31:44 +00:00
Ingo Schommer
b12a00c391 MINOR phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-22 22:59:14 +00:00
Sam Minnee
08a5a7c387 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72803 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-10 22:08:52 +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
Ingo Schommer
2e8a572875 BUGFIX Requirements were ignored if only CSS requirements were present due to bug in Requirements::includeInHTML() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72374 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-03 02:26:36 +00:00
Sean Harvey
a1f21fe5ec MINOR Code formatting fixes in Requirements_Backend 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71906 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-16 21:10:03 +00:00
Sean Harvey
5012fcb3ca BUGFIX Fix errors if empty array passed for vars in Requirements_Backend::javascriptTemplate() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71905 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-16 21:08:54 +00:00
Ingo Schommer
023e733b16 BUGFIX Fixed wrong condition in Requirements::includeInHTML() which failed to process requirements if only customCSS() was used 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-08 19:06:15 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Andrew O'Neil
3d2d79987b BUGFIX: CustomHeadTags requirements were being incorrectly cleared. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69255 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-16 21:52:56 +00:00
Sam Minnee
eeeaa2603a Merged Requirements fix from nestedurls branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@68917 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-15 01:49:06 +00:00
Sam Minnee
5d4a84d575 Bugfixes for recent staticpublisher imports 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@68912 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-15 01:45:13 +00:00
Sam Minnee
a8dca3908e Static caching merges from dnc branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@68900 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-15 01:30:41 +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
40906bc408 BUGFIX: Fixed typo in Requirements 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66860 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-27 22:34:37 +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
Sean Harvey
0d5f7d2197 BUGFIX Missing variable in some circumstances caused Requirements::include_in_response() to break 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65763 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-13 01:39:30 +00:00
Sean Harvey
b23dad6c88 BUGFIX Missing variable in some circumstances caused Requirements::include_in_response() to break 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65761 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-13 01:31:31 +00:00
Sam Minnee
7c2861b0f4 BUGFIX: Added support for CSS media types to CSS on demand 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65711 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-12 21:44:35 +00:00