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 |
Sam Tuke
|
9f51841c57
|
Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs
|
2012-07-25 18:28:56 +01: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 |
Arthur Schiwon
|
3c9919e475
|
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:21:16 +02:00 |
Bart Visscher
|
b3848581bf
|
Small cleanup
|
2012-07-25 18:00:03 +02:00 |
Bart Visscher
|
5a0d476ab1
|
Convert new actions
|
2012-07-25 17:59:50 +02:00 |
Sam Tuke
|
adf5c953dd
|
Fixed use of OCFSV in getPrivateKey()
|
2012-07-25 16:56:52 +01:00 |
Sam Tuke
|
e6de086fb6
|
Fixed various bugs in hooks class
Fixed documentation syntax in keymanager
|
2012-07-25 16:51:48 +01:00 |
Bart Visscher
|
d579defc66
|
Merge branch 'master' into routing
|
2012-07-25 17:51:36 +02:00 |
Bart Visscher
|
d17eb2983f
|
OpenID: fix include path
|
2012-07-25 17:45:59 +02:00 |
Bart Visscher
|
ac9dbd4b83
|
Add functions for the common HTTP methods
|
2012-07-25 17:45:29 +02:00 |
Sam Tuke
|
66b461629b
|
Started implementation of new encyryption classes into the encryption proxy
|
2012-07-25 16:26:03 +01:00 |
Georg Ehrke
|
9b0870bb91
|
add some calendar sharing hooks in stable4 - bugfix for oc-1325
|
2012-07-25 17:02:24 +02:00 |
Bjoern Schiessle
|
6d1ed388c0
|
keymanager class for basic operations to store and retrieve keys
|
2012-07-25 17:01:11 +02:00 |
Sam Tuke
|
d766ca8b19
|
Changed util class methods to use / create public keys in single shared public-keys directory, and group encryption-related user files
|
2012-07-25 15:33:25 +01: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 |
Sam Tuke
|
9368ea73c8
|
added tests and methods relating to handling of legacy keys
|
2012-07-25 12:38:40 +01: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
|
eefe6882f9
|
method not used externally, thus not needed in interface
|
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
|
6b320a2604
|
provide recursiveArraySearch as Helper function and make available through API
|
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
|
57c375ea24
|
Support for OCA 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
|
81c0ca4ffb
|
remove only internally used function from interface
|
2012-07-25 12:56:08 +02:00 |
Arthur Schiwon
|
0196e6eada
|
Offer User and Group interfaces in public API
|
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 |
Arthur Schiwon
|
e499bc37c8
|
define an interface for the Group Backend
|
2012-07-25 12:56:08 +02:00 |
Arthur Schiwon
|
fdcbc23ed6
|
define an interface for the User Backend
|
2012-07-25 12:56:07 +02:00 |
Michael Gapczynski
|
6f58eca534
|
Change read only check to isCreatable
|
2012-07-24 21:35:03 -04:00 |
Michael Gapczynski
|
ede2b8a55f
|
Missed a is_readable() call in local filestorage
|
2012-07-24 21:17:43 -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 |