wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32725 commits 157 branches 562 tags 714 MiB
Commit graph

13607 commits

Author SHA1 Message Date
Jenkins for ownCloud
b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Jörn Friedrich Dreyer
704a993e37 Fix null pointer exception in user_ldap (#25062) 2016-06-21 16:30:48 +02:00
Vincent Petry
755c86e3a2 Merge pull request #24505 from owncloud/ceph-wait-for-http 
Don't rely on the notify socket but on the service responding
 2016-06-21 16:21:11 +02:00
Georg Ehrke
1452b74de7 Contacts API: replace raw image data with url (#25081) 
* add uri to AddressBookImpl array

* Introduce ImageExportPlugin for CardDav

* add plugin to v1 routes

* replace binary contact photo with link

* update tests

* Adding unit tests
 2016-06-21 15:25:44 +02:00
Thomas Müller
f2f1eab7f4 fix broken unit test (#25198) 2016-06-21 13:55:11 +02:00
Vincent Petry
ca168265ef Filter out group shares for owner where owner is included (#25190) 2016-06-21 11:36:28 +02:00
Robin Appelman
bb465a7ab4 Catch exceptions while creating shared mounts (#25077) 2016-06-20 22:11:05 +02:00
Vincent Petry
dcee528482 Don't send activity to non-admins when assigning invisible tags (#25192) 2016-06-20 22:06:34 +02:00
Vincent Petry
ef5217d6e8 Merge pull request #25173 from owncloud/fix_conversion_issues 
Fix conversion issues
 2016-06-20 17:15:45 +02:00
Vincent Petry
88b9f5a357 Merge pull request #25162 from owncloud/password-login-forbidden-hint 
Password login forbidden hint
 2016-06-20 17:05:20 +02:00
Juan Pablo Villafáñez
bb24e40bf4 Fix conversion issues 
Change to phpdoc type for automatic conversion
 2016-06-20 14:51:36 +02:00
Vincent Petry
c1770d746d Merge pull request #25159 from owncloud/share-app-initorder 
Delay files_sharing's registerMountProviders
 2016-06-20 13:31:36 +02:00
Vincent Petry
09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests 
Fix GDrive test rename overwrite folder
 2016-06-20 11:02:24 +02:00
Vincent Petry
fa533e72cd Merge pull request #25161 from owncloud/fixgetsharefolder 
Make getShareFolder use given view instead of static FS
 2016-06-20 10:26:03 +02:00
Vincent Petry
e3ddbeb755 Merge pull request #25120 from owncloud/settings_fix_checkbox_newline 
files_external: Keep checkbox and its label on one line
 2016-06-20 10:00:25 +02:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
d65c56d7de [tx-robot] updated from transifex 2016-06-18 01:58:51 -04:00
Markus Goetz
111bd8e57d files_external: Keep checkbox and its label on one line #20032 #22655 
Else the checkbox and the decription end up on different lines in my Chrome on OS X
 2016-06-17 16:19:38 +02:00
Vincent Petry
2340660a5b
PasswordLoginForbidden must extend NotAuthenticated 
The auth code from Sabre will forward NotAuthenticated exceptions but
in the case of a generic exception, it is packaged as "service not
available".
 2016-06-17 15:50:24 +02:00
Thomas Müller
bac96e7ffc
Wait for port being accessible in addition to the notify socket 2016-06-17 13:29:24 +02:00
Christoph Wurst
5a8cfab68f
throw PasswordLoginForbidden on DAV 2016-06-17 11:30:24 +02:00
Vincent Petry
a636078e6c
Make getShareFolder use given view instead of static FS 2016-06-17 11:11:59 +02:00
Christoph Wurst
82b50d126c
add PasswordLoginForbiddenException 2016-06-17 11:02:07 +02:00
Vincent Petry
a13caa0ea2
Delay files_sharing's registerMountProviders 
This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
 2016-06-17 11:00:09 +02:00
Sergio Bertolín
2fe67ecc3c Changed global variable to local 2016-06-17 07:35:23 +00:00
Jenkins for ownCloud
cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Vincent Petry
1a35dea8a6 Merge pull request #24965 from owncloud/streams-0.4.1 
update icewind/streams to 0.4.1
 2016-06-16 17:50:39 +02:00
Thomas Müller
0b7685d326 Move birthday calendar generation to a live migration job (#25135) 2016-06-16 16:14:28 +02:00
Vincent Petry
d6cf310dfc Merge pull request #25104 from owncloud/dropbox-catchratelimit 
Convert Dropbox Forbidden exception to StorageNotAvailableException
 2016-06-16 16:03:20 +02:00
Vincent Petry
d7f98fcdef Merge pull request #25103 from owncloud/fed-share-disable-cleanfolder 
disable cleanFolder for the federated share storage
 2016-06-16 13:21:51 +02:00
Robin Appelman
8dea26094b update icewind/streams to 0.4.1 2016-06-15 13:44:02 +02:00
Vincent Petry
3e9353dd69 Merge pull request #25082 from owncloud/fix-sessionless-clients 
Fix sessionless clients
 2016-06-15 10:45:55 +02:00
Jürgen Weigert
02e8021b1a Update start-swift-ceph.sh (#25109) 
fix failing https://ci.owncloud.org/job/server-master-linux-externals/database=sqlite,external=swift-ceph,label=SLAVE/
 2016-06-15 10:17:59 +02:00
Jenkins for ownCloud
be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Vincent Petry
e325209291
Convert Dropbox Forbidden exception to StorageNotAvailableException 2016-06-14 17:38:32 +02:00
Robin Appelman
4f02bd1dff disable cleanFolder for the federated share storage 2016-06-14 17:29:09 +02:00
Jenkins for ownCloud
5887afbb37 [tx-robot] updated from transifex 2016-06-14 08:02:15 +02:00
Christoph Wurst
465807490d
create session token only for clients that support cookies 2016-06-13 19:44:05 +02:00
Thomas Müller
990ac34aaa Use proper namespaces - fixes #25078 (#25079) 2016-06-13 19:32:54 +02:00
Christoph Wurst
331d88bcab
create session token on all APIs 2016-06-13 15:38:34 +02:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Vincent Petry
14fde6650c Merge pull request #25003 from owncloud/fix_ocs_path_response 
Fix OCS Share API path response
 2016-06-10 16:49:50 +02:00
Vincent Petry
c51bdd1809
Fix GDrive test rename overwrite folder 2016-06-10 14:53:37 +02:00
Vincent Petry
57b999fde7 Merge pull request #24990 from owncloud/fix_24868 
Wrap publicwebdav in sharePermission mask
 2016-06-10 14:33:06 +02:00
Vincent Petry
68c3b23e04 Merge pull request #24080 from owncloud/support-calendar-class-property 
Extract CLASS property from calendar object and store it in the database
 2016-06-10 11:22:11 +02:00
Vincent Petry
1abe5b0408 Merge pull request #25024 from owncloud/ldap-cachedgroupsbymember 
Use array_merge when reading cached groups members
 2016-06-10 11:06:41 +02:00
Vincent Petry
67c3a97401 Merge pull request #25046 from owncloud/fix-the-realm 
Use the correct realm for basic authentication
 2016-06-10 10:41:46 +02:00
Vincent Petry
543545505d Merge pull request #25043 from owncloud/webdav-download-mimetype 
DAV now returns file name with Content-Disposition header
 2016-06-10 09:55:59 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Vincent Petry
059778bef0
Add unit test for LDAP multi group caching 2016-06-09 17:57:07 +02:00