Commit Graph

30440 Commits

Author SHA1 Message Date
Jenkins for ownCloud 2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Thomas Müller b5bf32bc34 Merge pull request #22354 from owncloud/only-register-when-available
Only register admin page when update is available
2016-02-12 19:39:56 +01:00
Lukas Reschke ab5768f7dd Only register admin page when update is available
Fixes https://github.com/owncloud/core/issues/22353
2016-02-12 18:45:42 +01:00
Thomas Müller 0c8021e945 Merge pull request #21832 from owncloud/reduce-user-object-issues
Always set up a config object within the user object
2016-02-12 16:51:08 +01:00
Morris Jobke 5fe55de6d8 Always set up a config object within the user object
* the new getEmailAddress and setEmailAddress relies on this anyway
2016-02-12 16:33:37 +01:00
Thomas Müller 55e55dd91d Merge pull request #22349 from owncloud/icon-updates
icon fixes: comments, delete
2016-02-12 16:28:49 +01:00
Thomas Müller 761e9cf3a4 Merge pull request #21837 from owncloud/recipients-error-message
First try for shareWithField error message
2016-02-12 16:09:37 +01:00
Thomas Müller ad9dea8edf Merge pull request #22292 from owncloud/smb-handle-forbidden
handle forbidden exceptions in smb backend
2016-02-12 16:09:05 +01:00
Jan-Christoph Borchardt 03e8f1d290 add proper comment icon and add it to icons.css 2016-02-12 14:08:44 +01:00
Jan-Christoph Borchardt 4a24c732d4 add white delete icon 2016-02-12 14:05:05 +01:00
Thomas Müller b3323a51c9 Merge pull request #22294 from owncloud/carddav-report-list-groups-2
Adding a custom webdav property which holds the list of contacts groups
2016-02-12 13:22:05 +01:00
Thomas Müller cb1051dae4 Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298
Calculate the share statuses in js from the OCS Response
2016-02-12 11:12:14 +01:00
Thomas Müller 207c09c511 Merge pull request #22309 from owncloud/infinite-recursion-on-expired-link
Do not getShare in deleteShare, it's already there when deleting
2016-02-12 11:11:26 +01:00
Thomas Müller e99c4d83dc Merge pull request #22317 from owncloud/fix_invisible_linkshares
Do not allow invisible link shares
2016-02-12 11:10:58 +01:00
Roeland Jago Douma b786523bb7 Clear error when removing text 2016-02-12 10:25:42 +01:00
Roeland Jago Douma 113bfb0b07 Update tooltip on new search 2016-02-12 10:04:33 +01:00
Julian Müller de4824077e First try for shareWithField error message
Second try for ShareWithField error message
2016-02-12 10:04:30 +01:00
Jenkins for ownCloud f8607ac132 [tx-robot] updated from transifex 2016-02-12 01:56:04 -05:00
Thomas Müller 594ba8695b Merge pull request #22334 from owncloud/files_videoplayer_it_is
Mark files_videoplayer as shipped
2016-02-11 19:08:28 +01:00
Lukas Reschke 2a42167fc9 Mark files_videoplayer as shipped
Ref https://github.com/owncloud/files_video_player/pull/27 + https://github.com/owncloud/files_videoplayer/issues/26#issuecomment-182968638
2016-02-11 19:06:48 +01:00
Thomas Müller fe9215adf6 Merge pull request #22314 from owncloud/fix-mariadb-autotest
Wait until mariadb is up and running
2016-02-11 18:51:58 +01:00
Thomas Müller e3a67d0505 Merge pull request #22320 from owncloud/files_external-crypt
encrypt passwords for files_external
2016-02-11 17:19:29 +01:00
Thomas Müller dfe267424f Merge pull request #22315 from owncloud/update-info-checker-requirements
Update info checker requirements
2016-02-11 14:31:47 +01:00
Thomas Müller 207c1a661b Merge pull request #22264 from owncloud/read-version-from-info.xml-only
No longer evaluate appinfo/version
2016-02-11 14:28:51 +01:00
Thomas Müller 6b635044a7 Use official mariadb docker 2016-02-11 14:17:17 +01:00
Thomas Müller 5d1dfe1d48 Merge pull request #22322 from owncloud/fix-typo
Fix typo
2016-02-11 14:07:40 +01:00
Thomas Müller 4d24929e05 Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors
Remove notification on unshare and on errors
2016-02-11 14:02:44 +01:00
Thomas Müller 27a4c9f625 Merge pull request #22308 from owncloud/shorter-ttl-find-path
Shorter TTL on  findBinaryPath caching
2016-02-11 14:02:24 +01:00
Thomas Müller 26939a2873 Merge pull request #22290 from owncloud/dav-upload-scan-in-lock
scan the file in the write lock when uploading over dav
2016-02-11 14:02:08 +01:00
Robin Appelman 80eb1aada5 encrypt passwords for files_external 2016-02-11 14:00:08 +01:00
Morris Jobke 244118580a Fix typo 2016-02-11 13:59:15 +01:00
Roeland Jago Douma 745bfda41f Fix migration step to avoind invisible shares 2016-02-11 13:29:23 +01:00
Roeland Jago Douma 0284c60c3a Add tests 2016-02-11 13:29:23 +01:00
Roeland Jago Douma 4533cb9c59 Add parent for invisible link shares 2016-02-11 13:29:23 +01:00
Morris Jobke 73e3737777 Merge pull request #22316 from owncloud/fix_22309
Properly check for legacy methods on IShare objects
2016-02-11 13:02:52 +01:00
Joas Schilling 8cfdc62eae Update info checker requirements 2016-02-11 11:54:13 +01:00
Roeland Jago Douma dd630e33ea Properly check for legacy methods
The new shares are completely without parents eventually. But for some
current legacy reasons the methods are still around. But we should
properly check for them.

Fixes #22309
2016-02-11 11:30:52 +01:00
Roeland Jago Douma 2aa206e900 Fix unit tests 2016-02-11 11:21:12 +01:00
Joas Schilling ee080a9bc3 Do not getShare in deleteShare, it's already there when deleting 2016-02-11 11:21:06 +01:00
Thomas Müller ca2755ed6a Wait until mariadb is up and running 2016-02-11 11:09:03 +01:00
Roeland Jago Douma a823485638 Reload list of shares on directory change 2016-02-11 11:06:26 +01:00
Roeland Jago Douma f5be48d81d Calculate the share statuses in js from the OCS Response
Right now this is only done on page load. We should do it on each
directory traversal.
2016-02-11 11:03:11 +01:00
Thomas Müller 06af9b817e Merge pull request #22281 from owncloud/activity-100-unshare-activities
Add translations of unshare activities
2016-02-11 11:01:47 +01:00
Thomas Müller 2efb97ba09 Fixes #13658 2016-02-11 10:53:18 +01:00
Joas Schilling 31c9e047a8 Delete the notification when the owner unshares the remote before the user did anything 2016-02-11 10:41:55 +01:00
Joas Schilling 2263b8b693 Remove the notification if accepting/declining failed because of 404 2016-02-11 10:41:55 +01:00
Jenkins for ownCloud 5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
C Montero-Luque c392cc2b8f 9.0.0 beta 1 2016-02-10 17:31:16 -05:00
Thomas Müller 3184115c3c Merge pull request #22285 from owncloud/fix_22275
Only show link shares for the current user
2016-02-10 20:01:41 +01:00
Lukas Reschke 63671a571e Merge pull request #22297 from owncloud/public-webdavdownloadlink
Revert back to non-webdav download link for public URLs
2016-02-10 19:57:51 +01:00