Commit Graph

32723 Commits

Author SHA1 Message Date
Joas Schilling 3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable 2016-06-22 10:29:40 +02:00
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
Christoph Wurst 7f22aeb5d6 redirect to new login route (#25099)
* redirect to new login route

* encode anchor in url and restore it client-side
2016-06-21 16:14:51 +02:00
Christoph Wurst 195fc5b048 Merge pull request #25196 from owncloud/update-session-token-password
update session token password on user password change
2016-06-21 15:39:01 +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 af98e3e641 Merge pull request #25042 from owncloud/session-settings-ellipsis
add overflow ellipsis to session and device tokens list
2016-06-21 12:15:38 +02:00
Christoph Wurst db11c20dcb
pass new password instead of username 2016-06-21 11:54:54 +02:00
Vincent Petry ca168265ef Filter out group shares for owner where owner is included (#25190) 2016-06-21 11:36:28 +02:00
Christoph Wurst b805908dca
update session token password on user password change 2016-06-21 10:24:25 +02:00
Jenkins for ownCloud 0e575c7eea [tx-robot] updated from transifex 2016-06-21 03:49:50 -04: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
Thomas Müller 2951a70fcb Update ExcludeFileByNameFilterIterator.php (#25184)
Gentoo & derivatives use a tool named webapp-config which places two files in a webapp-config manager web application:
1: .webapp    tag with more detailed info on the configuration done by webapp-config
2: .webapp-appname   with the list of files installed by the tool to be able to later only delete stuff that was installed (in case of upgrade) and updated configurations.
2016-06-20 12:02:23 +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
Vincent Petry e2b0a0f18f Merge pull request #25174 from owncloud/tokenmapper-close-cursor
close cursor after loading a token
2016-06-20 09:54:15 +02:00
Vincent Petry 01041045da Merge pull request #25168 from owncloud/capped-user-cache
Capped cache for user config
2016-06-20 09:53:58 +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
Christoph Wurst b0f2878f6e
close cursor after loading a token 2016-06-17 16:13:28 +02:00
Vincent Petry cab7106dfb Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolder
Delay getRootFolder from RemoveRootShares repair step
2016-06-17 15:57:09 +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
Vincent Petry a5a66f38f1
Fix tooltip position in token list 2016-06-17 15:11:31 +02:00
Sergio Bertolín 491e2654eb Added test with new endpoint (#23934)
* Added test with new endpoint

* Moved all scenarios using new dav endpoint to a new feature file

* Removed extra slash in welcome.txt

* some fixes

* Incorrect user while downloading with range

* Fixed Content-disposition
2016-06-17 14:10:43 +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
Thomas Müller 5d1ef68cf0
Give mysql docker more time to start up 2016-06-17 13:29:24 +02:00
Vincent Petry 85d9e58637 Merge pull request #25153 from owncloud/fix-problem-added-in-25023
Changed global variable to local
2016-06-17 13:28:34 +02:00
Jörn Friedrich Dreyer 66560b8ed9 Capped cache for user config 2016-06-17 12:58:55 +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
Vincent Petry 73e284e1e1
Use getLazyRootFolder from RemoveRootShares repair step
This prevents the command registration to setup the FS too early when
FS-related apps might need upgrading.
2016-06-17 11:09:12 +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
Vincent Petry 82beee57e4 Merge pull request #25132 from owncloud/2fa-load-apps-before-query
load 2FA provider apps before querying classes
2016-06-16 17:04:19 +02:00
Vincent Petry 3917969728 Merge pull request #25146 from owncloud/butonic-patch-1
emit correct signal when disabling an app
2016-06-16 17:03:41 +02:00
Vincent Petry d8c9db6211 Merge pull request #25147 from owncloud/setup-advanced-toggle
Prevent the advanced options toggle in the setup from acting as a link
2016-06-16 17:03:09 +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