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
2,395 Commits 31 Branches 527 Tags 162 MiB
56fbe55a47
Commit Graph

54 Commits

Author SHA1 Message Date
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
Ingo Schommer
7c0b69ea34 ENHANCEMENT Added javascript i18n support through Requirements::process_i18n_javascript() and ss.i18n javascript lib 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63566 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 00:46:07 +00:00
Ingo Schommer
3776311276 MINOR Documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62842 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-22 16:02:33 +00:00
Sam Minnee
76797cc5e1 Made all sapphire/thirdparty classes _manifest_exclude'd 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60874 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-17 01:08:10 +00:00
Sam Minnee
11ea5dd0c7 Fixed bug in Requirements::clear() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60563 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-13 00:01:07 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:51:33 +00:00
Sam Minnee
4258361337 API Change: Turned Requirements::clear_combined_files() into Requirements::delete_combined_files() and Requirements::clear_combined_files() 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60431 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 23:18:56 +00:00
Ingo Schommer
655802177c BUGFIX Added Requirements::path_for_file() to support external URLs in required paths (incl. unit test) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60415 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 07:22:50 +00:00
Ingo Schommer
f9a1118b64 FEATURE Added configurable Requirements::$write_js_to_body for performance improvements (turned off by default) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60396 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 05:29:41 +00:00
Ingo Schommer
624540a2d0 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60314 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 02:25:44 +00:00
Sam Minnee
a5ee9976f4 BUGFIX: [Grayzag] #2676 - Fixed rendering of partial templates, broken in r58354. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58556 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-21 11:59:24 +00:00
Ingo Schommer
4478228ff4 ENHANCEMENT Respecting $blocked in Requirements::$combine_files 
ENHANCEMENT Changed Requirements::$customHeader to array storage with uniquenessID
FEATURE Added Requirements::clear_combined_files()
ENHANCEMENT Extended unit test coverage for Requirements
MINOR Documentation in Requirements
MINOR Changed Requirements::$files_to_combine to Requirements::$combine_files

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58347 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-18 03:47:17 +00:00
Ingo Schommer
60a0a04c39 FEATURE Added Requirements::combine_files() to reduce HTTP requests by concatenating javascript and css files. Uses JSMin library to further minify the payload by default. 
Merged revisions 55913 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r55913 | gmunn | 2008-06-10 10:30:14 +1200 (Tue, 10 Jun 2008) | 1 line
  
  javascript combined files and google CDN implemented
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@58316 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-17 23:32:31 +00:00
Andrew O'Neil
4d616597ad Merged revisions 56253 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r56253 | sminnee | 2008-06-16 12:05:35 +1200 (Mon, 16 Jun 2008) | 1 line
  
  Reference javascripts with absolute URLs so that IE6 doesn't break on base tags in certain situations
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56912 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 04:02:07 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00
Ingo Schommer
067d2a5804 Merged revisions 49406 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r49406 | ischommer | 2008-02-12 12:10:06 +1300 (Tue, 12 Feb 2008) | 1 line
  
  checking for valid css media type
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52409 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-09 11:25:47 +00:00
Ingo Schommer
a4d9521c3f Merged revisions 51944 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r51944 | ischommer | 2008-04-01 15:43:14 +1300 (Tue, 01 Apr 2008) | 1 line
  
  ENHANCEMENT Using separate <script> tags for each customScript() requirements (necessary e.g. for google analytics inclusion)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52264 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-04-07 21:39:11 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 01:06:39 +00:00
Sam Minnee
b1d2e3906b API Documentation updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags 
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:37:50 +00:00