Commit Graph

13083 Commits

Author SHA1 Message Date
Thomas Müller d6d59fe227 Merge pull request #23346 from owncloud/fix_23325
Set proper public webdav permissions when public upload disabled
2016-03-17 20:51:54 +01:00
Roeland Jago Douma 6e6e002280 Remove duplicated copyright 2016-03-17 19:24:25 +01:00
Thomas Müller 520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Thomas Müller 7d638fdb34 In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging 2016-03-17 16:51:19 +01:00
Vincent Petry 950530b162 Display share status info in favorite list
Returns the shareTypes share status info to the favorites file list.
2016-03-17 15:35:21 +01:00
Vincent Petry f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller 8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths
Fix absolute path creation for remote shares with /oc webroot
2016-03-17 14:29:57 +01:00
Vincent Petry 5db41dfbed Only use GDrive chunks when needed 2016-03-17 12:36:47 +01:00
Roeland Jago Douma 533fdb4075 Set proper public webdav permissions when public upload disabled
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
2016-03-17 11:35:31 +01:00
Thomas Müller 828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui
Display external storage GUI even if user mounting disabled
2016-03-17 09:55:23 +01:00
Thomas Müller b5c56a7322 Merge pull request #23336 from owncloud/occ-typos
Some typo corrections in occ command output
2016-03-17 09:31:11 +01:00
Jenkins for ownCloud ace1812026 [tx-robot] updated from transifex 2016-03-17 01:56:06 -04:00
Carla Schroder 0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Robin McCorkell a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00:00
Thomas Müller f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff
Fallback for crappy ancient distributions
2016-03-16 21:56:36 +01:00
Arthur Schiwon d8621c78ed Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-16 20:51:03 +01:00
Vincent Petry aa2674e7e2 Chunk upload for GDrive
Instead of storing the WHOLE file in memory in a PHP variable, use the
library's chunk upload support.
2016-03-16 17:57:54 +01:00
Thomas Müller b4ea527fb2 Merge pull request #23253 from owncloud/give-swift-more-time
Give swift 15 seconds after startup
2016-03-16 17:32:55 +01:00
Thomas Müller fdb7c59e6c Create the contact birthday calendar right away as soon as the command is executed once - fixes #23203 2016-03-16 17:23:02 +01:00
Thomas Müller d188ed938c Merge pull request #23082 from owncloud/contacts_calendar_name_color
add title and color to birthday calendar
2016-03-16 17:17:21 +01:00
Morris Jobke e7e743bdb4 Give swift 15 seconds after startup 2016-03-16 16:16:04 +01:00
Arthur Schiwon 8e0bd5630c fix writing to cache when fallback server should be used immediately 2016-03-16 14:44:18 +01:00
Robin Appelman d498282e12 handle connection errors as storage not available in smb 2016-03-16 13:15:54 +01:00
Thomas Müller 225eebd8f9 Merge pull request #23155 from owncloud/fed-unshare-with
Specify the target user when unsharing a federated share
2016-03-16 11:19:09 +01:00
Joas Schilling 140d5f7df3 Make sure to append the web root as per doc 2016-03-16 09:37:48 +01:00
Jenkins for ownCloud 631ae2f0f4 [tx-robot] updated from transifex 2016-03-16 01:55:43 -04:00
Senorsen a6631eceb4 Add urlencode to username part of ftp and sftp links
according to #17796
2016-03-16 01:49:40 +08:00
Vincent Petry ab50ba7a58 Fix dropbox storage to not store the whole file in memory
Since the library can only store the full response in memory on
download, we use an alternate client lib and set the correct headers to
be able to stream the content to a temp file.
2016-03-15 18:05:27 +01:00
Thomas Müller 8feb42c22e Merge pull request #23251 from owncloud/fix_22907
allow group shares, even if not all public keys are available
2016-03-15 16:00:47 +01:00
Thomas Müller d4a8d5d2ea Merge pull request #22998 from owncloud/delay-loading-the-scanner
Delay check till scanner is used
2016-03-15 12:16:02 +01:00
Thomas Müller 0f6ea9fd29 Merge pull request #23039 from owncloud/invalid-share-storage
dont break when there is an invalid share
2016-03-15 12:15:05 +01:00
Thomas Müller e9eeb3607f Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilder-api
Correctly escape join statements and use selectAlias
2016-03-15 12:14:17 +01:00
Bjoern Schiessle 9de4a8338e allow group shares, even if not all public keys are available 2016-03-15 11:33:19 +01:00
Jenkins for ownCloud 2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Robin Appelman 7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +01:00
Jenkins for ownCloud e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Thomas Müller 31aeca32c2 Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1
Mark testing app as compatible with 9.1
2016-03-13 19:59:47 +01:00
Thomas Müller 101e446577 Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search
Return the correct group casing in sharee api
2016-03-13 19:51:07 +01:00
Lukas Reschke 239f1c067c Mark testing app as compatible with 9.1 2016-03-13 19:47:30 +01:00
Roeland Jago Douma 6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma 4b1fe0083a Remove the old OCS Share API code 2016-03-13 13:31:28 +01:00
Lukas Reschke 3a5f58c9b0 Fallback for crappy ancient distributions
Fixes https://github.com/owncloud/core/issues/23181
2016-03-12 23:11:31 +01:00
Jenkins for ownCloud 5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Joas Schilling aad8aa0970 Correctly lower the search input as well 2016-03-11 14:08:13 +01:00
Joas Schilling 8cd52ed36d Return the correct group casing in sharee api 2016-03-11 14:08:12 +01:00
Robin Appelman a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman 3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Thomas Müller 750ec93394 Merge pull request #23080 from owncloud/use-non-localized-birthday-title
Use a birthday title which does not require translation because we ha…
2016-03-11 11:49:13 +01:00
Jenkins for ownCloud 1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller 866de3c174 Merge pull request #23086 from owncloud/ldap-sort-deprecated
remove deprecated ldap_sort
2016-03-11 00:23:13 +01:00
Thomas Müller 07a1313114 Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master
getOwner is not available on FileHome
2016-03-10 23:12:51 +01:00
Thomas Müller e0210058ef Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10
Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-10 23:07:45 +01:00
Thomas Müller b502667f3a Merge pull request #23121 from owncloud/scrutinizer_share_fixes
Fix some scrutinizer warning in the sharing code
2016-03-10 22:17:06 +01:00
Roeland Jago Douma e6712c47a6 Fix some scrutinizer warning in the sharing code
* Better phpdoc
* Promper use statements
* Unused parameter
2016-03-10 21:35:22 +01:00
Thomas Müller 8e51634e6d Merge pull request #23056 from owncloud/fix_23044
Add mimetype to OCS Share API output
2016-03-10 21:18:19 +01:00
Georg Ehrke 856ca641d1 add title and color to birthday calendar 2016-03-10 21:02:54 +01:00
Thomas Müller b7adf371c6 getOwner is not available on FileHome - fixes #23116 2016-03-10 20:53:56 +01:00
Thomas Müller 7f16aaefc8 Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set
No fatal error if dstart is not set
2016-03-10 17:58:01 +01:00
Thomas Müller ad61c552ea Merge pull request #23087 from owncloud/allow-migrating-all-calendars
Allow to migrate calendars of all users
2016-03-10 17:44:23 +01:00
Roeland Jago Douma 517ef52560 Add mimetype to OCS Share API output
Fixes #23044
2016-03-10 15:41:17 +01:00
Morris Jobke 48e03e0c49 Fake LOCK statement for Windows 7, 8 and 10 network mounts
* fixes #22596
2016-03-10 15:02:37 +01:00
Thomas Müller 5fc859f7ea Generate birthdays on upgrade from 8.2 as well 2016-03-10 14:17:21 +01:00
Joas Schilling 94915e39db Allow to migrate calendars of all users 2016-03-10 13:42:09 +01:00
Arthur Schiwon fe2a506e56 remove deprecated ldap_sort 2016-03-10 13:13:38 +01:00
Thomas Müller b021c8c475 Birthday events are generated on upgrade 2016-03-10 13:04:50 +01:00
Thomas Müller 85521879cd The birthday_calendar is read-only 2016-03-10 12:50:07 +01:00
Thomas Müller fe7103506b Use a birthday title which does not require translation because we have no idea about the target device language and forcing English upon all users is kind of bad 2016-03-10 12:41:37 +01:00
Thomas Müller 262ec35d50 Merge pull request #23017 from owncloud/first-stop-the-dockers
docker containers should be stopped before being removed - refs https…
2016-03-10 10:58:20 +01:00
Thomas Müller 41aae971a9 Merge pull request #23050 from owncloud/href-target-blank
make sure links open in new tabs
2016-03-10 10:54:53 +01:00
Joas Schilling 6b4117df34 Correctly escape join statements and use selectAlias 2016-03-10 10:24:08 +01:00
Thomas Müller 6133253a2c fixes #23004 2016-03-10 09:20:53 +01:00
Thomas Müller 845a45ae4a Merge pull request #23064 from owncloud/typo-comments-app-desc
fix typo in comments app meta data
2016-03-10 08:24:40 +01:00
Jenkins for ownCloud 96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Arthur Schiwon 6aefc8fba7 fix typo 2016-03-09 22:31:30 +01:00
Jan-Christoph Borchardt ecbe4aea31 make sure links open in new tabs 2016-03-09 18:49:46 +01:00
Thomas Müller bc434b252c fixes #23020 2016-03-09 18:12:39 +01:00
Thomas Müller 822541b689 Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars
Fix syncing of all birthday calendars in one go
2016-03-09 16:44:19 +01:00
Thomas Müller fe3ffcbfc3 Merge pull request #23026 from stweil/master
apps/files: Fix typos in comments (found and fixed by codespell)
2016-03-09 16:43:05 +01:00
Joas Schilling 8c4af74ce7 Fix syncing of all birthday calendars in one go 2016-03-09 16:14:33 +01:00
Lukas Reschke 80b91264e1 Delay check till scanner is used
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
2016-03-09 16:01:53 +01:00
Stefan Weil 692f312513 apps/files: Fix typos in comments (found and fixed by codespell)
This contribution is AGPL and MIT licensed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-09 15:14:05 +01:00
Thomas Müller 42bcea1ef0 Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-file
Remove disabled autocorrect for new file names
2016-03-09 15:05:32 +01:00
Thomas Müller cf3cb4d75e docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758 2016-03-09 14:02:08 +01:00
Thomas Müller 290a16e5d7 Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero
Public link share disabled if password length is equal to 0
2016-03-09 12:22:01 +01:00
Thomas Müller 447e8d2313 Merge pull request #22961 from owncloud/fix-gdrive-on-php54
Fix compatibility with PHP 5.4
2016-03-09 12:20:42 +01:00
Thomas Müller 30cec687ae Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents
Use HTTPClient instead of file_get_contents
2016-03-09 12:20:06 +01:00
Thomas Müller 3608421800 Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun
Use "hasKey" instead of checking the value
2016-03-09 12:19:45 +01:00
Morris Jobke 52f02fe93e Remove disabled autocorrect for new file names
* ref #22784
2016-03-09 08:38:05 +01:00
Jenkins for ownCloud afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Lukas Reschke c0200bc5c3 Use "hasKey" instead of checking the value
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
2016-03-08 23:24:44 +01:00
Lukas Reschke 8214fae9ae Use HTTPClient instead of file_get_contents
Allows us to catch exceptions like 404's and thus prevents stuff like:

