Commit graph

2981 commits

Author SHA1 Message Date
Michael Gapczynski
30b58f5677 Merge branch 'master' into share_api
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski
f25ccaff59 Fix filesystem hash, no longer using basicOperation() 2012-07-25 16:55:01 -04:00
Michael Gapczynski
4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Jenkins for ownCloud
37bccf54f2 [tx-robot] updated from transifex 2012-07-25 22:15:24 +02:00
Arthur Schiwon
b94631de0c LDAP: check if php-ldap is installed. If not, give an error output. FIX: blank Users page when the module is not installed. 2012-07-25 18:40:48 +02:00
Bart Visscher
d17eb2983f OpenID: fix include path 2012-07-25 17:45:59 +02:00
Arthur Schiwon
71b862e571 LDAP: replace deprecated constant 2012-07-25 15:11:58 +02:00
Arthur Schiwon
4a2295b75b code style 2012-07-25 15:10:56 +02:00
Arthur Schiwon
6285cc2604 LDAP: remove debug output 2012-07-25 13:19:07 +02:00
Arthur Schiwon
ab1d9507a9 code style 2012-07-25 13:18:31 +02:00
Arthur Schiwon
edfd789a87 LDAP: remove obsolete require_once 2012-07-25 13:16:31 +02:00
Arthur Schiwon
8664729843 code style 2012-07-25 13:14:32 +02:00
Arthur Schiwon
15f7d838fa code style 2012-07-25 13:13:01 +02:00
Arthur Schiwon
569e52b87c remove unnecessary debug output 2012-07-25 13:11:42 +02:00
Arthur Schiwon
c8404a7bfa code style 2012-07-25 13:10:59 +02:00
Arthur Schiwon
92f447ca50 code style 2012-07-25 13:09:51 +02:00
Arthur Schiwon
a6c5309e16 LDAP: adjust test after refactoring 2012-07-25 12:56:09 +02:00
Arthur Schiwon
b10f7aafb7 LDAP: silence warning, but handle the error 2012-07-25 12:56:09 +02:00
Arthur Schiwon
25ad1d5c3e LDAP: split up LIB_LDAP into Access for LDAP interaction functions and Connection for configuration and resource management. Adjust user_ldap, group_ldap and the app accordingly. 2012-07-25 12:56:09 +02:00
Arthur Schiwon
d0aebf05bf LDAP: group backend now implements the interface, does not inherit backend class 2012-07-25 12:56:08 +02:00
Arthur Schiwon
42492338fc LDAP: put app under the OCA\user_ldap\ namespace 2012-07-25 12:56:08 +02:00
Arthur Schiwon
5888cb48b6 Support for OCA namespace 2012-07-25 12:56:08 +02:00
Arthur Schiwon
afdc5bf264 LDAP: switch user backend from extending class OC_User_Backend to implementing OC_User_Interface for improved flexibility 2012-07-25 12:56:08 +02:00
Arthur Schiwon
0bdebe0e4a LDAP: pass user backend as instance, not classname 2012-07-25 12:56:08 +02:00
Michael Gapczynski
6f58eca534 Change read only check to isCreatable 2012-07-24 21:35:03 -04:00
Michael Gapczynski
fc72d4b10f Add root directory checks for CRUDS permissions in shared storage 2012-07-24 21:16:47 -04:00
Michael Gapczynski
f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Michael Gapczynski
c60c6024a7 Remove toTmpFile() from shared storage, no longer needed 2012-07-24 14:50:43 -04:00
Michael Gapczynski
eac297e8c4 Improve file source caching for shared folders 2012-07-24 14:41:19 -04:00
Michael Gapczynski
e8675586af Fix permission check for rmdir(), implement unlink(), rename(), and copy() 2012-07-24 14:22:07 -04:00
Michael Gapczynski
e6678bd454 Permission check should be made on parent folder when creating a new folder 2012-07-23 22:39:29 -04:00
Michael Gapczynski
b58e72cdb2 Alert user of errors when creating new files or folders 2012-07-23 22:35:34 -04:00
Michael Gapczynski
7b01e3285e Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage 2012-07-23 22:05:53 -04:00
Robin Appelman
7967685771 move some openid files to 3rdparty 2012-07-24 00:02:01 +02:00
Bjoern Schiessle
bd63fddbf4 fix broken properties in the database 2012-07-23 10:34:01 +02:00
Bjoern Schiessle
708c771296 update routine to fix broken file properties in db 2012-07-23 10:25:26 +02:00
Thomas Tanghus
25e1c13ef7 Remove unused ajax file. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
67b6ff22bc Cache DOM lookups, general cleanup. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
b60e5942a5 Cleaner event handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
fb9ef90c45 No need to set checksum on PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
0439a18324 Cleaner variable handling. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
b00de0258b Make sure notifier cleans up. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
644b6e60d5 Revert "No need to set checksum for PHOTO."
This reverts commit 3937d19fa2ef3da2719d0425ce02707d0345960c.
2012-07-23 01:17:38 +02:00
Thomas Tanghus
dc05fd7b92 No need to set checksum for PHOTO. 2012-07-23 01:17:38 +02:00
Thomas Tanghus
294e65fa38 Use insertContact 2012-07-23 01:17:38 +02:00
Thomas Tanghus
641bd7a456 Whitespace 2012-07-23 01:17:38 +02:00
Robin Appelman
b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Robin Appelman
a49c07cf88 progressbar for New->From Url 2012-07-22 03:56:51 +02:00
Robin Appelman
59ab8b14c7 cache fileid's in oc_cache 2012-07-22 03:24:34 +02:00
Thomas Tanghus
ab8ce89df3 Added help for keyboard shortcuts. 2012-07-22 00:15:28 +02:00