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

22599 Commits

Author SHA1 Message Date
Bart Visscher 28537037ae Fixup OCS modules 2012-07-31 22:19:11 +02:00
Bart Visscher c2bdb5c716 Fix require 3rdpartypath 2012-07-31 22:18:16 +02:00
Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Michael Gapczynski 269922543e Give share with search focus when sharing dropdown appears 2012-07-31 14:48:19 -04:00
Sam Tuke 82f5f73dff Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption 
Conflicts:
	apps/files_encryption/lib/crypt.php
 2012-07-31 19:38:28 +01:00
Sam Tuke 84fd62b130 Implemented writing of keyfiles and directory hierarchy in proxy class 
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
 2012-07-31 19:35:36 +01:00
Sam Tuke eebf76d344 Implemented writing of keyfiles and directory hierarchy in proxy class 
Added crypt::findFiles() method for finding different types of files, ready for batch encrypting / decrypting
Added comments to postFopen in proxy class
 2012-07-31 19:28:11 +01:00
Michael Gapczynski 9e4c3b8342 Remove break, it broke the statuses :) 2012-07-31 14:21:46 -04:00
Jörn Friedrich Dreyer 795e78809f add oracle to install & setup 2012-07-31 19:34:30 +02:00
Michael Gapczynski 8d01e1a355 Don't show self or already shared with users and groups in the share with search 2012-07-31 13:06:32 -04:00
jfd 3aff7a298c use CURRENT_TIMESTAMP in default column definitions (sqlite, mysql, postgres and oracle DO understand it), change clob columns to text (clob will give sorting and uniqueness problems and in general is not what we want) 2012-07-31 19:00:54 +02:00
jfd 727f4357fb remove superflous index (already indexed with primary key derived from <autoincrement> by MDB2), oracle will bark on this 2012-07-31 18:54:24 +02:00
jfd ede464f058 escape all identifiers with backticks 2012-07-31 18:53:05 +02:00
Jörn Friedrich Dreyer 3c5670b662 comment extra timestamp quotation for oci8. Oracle can handle CURRENT_TIMESTAMP pretty well 2012-07-31 17:49:49 +02:00
Jörn Friedrich Dreyer c03daca712 add oci8 to MDB2 2012-07-31 17:42:36 +02:00
Bjoern Schiessle f6863f9e51 get encryption mode from the settings 2012-07-31 16:52:21 +02:00
Bjoern Schiessle e4e6574e42 allow admin to choose between client and server side encryption 2012-07-31 16:37:37 +02:00
Michael Gapczynski 8729119d4b Add suggestion to share with search for sharing via email 2012-07-31 10:18:26 -04:00
Thomas Tanghus 6df95db8e8 Forgot to also use the options I added :-P 2012-07-31 16:05:58 +02:00
Thomas Tanghus 8837576ce7 Added some more options to OC.appSettings(). 2012-07-31 16:03:08 +02:00
Tom Needham fcf3dbcfc1 Require a username for OC_OAuth::registerConsumer() 2012-07-31 15:02:51 +01:00
Tom Needham ce41f3801e Actually login the user when using OAuth 2012-07-31 14:59:07 +01:00
Tom Needham 78bbcc8aea Basic OAuth class based on oauth-php. WIP 2012-07-31 14:35:07 +01:00
Tom Needham 5922599f48 Handle function not needed in lib/ocs.php 2012-07-31 14:35:07 +01:00
Bjoern Schiessle 9bab06537c update file encryption key over webdav properties for client side encryption 2012-07-31 15:03:28 +02:00
Thomas Tanghus 5eed59bd54 Changed fix parameter to OC.appSettings(). 2012-07-31 14:18:32 +02:00
Thomas Tanghus fb14cb87bd Made the parameter for OC.appSettings() an object to be able to extend it. 2012-07-31 14:17:28 +02:00
Thomas Tanghus 084866cb1e White space 2012-07-31 14:06:44 +02:00
Thomas Tanghus 90a1b5a758 Unregister from personal settings. 2012-07-31 12:23:22 +02:00
Thomas Tanghus 19c55e2d44 Implemented app settings in popup. 2012-07-31 12:23:22 +02:00
Thomas Tanghus 553773f2e1 Popup for app specific settings. 2012-07-31 12:23:22 +02:00
Tom Needham b05639e745 Fix error with namespacing 2012-07-31 10:10:15 +00:00
Tom Needham cc6911e1f7 Make method static 2012-07-31 09:28:12 +00:00
Frank Karlitschek aa60771736 4.0.6 2012-07-31 10:13:10 +02:00
Michael Gapczynski d66f071d3e Use search and limit parameters for share with search in sharing dropdown 2012-07-30 20:21:48 -04:00
Michael Gapczynski 2f1a990cad Add search, limit, and offset parameters to getUsers() and getGroups() 2012-07-30 20:20:46 -04:00
Michael Gapczynski ed71343df8 Autocomplete for share with search in sharing dropdown 2012-07-30 15:30:21 -04:00
Jakob Sack 8a92cd21d6 Remove OC_App::register call in OCP\App::register 2012-07-30 21:26:14 +02:00
Bart Visscher 0a9ca42c34 Fix OC_OCS_Privatedata::privateDataGet 2012-07-30 21:19:03 +02:00
Bart Visscher 7a24f0cd8d Make calling ocs/v1.php/config work 2012-07-30 21:19:02 +02:00
Bart Visscher 180bd69dbb Fix OC_API::register 2012-07-30 21:19:02 +02:00
Bart Visscher 95d3b83a77 Create OC_Router in OC::init 2012-07-30 21:19:02 +02:00
Bart Visscher 0271bfa3b7 Move loading of routes to OC_Router 2012-07-30 21:19:02 +02:00
Bart Visscher 372fdf8077 Add 'ocs' as app name to API registration 2012-07-30 21:19:02 +02:00
Tom Needham 91daf54d7c Check if required apps are installed 2012-07-30 16:41:07 +00:00
Michael Gapczynski dfae77dec1 Add notifications and undo support for replacing files when renaming 2012-07-30 12:22:11 -04:00
Tom Needham 2f84a8d746 Merge the responses recursively 2012-07-30 16:04:09 +00:00
Arthur Schiwon b465fc84ae LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:42:33 +02:00
Tom Needham c4d87c1aff Add methods for getting users and creating users to provisioning api 2012-07-30 15:34:47 +00:00
Arthur Schiwon b523366acd LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:30:11 +02:00