```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
2016-03-08 22:13:00 +01:00
Lukas Reschke d14adb2351 Fix compatibility with PHP 5.4
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 18:04:24 +01:00
Vincent Petry e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller 20db92c71a Fix group sharing and sharing permissions - fixes #22932 2016-03-08 11:22:07 +01:00
Thomas Müller 31c89bd3a2 Merge pull request #22885 from owncloud/master-show-version-to-update-to
Show version to update to properly
2016-03-08 09:41:52 +01:00
Thomas Müller 2ebf512412 Merge pull request #22915 from owncloud/cleanup_ocs_share_api
Cleanup OCS Share Api
2016-03-08 09:41:20 +01:00
Jenkins for ownCloud a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
prastut 7e52aac771 Public link share disabled if password length is equal to 0 2016-03-08 04:25:35 +05:30
Thomas Müller 0487b541a0 Merge pull request #22880 from owncloud/fix-21656
improve log output when no LDAP user was found on login attempt
2016-03-07 17:12:01 +01:00
Roeland Jago Douma b1dae2a4b9 Can't convert node to string 2016-03-07 16:15:01 +01:00
Roeland Jago Douma 218d042142 Move common code to function
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
2016-03-07 16:14:57 +01:00
Thomas Müller deca1979aa Calendar and addressbook migration commands are always available 2016-03-07 15:04:19 +01:00
Thomas Müller 3b25ccef65 Handle addressbook migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller d32b35fc7f Handle calendar migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller a61fa5b526 Merge pull request #22902 from owncloud/share-archivenamedownloadall
Fix archive file name when downloading public share
2016-03-07 14:47:35 +01:00
Thomas Müller 8ef760eb5d Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited
Fix uploading to fed share when free space is unlimited
2016-03-07 14:47:01 +01:00
Thomas Müller e5b5eca5a9 Merge pull request #22787 from owncloud/versions-fixmtimetooltip
Fix tooltip for versions mtime
2016-03-07 14:41:46 +01:00
Thomas Müller 46af7db3e3 Merge pull request #22785 from owncloud/trash-returnfalseon401
Return false on 401 in file list + trash file list
2016-03-07 14:41:31 +01:00
Thomas Müller bd4b61f52b Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint
Correctly default to null and add type hint
2016-03-07 13:50:53 +01:00
Thomas Müller 296a46cc38 Merge pull request #22244 from owncloud/dont-update-shared-resource-properties
For 9.0 we don't have the possibility to store calendar and addressbo…
2016-03-07 12:42:52 +01:00
Vincent Petry dbea268332 Remove "files" arg from download URL in public link page
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 11:55:55 +01:00
Vincent Petry d8e592d670 Fix archive file name when downloading public share
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 11:37:49 +01:00
Joas Schilling c99ae62c33 Correctly default to null and add type hint 2016-03-07 10:48:16 +01:00
Vincent Petry 60d8046c35 Fix uploading when free space is unlimited
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
2016-03-07 10:42:36 +01:00
Jenkins for ownCloud c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller f2088cafb8 Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud
Cache results of testRemoteUrl
2016-03-06 20:00:47 +01:00
Thomas Müller 6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations
ne, or_IN, uz and yo have been removed from transifex and will be rem…
2016-03-06 19:59:57 +01:00
Thomas Müller 6f6d659f56 Merge pull request #22888 from owncloud/use-custom-header
Use custom header
2016-03-06 19:53:35 +01:00
Jenkins for ownCloud 05d0d9e9e2 [tx-robot] updated from transifex 2016-03-06 01:55:08 -05:00
Lukas Reschke 4301e30741 Use custom header
PHP in CGI mode eats the Authorization header => 💣
2016-03-05 23:04:49 +01:00
Lukas Reschke 4caa9e18b0 Show version to update to properly
Properly shows the version that will be updated to.
2016-03-05 21:58:58 +01:00
Jenkins for ownCloud a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Arthur Schiwon 5d3183afcd improve log output when no LDAP user was found on login attempt 2016-03-05 00:18:34 +01:00
C. Montero Luque b3656f1434 Merge pull request #22878 from owncloud/use-clob-for-timezone
Use CLOB for timezone
2016-03-04 18:00:48 -05:00
C. Montero Luque fe86e0c2f8 Merge pull request #22870 from owncloud/autoenable-federation-app
Automatically enable "federation" app
2016-03-04 17:44:50 -05:00
Lukas Reschke b302ec8381 Use CLOB for timezone
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.

This changes it back to a CLOB as it has been before as well: 8d8bb68b01. I'm not super convinced that CLOB is the best choice here but at least it seems to work.

Fixes https://github.com/owncloud/core/issues/22876
2016-03-04 21:59:08 +01:00
C. Montero Luque 89315722a1 Merge branch 'master' into autoenable-federation-app 2016-03-04 13:37:42 -05:00
C. Montero Luque 7a0720f300 Merge branch 'master' into fix-db-locking-cleanup 2016-03-04 13:35:04 -05:00
C. Montero Luque 45f49a090a Merge pull request #22860 from owncloud/trashbin-checkpath
Properly check path validity before deleting to trash
2016-03-04 13:33:07 -05:00
Lukas Reschke 1b64982e27 Automatically enable "federation" app 2016-03-04 17:38:51 +01:00
Morris Jobke 138219d74a Run cleanup of expired DB file locks to background job
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 15:52:23 +01:00
Thomas Müller e2642129a1 Merge pull request #22857 from owncloud/add-release-channel-selection
Add release channel selection back
2016-03-04 15:29:52 +01:00
Thomas Müller b56dbd0607 Merge pull request #22816 from owncloud/external-unavailable-recheck
allow availability recheck for external storages
2016-03-04 15:29:17 +01:00
Vincent Petry 0eb5292aaf Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:27:31 +01:00
Lukas Reschke 63bd6b25db Cache results of testRemoteUrl
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.

Replaces https://github.com/owncloud/core/pull/22855
2016-03-04 15:13:56 +01:00
Lukas Reschke e3a0a69c73 Add release channel selection back
Allows to select the release channels again and also shows the last check date
2016-03-04 14:37:35 +01:00
Thomas Müller 048e11d25f Merge pull request #22830 from owncloud/fix_dav_permissions
Rename and move permissions are set when a file is updatable
2016-03-04 12:01:32 +01:00
Vincent Petry 3a36163e91 Fix download spinner to work with CSS styles
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
2016-03-04 10:48:08 +01:00
Jenkins for ownCloud bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Roeland Jago Douma 3bdafc2122 Rename and move permissions are set when a file is updatable
* Fix unit tests
2016-03-03 20:03:06 +01:00
Vincent Petry 4255dd2b39 Properly set exception in FailedStorage 2016-03-03 14:37:23 +01:00
Robin Appelman 6990100e6e allow availability recheck for external storages 2016-03-03 14:19:34 +01:00
Lukas Reschke 72c8187cbb Keep "encryptedVersion" when calling `\OC\Files\View::copy`
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.

To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982):

1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above

The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271 the stream is directly copied and thus bypassing the FS.
2016-03-03 14:15:36 +01:00
Bjoern Schiessle b6050b44c2 disable the recovery key if the master key is enabled 2016-03-03 12:16:39 +01:00
Thomas Müller 4f25f34178 Merge pull request #22778 from owncloud/fix-22770
untangle different user manager instances, fixes #22770
2016-03-03 11:55:10 +01:00
Thomas Müller c590372aef Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete
Remove browser autocomplete in new file menu
2016-03-03 11:54:48 +01:00
Thomas Müller 8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Vincent Petry dbdf2173ac Return false on 401 in file list + trash file list
This gives a chance to the global ajax error handler to do its work if
the session expired.
2016-03-03 09:09:30 +01:00
Jenkins for ownCloud 8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Vincent Petry 03b90cec35 Fix tooltip for versions mtime
It was missing a call to jquery.tooltip
2016-03-02 17:50:46 +01:00