Bjoern Schiessle
19b3109655
code cleanup
2012-08-02 13:55:23 +02:00
Bjoern Schiessle
5996ea735a
remove debug output
2012-08-02 10:59:06 +02:00
Bjoern Schiessle
6b058cd359
allow user to choose encryption mode
2012-08-02 10:40:32 +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
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
Bart Visscher
93daa9e247
API: Complete respond function
2012-08-01 19:48:51 +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
Tom Needham
c11c2d0fd4
Logout the user at the end of a call to be stateless
2012-08-01 13:39:05 +00:00
Tom Needham
2afe5f9b2b
API: add OC_API::checkLoggedIn()
2012-08-01 13:37:00 +00:00
Tom Needham
75dbed2208
Fix the api routes
2012-08-01 14:12:59 +01:00
Sam Tuke
c4d1ad1b7d
Made dependencies of Kaymanager::setFileKey() explicit using dependency injection
2012-08-01 14:11:41 +01: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
Tom Needham
e315384b4d
Remove unnecessary include
2012-08-01 10:40:09 +01:00
Tom Needham
e7f7693b2f
Fix 3rdparty paths, initialise OAuth in correct order
2012-08-01 10:21:33 +01:00
Tom Needham
9ec035e3d3
Add oauth-php library
2012-08-01 10:20:17 +01:00
Bjoern Schiessle
a7f3a67bc2
get settings from DB and check the right checkbox in the settings
2012-08-01 10:37:21 +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
Bart Visscher
7426217e76
Fix /privatedata/getattribute route
2012-07-31 23:26:15 +02:00
Jenkins for ownCloud
36ccaf51ed
[tx-robot] updated from transifex
2012-07-31 22:57:24 +02:00
Bart Visscher
71918a820f
API: set request method for registered urls
2012-07-31 22:34:35 +02:00
Bart Visscher
006b127da4
Routing: Handle MethodNotAllowedException
2012-07-31 22:33:53 +02:00
Bart Visscher
9d6a09f589
Routing: Method needs to be uppercase
2012-07-31 22:33:11 +02:00
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