Commit graph

4696 commits

Author SHA1 Message Date
Bart Visscher
6d3ae575b6 Remove $DOCUMENTROOT, not used 2012-06-16 00:11:36 +02:00
Robin Appelman
03951ccc6b fix encryption proxy for updated filecache 2012-06-15 23:11:55 +02:00
Robin Appelman
19bfe21401 add binary test case for encryption 2012-06-15 23:11:33 +02:00
Robin Appelman
cb833e45c2 get rid of php4 style constructors in mdb2 2012-06-15 21:59:40 +02:00
Bart Visscher
e11c5a23d5 Optimize WebDav access by preloading dav custom properties 2012-06-15 21:21:42 +02:00
Bart Visscher
e905b14758 Spelling fix 2012-06-15 21:21:42 +02:00
Bart Visscher
463a506fcb Fix webdav property name compare 2012-06-15 21:21:42 +02:00
Bart Visscher
27efdbd58f Use setter for FileinfoCache 2012-06-15 21:21:42 +02:00
Robin Appelman
f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Robin Appelman
a9a424a519 also add hasUpdated to oc_filesystem and oc_filesystemview 2012-06-15 17:42:39 +02:00
Robin Appelman
449760f665 add hasUpdated to oc_filestorage 2012-06-15 16:43:24 +02:00
Bjoern Schiessle
6ca87656be Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-15 16:14:31 +02:00
Bart Visscher
400769ab40 Optimize WebDav access using OC_FileCache 2012-06-15 16:04:07 +02:00
Thomas Tanghus
8f6121ffa8 Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:57:04 +02:00
Bjoern Schiessle
3ddaedee3b fixed xss vulnerability 2012-06-15 15:51:06 +02:00
Bart Visscher
2b228fba34 Load app before running update script 2012-06-15 11:18:44 +02:00
Bart Visscher
0d3f5f736f Disable minizing when DEBUG is true 2012-06-15 11:18:44 +02:00
Bjoern Schiessle
4b7bdd5ace Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
Conflicts:
	apps/gallery/templates/index.php
2012-06-15 09:51:04 +02:00
Thomas Tanghus
effb6f1309 Update stylesheet for type=url. 2012-06-15 04:32:01 +02:00
Thomas Tanghus
8a68d09b0f Use type=url for URL field. 2012-06-15 04:32:01 +02:00
Michael Gapczynski
92083aa20c Fix upload for Google Drive; Google Documents List API documentation was misleading 2012-06-14 20:57:08 -04:00
Thomas Tanghus
f6aa366857 Make sure there is a calendar after delete. 2012-06-15 02:10:55 +02:00
Thomas Tanghus
3c75ac5f62 Update calendar after delete. 2012-06-15 02:07:32 +02:00
Thomas Tanghus
ad8c4ab182 Only create new calendar when there are none. Fix oc-1007. 2012-06-15 01:55:02 +02:00
Thomas Tanghus
ad32c20300 Agree on argument type (cleaned this time). 2012-06-15 01:51:26 +02:00
Thomas Tanghus
6d43e6565e Revert "Agree on argument type."
This reverts commit 0f6b1be0e6.
2012-06-15 00:53:13 +02:00
Thomas Tanghus
0f6b1be0e6 Agree on argument type. 2012-06-15 00:50:42 +02:00
Thomas Tanghus
1e76a530ea No need to find calendar twice. 2012-06-15 00:28:12 +02:00
Thomas Tanghus
31db583f03 Make events show again. 2012-06-15 00:26:34 +02:00
Thomas Tanghus
96a3e28c2e Cleanup code. 2012-06-14 23:05:31 +02:00
Thomas Tanghus
27ab6daeb0 If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier... 2012-06-14 23:05:31 +02:00
Michael Gapczynski
f3b30e4658 Forgot $ sign for variable 2012-06-14 15:14:01 -04:00
Michael Gapczynski
f7e686d4f1 Revert "Fix a counting mistake"
This reverts commit c20abfef38.
2012-06-14 15:05:20 -04:00
Thomas Mueller
ec69377ade first load compatibility.js 2012-06-14 21:00:19 +02:00
Thomas Mueller
4cc9bf09be fix javascript error 2012-06-14 20:55:36 +02:00
Stephan Bergemann
4eb0c270aa fixed handling of fallback_images 2012-06-14 19:38:43 +02:00
Arthur Schiwon
12bfc551fb reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:31:38 +02:00
Michael Gapczynski
6e15b231b0 Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-14 12:27:30 -04:00
Thomas Tanghus
47c03a0eff Contacts: Fixes for CSRF. 2012-06-14 18:13:01 +02:00
Thomas Tanghus
f0b87bc421 Make requesttoken global. 2012-06-14 18:13:01 +02:00
Stephan Bergemann
a3afd51b94 fixed one issue with last directory in structure having a lot of
subdirectories and finally some pictures
2012-06-14 18:02:07 +02:00
Bjoern Schiessle
fa67927eb5 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory
Conflicts:
	apps/gallery/templates/index.php
2012-06-14 17:08:52 +02:00
Bjoern Schiessle
6468e0a1d5 fixed bug #996: first picture in folder is repeated in the last position behaving like a directory 2012-06-14 15:14:36 +02:00
Bjoern Schiessle
d28a4f0638 prevent xss attacks also if some javascript ends up in the alt-tag 2012-06-14 14:17:30 +02:00
Bjoern Schiessle
87855f2506 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-14 13:44:42 +02:00
Bjoern Schiessle
211a546600 fixed xss vulnerability in un-packed version of jquery.fancybox and repack it 2012-06-14 13:41:39 +02:00
Thomas Tanghus
8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02:00
Thomas Tanghus
a34db3fbe0 Don't add slash if it's there already. 2012-06-14 13:23:12 +02:00
Thomas Tanghus
756eb3548f Use the right csrf token. 2012-06-14 13:23:12 +02:00
Bjoern Schiessle
b0ecef02e9 debugging output removed 2012-06-14 13:17:06 +02:00