Commit graph

4667 commits

Author SHA1 Message Date
Robin Appelman
a3c1f70be4 dont show config option for file upload size if we cant write the new value 2012-06-06 00:24:15 +02:00
Robin Appelman
549889d3cb update l10n script to better read js files 2012-06-06 00:11:45 +02:00
Robin Appelman
e6c4e53486 prevent creating files with a / the name 2012-06-06 00:02:51 +02:00
Michael Gapczynski
3ce6344d40 Supress any warnings if log file does not exist 2012-06-05 17:44:07 -04:00
Bart Visscher
fc56a668ce Add OC_Cache implementation for APC 2012-06-05 23:19:28 +02:00
Bart Visscher
86961b6445 Skip test for XCache when the module is not there 2012-06-05 23:10:51 +02:00
Bart Visscher
ab788eaa23 OC_Cache_File ttl=0 indicates forever, but expire in a day to keep the cache clean 2012-06-05 23:09:49 +02:00
Bart Visscher
9984c2a593 Spelling fixes in XCache files 2012-06-05 23:07:11 +02:00
Thomas Tanghus
20aee83d07 Use UID for cache key. 2012-06-05 21:20:10 +02:00
Robin Appelman
86ddf386d9 add TTL tests for OC_Cache 2012-06-05 20:59:52 +02:00
Robin Appelman
f6298cb74f add hasKey for XCache backend 2012-06-05 20:54:07 +02:00
Thomas Tanghus
cb941996c0 Contacts: Use OC_Cache for contact photo handling instead of temp dir. 2012-06-05 20:34:12 +02:00
Thomas Tanghus
098beae751 Added hasKey() method to OC_Cache. 2012-06-05 20:34:12 +02:00
Thomas Tanghus
9dbb07b806 Added data() method to OC_Image to return raw image data. 2012-06-05 20:31:15 +02:00
Robin Appelman
301a14dcd6 add XCache backend and testcases for OC_Cache 2012-06-05 19:58:30 +02:00
Robin Appelman
e11bf460e0 add OC_Cache::clear 2012-06-05 19:57:49 +02:00
Robin Appelman
10eef49c3c return null when a cache variable is not set 2012-06-05 19:33:15 +02:00
Robin Appelman
dcf1eed816 add unique instance id 2012-06-05 19:32:48 +02:00
Bart Visscher
eed0450351 Fix remap dir for CSS minimizer 2012-06-05 18:09:32 +02:00
Bart Visscher
9d936976a9 Make check for writable apps dir configurable 2012-06-05 17:51:52 +02:00
Bart Visscher
57326ea1f8 Move setting remote_core.* to after setup of OC, also check if it is not set yet 2012-06-05 17:51:52 +02:00
Bjoern Schiessle
0d1a07d4ae show pictures in folder with special characters, e.g. '+' 2012-06-05 16:36:05 +02:00
Bjoern Schiessle
edecc5bca3 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 15:29:59 +02:00
Frank Karlitschek
ae91557748 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 15:26:51 +02:00
Frank Karlitschek
e747fd794e fix login for hosts running on port 80 2012-06-05 15:26:31 +02:00
Thomas Tanghus
6c4231b3d3 Per user quota didn't show in FF (and possibly IE) http://forum.owncloud.org/viewtopic.php?f=4&t=2716&p=5373#p5324. 2012-06-05 14:17:38 +02:00
Arthur Schiwon
7621559d00 make groups not static, fixes oc-919 2012-06-05 14:02:13 +02:00
Frank Karlitschek
80fc01388a Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 12:52:44 +02:00
Frank Karlitschek
e3031ae28b more reliable host detection for reverse proxy servers 2012-06-05 12:52:23 +02:00
Bjoern Schiessle
061abb88b5 write a warning to the log file if .htaccess is not writable instead of failing silently 2012-06-05 11:50:21 +02:00
Bjoern Schiessle
d71c4db10a xss vulnerability fixed 2012-06-05 10:46:28 +02:00
Bjoern Schiessle
564b0358f9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 10:38:42 +02:00
Bjoern Schiessle
dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +02:00
Thomas Tanghus
d194132b6f Contacts: Cache standard photo less aggressively 2012-06-05 10:32:26 +02:00
Frank Karlitschek
7e931575b4 comment out non working code 2012-06-05 09:28:51 +02:00
Bart Visscher
7e017253f5 Load apps before minimizing the core css and js 2012-06-04 23:17:50 +02:00
Bart Visscher
64f6534f51 Tasks: styling fixes 2012-06-04 23:04:31 +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
786325a4bb Fix newline in code 2012-06-04 22:24:17 +02:00
Bart Visscher
091b343d5c Calendar & Contacts: Store import progress in OC_Cache
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Arthur Schiwon
dfc90021ca load authentication apps before checking wether user exists. fixes oc-910 2012-06-04 21:40:32 +02:00
Arthur Schiwon
b0d83d6d8d make it possible to load apps seperately. needed to fix oc-910 without breaking oc-863 2012-06-04 21:40:18 +02:00
Tom Needham
cf85a1e264 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-04 18:43:22 +00:00
Tom Needham
55e88120cd Validate email on save 2012-06-04 18:42:25 +00:00
Michael Gapczynski
adc200c1f3 Hide app page link for internal apps, fixes bug oc-913 2012-06-04 14:26:30 -04:00
Bjoern Schiessle
6d70f42dd4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-04 18:04:29 +02:00
Bjoern Schiessle
c6a1d9491b don't allow user to delete Shared dir via webdav and sync client (bug #774) 2012-06-04 18:03:16 +02:00
Robin Appelman
59086fe082 update file paths in filecache when the parent is renamed 2012-06-04 17:59:42 +02:00
Bjoern Schiessle
f291a843bf prevent xss attacks by manipulating image file names 2012-06-04 16:22:25 +02:00
Bjoern Schiessle
1d6ca084a6 prevent xss attacks by manipulating text file names 2012-06-04 16:20:03 +02:00