Commit Graph

74 Commits

Author SHA1 Message Date
Sean Harvey
63e8a02c92 MINOR Removed double slashes from path in Requirements_Backend::process_combined_files()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
5d47b22c44 BUGFIX Fixed filemtime() check in Requirements_Backend::process_combined_files() not getting the right path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
e078013547 MINOR Requirements_Backend::process_combined_files() only needs one location where the combined file is
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
59b4ab4550 BUGFIX Proper check for combined file path in Requirements_Backend::process_combined_files()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:49 +13:00
Sean Harvey
dd64c562cb ENHANCEMENT Stored combined files in assets/_combinedfiles by default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sean Harvey
84a7755e4e MINOR Removed Requirements:: static call and replace with instance
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100533 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sean Harvey
975e3b5a82 ENHANCEMENT #3387 Requirements now has a new static function called Requirements::set_combined_files_folder() for setting where the combined files should belong
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sean Harvey
ddf0f35d27 MINOR Removed end php tag for Requirements and RequirementsTest
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:47 +13:00
Sean Harvey
450c3cb408 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


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100513 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:47 +13:00
Will Rossiter
bff49f6fc4 BUGFIX: include customHeadScripts in clear rule.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:58 +13:00
Ingo Schommer
aa51b70188 MINOR Fixed capitalization of JSMin.php include (from r92870)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:17:52 +13: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
Hayden Smith
ac9eaa3c0d Removed time limit when minifying files and disabled processing of multiple files if on dev.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65709 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 21:15:58 +00:00
Sam Minnee
73a075a491 FEATURE #594: Added javascript-on-demand support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 04:31:33 +00:00
Sam Minnee
648a459060 Ensure that Requirements backend instance is preserved between tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65507 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:13:42 +00:00
Sam Minnee
429f81ed14 Bugfixes to Requirements alterations
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 02:24:31 +00:00
Sam Minnee
e6c4d32dbc ARCHITECTURE #3034 wakeless: Make Requirements mockable by pushing the meat of the functionality to Requirements_Backend
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65436 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-07 02:06:28 +00:00
Ingo Schommer
54234219d1 BUGFIX Only include i18n.js if javascript files are included - and to be safe, include the required prototype.js along with the library
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63698 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-07 00:27:46 +00:00
Ingo Schommer
1b6821e430 BUGFIX Automatically including sapphire/javascript/i18n.js in Requirements::process_i18n_javascript() to avoid errors when Requirements are manually overwritten
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-04 17:44:54 +00:00