Commit Graph

6589 Commits

Author SHA1 Message Date
Michael Gapczynski 92d683587a Fix contact email share type redirection 2012-08-01 17:52:59 -04:00
Michael Gapczynski 4933128850 Throw exceptions in share API for UI to display 2012-08-01 17:52:29 -04:00
Michael Gapczynski 2201074e1f Basic setup for sharing with contacts 2012-08-01 17:17:28 -04:00
Jörn Friedrich Dreyer 14c5d08a3f reorder code for readability 2012-08-01 22:38:27 +02:00
Jörn Friedrich Dreyer 417bebd9b7 dix php strict warnings in mdb2 oci8 2012-08-01 22:37:57 +02:00
Georg Ehrke 47e4793c30 little fix for previous commit 2012-08-01 18:04:06 +02:00
Georg Ehrke 8766b3286b fix a subadmin UI bug 2012-08-01 18:03:08 +02:00
Thomas Tanghus 98f37b93f6 Propagate exceptions in OC.appSettings. 2012-08-01 16:24:02 +02:00
Jörn Friedrich Dreyer c7be0db853 use dbname for non privileged user 2012-08-01 15:00:54 +02:00
Jörn Friedrich Dreyer ab976863ae fix sql 2012-08-01 15:00:07 +02:00
Jörn Friedrich Dreyer e13f381189 add limit support to OC_DB & OCP/DB 2012-08-01 14:59:08 +02:00
Michael Gapczynski 83b935a1c2 Prevent up and down arrow from changing the share with input value 2012-07-31 21:31:59 -04:00
Michael Gapczynski b6aa5d2875 Include contacts in share with search 2012-07-31 21:05:00 -04:00
Jenkins for ownCloud 274d1ef87f [tx-robot] updated from transifex 2012-08-01 02:02:35 +02:00
Jakob Sack 1fe9892292 Fix #476 2012-07-31 23:31:25 +02:00
Jenkins for ownCloud 36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +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
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
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
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
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
Michael Gapczynski dfae77dec1 Add notifications and undo support for replacing files when renaming 2012-07-30 12:22:11 -04: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
Arthur Schiwon b523366acd LDAP: don't die on unexpected collisions, handle empty display-name attributes properly 2012-07-30 17:30:11 +02:00
Michael Gapczynski 98c020d954 Remove more accidentally added files 2012-07-30 10:42:44 -04:00
Michael Gapczynski 29dab0846e Remove another accidently added 3rdparty app 2012-07-30 10:37:54 -04:00
Michael Gapczynski 530e7f03cd Remove accidently added 3rd party apps 2012-07-30 10:34:12 -04:00
Michael Gapczynski b9bd54bd98 Add additional error handling for emailing private links 2012-07-30 10:07:20 -04:00
Michael Gapczynski dab708b625 Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270' 2012-07-30 10:07:20 -04:00
Michael Gapczynski 519eb39422 Remove delete tipsy if file is deleted, fixes bug oc-958 2012-07-30 10:07:19 -04:00
Michael Gapczynski 3e183b2eea Set filter to empty if not set by Ampache client
Conflicts:
	apps/media/lib_ampache.php
2012-07-30 10:07:19 -04:00