mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,033 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

5033 Commits

Author SHA1 Message Date
Brice Maron 95b5202893 Correct usage of approot 2012-06-21 21:13:12 +00:00
Michael Gapczynski bf6abdde2d Add missing ')' 2012-06-21 12:26:06 -04:00
Brice Maron a5938e4e37 Merge branch 'master' into multi_app_dir 2012-06-21 20:19:31 +00:00
Thomas Tanghus 37d12144c2 Fix URL delimiter. 2012-06-21 22:03:57 +02:00
Thomas Tanghus ad7154b344 Fix being able to link directly to contact, that I broke in other commit. 2012-06-21 22:02:17 +02:00
Brice Maron 84b9ac2678 Correct writable check for app dir 2012-06-21 19:35:34 +00:00
Brice Maron d22f805b63 Correct inclusion paths 2012-06-21 19:19:39 +00:00
Thomas Tanghus b17bf59ced Only search for VEVENTs. 2012-06-21 20:51:23 +02:00
Bart Visscher b17e682609 Tasks: Add delete action 2012-06-21 19:49:28 +02:00
Bart Visscher 10351550cd Tasks: Use list label for ordering by list 2012-06-21 19:49:28 +02:00
Bart Visscher b9e3b0ddf9 Tasks: Fix position of the summary input 2012-06-21 19:49:28 +02:00
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
 2012-06-21 17:15:35 +00:00
Sam Tuke a9a913c273 Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic) 
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
 2012-06-21 18:15:22 +01:00
Robin Appelman 49033ff8e0 dont change the encryption key during the test case 2012-06-21 18:53:10 +02:00
Robin Appelman 6707e4187e only use 1 fsview when initializing encryption 2012-06-21 18:35:12 +02:00
Robin Appelman 56de98ed8c fix saved file size for uploaded files 2012-06-21 18:22:18 +02:00
Robin Appelman d0455c5819 truncate decrypted files based on filelength 2012-06-21 17:38:00 +02:00
Bjoern Schiessle 1338279ca0 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 16:42:16 +02:00
Georg Ehrke 49d9eb7acf fix calendar 2012-06-21 16:24:05 +02:00
Sam Tuke 7c3f6f61db Fixed missing jQuery event object - expire interface now works with Firefox 2012-06-21 14:54:24 +01:00
Georg Ehrke f5740a6f92 fix a PHP Notice 2012-06-21 15:20:15 +02:00
Frank Karlitschek e95055b2bd check if the data directory is accessible via http. Show a big security warning if yes 2012-06-21 14:07:04 +02:00
Bjoern Schiessle 34739b7ec5 use new sanitizeHTML() function 2012-06-21 13:57:18 +02:00
Bjoern Schiessle 09d2f76727 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 11:51:50 +02:00
Bjoern Schiessle 2f9763d216 check if user is allowed to edit bookmarks 2012-06-21 11:50:51 +02:00
Georg Ehrke 1db2539223 make edit event form work with DateTime Property UTC 2012-06-21 11:35:20 +02:00
Bjoern Schiessle 8870d36776 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-21 10:29:08 +02:00
Bjoern Schiessle cd005e6c62 use new sanitizeHTML() function 2012-06-21 10:28:43 +02:00
Georg Ehrke 96d0b9834a fix mimetype for cdr files - bugfix for oc 559 2012-06-21 09:58:38 +02:00
Bjoern Schiessle f8ec280b6e correct presentation of HTML encoded characters 2012-06-21 09:44:20 +02:00
Michael Gapczynski cc3835d657 Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache 
Conflicts:

	lib/fileproxy/quota.php
 2012-06-20 19:39:17 -04:00
Bart Visscher fedfa4c98e DateTime objects are directly comparable 2012-06-20 21:38:56 +02:00
Bart Visscher a6dc7345d0 Gallery: Move code/js/css from main template to the right place 2012-06-20 21:28:37 +02:00
Thomas Tanghus 10a0d5a46c More changes for updating the contacts list. 2012-06-20 21:00:49 +02:00
Thomas Tanghus dc8c188ffe Better error checking. 2012-06-20 21:00:49 +02:00
Thomas Tanghus 426ed27be2 Make sure address books are shown even if empty. 2012-06-20 21:00:49 +02:00
Thomas Tanghus 0f1fe0b505 Log error as ERROR. 2012-06-20 21:00:49 +02:00
Georg Ehrke 0f13cbb47d Merge branch 'master' into calendar_repeat 2012-06-20 20:14:08 +02:00
Arthur Schiwon f255ac8b3a make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:03:25 +02:00
Arthur Schiwon 4b231c15d5 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 19:43:02 +02:00
Sam Tuke 72215a818d added new user settings interface for deleting old file versions 
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
 2012-06-20 18:25:12 +01:00
Sam Tuke d6bf62ea4e Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-20 16:26:02 +01:00
Sam Tuke c244daac89 removed readdir to fix bug oc-1054 2012-06-20 16:24:49 +01:00
Bart Visscher 6308ca6b8a Merge branch 'shared_log' 2012-06-20 17:20:46 +02:00
Bart Visscher 0086639891 Merge branch 'audit' 2012-06-20 17:20:39 +02:00
Bart Visscher 7a3d606cac Prefer requested app before redirecting to default page 2012-06-20 17:10:49 +02:00
Bart Visscher 6404476bec Delay setup of FS until OC_Filesystem is used 2012-06-20 17:10:49 +02:00
Bart Visscher cd934d5d89 Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible 2012-06-20 17:10:49 +02:00
Bart Visscher 5c8e774cea Small code reorder 2012-06-20 17:10:48 +02:00
Bjoern Schiessle 6644511124 remove unnecessary comment 2012-06-20 16:29:19 +02:00