Commit Graph

5782 Commits

Author SHA1 Message Date
Michael Gapczynski 09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Georg Ehrke fc4a542dd0 add iWork mimetypes 2012-08-03 20:06:29 +02:00
Bart Visscher b12ed88794 Calendar: remove double html encoding 2012-08-03 16:18:33 +02:00
Bart Visscher 599741bdd6 audit: update appinfo to OC4 2012-08-03 16:05:48 +02:00
Bart Visscher e36e00dc00 Merge branch 'chunked_upload' 2012-08-03 15:58:17 +02:00
Arthur Schiwon c5d5ca88a8 Show Login-Button when user+pw are autocompleted, fixes oc-1068 2012-08-03 13:15:15 +02:00
Jenkins for ownCloud 7dc799c167 [tx-robot] updated from transifex 2012-08-03 02:04:12 +02:00
Thomas Tanghus 7dda5527f1 Return properly formatted jsondata. 2012-08-02 19:03:45 +02:00
Thomas Tanghus d07f4a5ea8 Correct namespace usage. 2012-08-02 19:03:06 +02:00
Thomas Tanghus 40d2bb70d7 Remove logging 2012-08-02 19:01:55 +02:00
Thomas Tanghus 8f3357c305 I was a bit too fast in removing methods yesterday... 2012-08-02 18:57:03 +02:00
Thomas Tanghus a484ee817c If first addressbook was empty it was seen as if there where no contacts at all. 2012-08-02 18:50:20 +02:00
Thomas Tanghus a1239a37aa Line length... 2012-08-02 05:02:36 +02:00
Thomas Tanghus 30c3a783d9 Remove onunload handler when delete is cancelled. 2012-08-02 05:01:54 +02:00
Thomas Tanghus 20f8971222 Use popup class style for ninja-mode help. 2012-08-02 04:18:44 +02:00
Thomas Tanghus f84e92e6e3 More files to delete \o/ 2012-08-02 04:18:44 +02:00
Thomas Tanghus 937058cdec Updated JS namespace. 2012-08-02 04:18:44 +02:00
Michael Gapczynski 6c7baacf89 Throw exception for items already shared in a collection 2012-08-01 20:08:18 -04:00
Jenkins for ownCloud 91e828c6ce [tx-robot] updated from transifex 2012-08-02 02:06:16 +02:00
Michael Gapczynski 26e406c3c0 Hide 'can edit' if not checked 2012-08-01 18:03:00 -04:00
Thomas Tanghus f159f607de And then the missing files ;) 2012-08-02 00:02:07 +02:00
Thomas Tanghus a8faae4f42 Addressbooks settings rewrite and cleanup. 2012-08-02 00:02:07 +02:00
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
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
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
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
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
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