Georg Ehrke
|
c8de77b3fd
|
fix errors like Failed opening required ownCloudcalendar/appinfo/remote.php
|
2012-07-26 16:03:19 +02:00 |
Georg Ehrke
|
e4679770c4
|
declare OCP\App::register as deprecated
|
2012-07-26 15:16:07 +02:00 |
Georg Ehrke
|
4e62e121a6
|
mark OCP\App::register as deprecated
|
2012-07-26 15:12:57 +02:00 |
Georg Ehrke
|
8cff0d997f
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:48:00 +02:00 |
Georg Ehrke
|
f7155b4276
|
convert through caldav transmitted rgba calendarcolor to rgb
|
2012-07-26 14:46:03 +02:00 |
Bjoern Schiessle
|
e5c84488ff
|
Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption
Conflicts:
apps/files_encryption/lib/keymanager.php
|
2012-07-26 14:06:39 +02:00 |
Bjoern Schiessle
|
cb5d935b82
|
implemented publicKeyGet() and privateKeyGet() calls
|
2012-07-26 13:57:50 +02:00 |
Bjoern Schiessle
|
bdb406916c
|
fixed path for filesystem view
|
2012-07-26 13:49:22 +02:00 |
Bjoern Schiessle
|
3ab4ddd1da
|
function to ask for the encryption mode (server side or client side).
Needs to be implemented and integrated into the settings.
|
2012-07-26 13:47:43 +02:00 |
Tom Needham
|
edb04b25de
|
Fix merge conflicts
|
2012-07-26 11:26:22 +00:00 |
Jenkins for ownCloud
|
ba0ea21074
|
[tx-robot] updated from transifex
|
2012-07-26 08:04:12 +02:00 |
Jenkins for ownCloud
|
42c22bee36
|
[tx-robot] updated from transifex
|
2012-07-26 08:03:10 +02:00 |
Lukas Reschke
|
12dfe5868a
|
Updated style
|
2012-07-26 01:38:46 +02:00 |
Lukas Reschke
|
d24326ecce
|
Updated style
|
2012-07-26 01:38:20 +02:00 |
Lukas Reschke
|
d425740dc2
|
Remove unused files
|
2012-07-26 01:19:46 +02:00 |
Lukas Reschke
|
1554d7a2c0
|
Check for admin user
|
2012-07-26 01:16:32 +02:00 |
Lukas Reschke
|
efbd7ca166
|
Updated packages
|
2012-07-26 01:16:22 +02:00 |
Lukas Reschke
|
95936024bc
|
Updated packages
|
2012-07-26 01:12:58 +02:00 |
Lukas Reschke
|
9605e1926c
|
Check for admin user
|
2012-07-26 00:06:51 +02:00 |
Lukas Reschke
|
85a410d7a3
|
Remove unused files
|
2012-07-26 00:04:12 +02:00 |
Michael Gapczynski
|
586fe8f940
|
Change is_writable() call to isUpdatable()
|
2012-07-25 17:39:28 -04:00 |
Michael Gapczynski
|
add8f09355
|
No longer need hash() in shared storage, already implemented by the common file storage
|
2012-07-25 17:13:48 -04:00 |
Bart Visscher
|
783d67be62
|
Create uniqid ETag for directories
|
2012-07-25 23:09:03 +02:00 |
Bart Visscher
|
381e493a8c
|
Rename functions
getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
|
2012-07-25 23:09:03 +02:00 |
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 |