Commit Graph

7 Commits

Author SHA1 Message Date
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Bart Visscher fe0f281b4f Fix setting ETag header on cache miss 2012-06-25 21:05:10 +02:00
Bart Visscher cae089df91 Cache: Create global cache in OC_Cache 2012-06-25 21:05:10 +02:00
Bart Visscher 2f00384b51 Use TemplateLayout functions for finding js and css files in minimizer 2012-06-18 15:40:48 +02:00
Bart Visscher 617de811f7 Cache the minimized output also on the server 2012-06-18 11:11:46 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Bart Visscher f71fec8cdc Combine and minimize core and default app css files 2012-05-16 18:53:46 +02:00