Commit Graph

15349 Commits

Author SHA1 Message Date
Bjoern Schiessle cd8104dfb0
add brute force protection to 'mount public link' operation
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-19 10:12:46 +01:00
Arthur Schiwon 18a75bec0d
fix and extend behat tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-19 10:04:15 +01:00
John Molakvoæ 2cfedb3623 Merge pull request #3150 from nextcloud/highlight-active-navigation
highlight active navigation entry better, fix #2096
2017-01-19 06:47:30 +01:00
Morris Jobke 3798f842c0
theme app navigation menu highlight color
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-18 21:42:50 -06:00
Lukas Reschke 2d73a003d7 Merge pull request #3081 from nextcloud/2fa-backup-codes-test-coverage
2fa backup codes test coverage
2017-01-19 02:26:39 +01:00
Nextcloud bot f58f3d7aab
[tx-robot] updated from transifex 2017-01-19 01:08:09 +00:00
Arthur Schiwon a515de54e7
LDAP OCS Api for delete config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 23:17:58 +01:00
Arthur Schiwon 689df9a843
LDAP OCS Api for create config
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-18 21:13:23 +01:00
Christoph Wurst 65f303164f fix file ending
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 2f30a71b19 make sure files end with emtpy line
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 85e4febc24 ignore code we're unable to test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 3b4b49fa95 test activity provider
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Christoph Wurst 6f6eb5b301 increase GenericProvider's test coverage
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-18 17:53:58 +01:00
Lukas Reschke be3ec7ffb7
Use DataDownloadResponse
1. As documented
2. No need to show this inline, downloading has security advantages

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-18 17:00:09 +01:00
Lukas Reschke 29d2ca5991 Merge pull request #3078 from nextcloud/2fa-backup-codes-entropy
Increase 2fa backup codes entropy
2017-01-18 16:08:59 +01:00
Joas Schilling 5d1f7e5a7b
Allow subadmins to add people to groups via provisioning api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 14:34:38 +01:00
Joas Schilling d80a4453af
Make sure subadmins can not delete users from their last subadmin group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:56:24 +01:00
Joas Schilling ae77067a07
No need to check the subadmin again
The user needs to be a subadmin of the group,
otherwise they are not allowed to remove anyone from the group

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:43:52 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Morris Jobke 08cdcf8f7f Merge pull request #2776 from nextcloud/prevent-quotes-from-being-a-problem
Escape the name for the jquery selector
2017-01-17 18:40:11 -06:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions
Markdown support for app descriptions
2017-01-17 11:11:16 +01:00
Christoph Wurst 3ee5c7ea4e
minor version bump
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 09:17:56 +01:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Christoph Wurst 6726c98bbd
use constant and clean up unit test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 13:14:15 +01:00
Björn Schießle 6c7a7e0c1a Merge pull request #3033 from nextcloud/share-by-mail-use-display-name
generate correct path for owner and use the display name instead of t…
2017-01-16 12:29:16 +01:00
Christoph Wurst 3b76699c9c
Increase 2fa backup codes entropy
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-16 11:24:03 +01:00
Nextcloud bot 203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Joas Schilling d26b902a13
Fix "broken" app descriptions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-13 18:33:42 +01:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Bjoern Schiessle 27357569b6
generate correct path for owner and use the display name instead of the user id
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-12 12:44:41 +01:00
Nextcloud bot 09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
Christoph Wurst 140555b786
always allow remembered login
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 6f84eb89fc
fix constructor params in failing test
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst 6f74ecd94a
use login hook credentials as fallback
If no session token is available, we can use the credentials provided
by the login hook.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Christoph Wurst e4abb9cb6e
migrate 'password::sessioncredentials' extern storage auth to credential store
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Rodrigo Almeida 4f3da2bee4
Update mobile.css 2017-01-11 09:12:08 +01:00
Bjoern Schiessle fcda3a20f4
create new encryption keys on password reset and backup the old one
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
Morris Jobke b727edf17e Merge pull request #3009 from nextcloud/fix-calendar-todo-event-type
Make sure the used event type and the setting/filter are the same
2017-01-10 14:28:30 +01:00
Roeland Jago Douma a5bf14ada3 Merge pull request #2955 from nextcloud/make-share-by-mail-work-without-linkshares
share by mail should continue to work, even if public links are disabled
2017-01-10 13:06:20 +01:00
Joas Schilling a70a081fff
Make sure the used event type and the setting/filter are the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-10 12:28:55 +01:00
Morris Jobke 97a63ad689 Merge pull request #2982 from nextcloud/better-notification-links
Set the link of the notification on render instead of creation
2017-01-10 10:27:01 +01:00
Roeland Jago Douma b847dfcee9 Merge pull request #2925 from nextcloud/remove-close-wrapper
replace close:// streamwrapper with CallBackWrapper
2017-01-10 10:21:10 +01:00
Joas Schilling b29149402c
Fix update notification tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:09:47 +01:00
Joas Schilling bb84db02cb
Cleanup comment tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
Joas Schilling 315645ada3
Only add the link when the user can follow it.
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:24:09 +01:00
Joas Schilling acbf0d151f
Set the link of the notification on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:59 +01:00
Joas Schilling e675c2a66c
Set the comment link on render instead of creation
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Roeland Jago Douma 6347d97c7f Merge pull request #2512 from nextcloud/cleanup-system-tag-usage
Only allow admins to delete tags
2017-01-06 16:17:09 +01:00
Robin Appelman 5774d3e82c
replace close:// streamwrapper with CallBackWrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-06 15:33:32 +01:00
Morris Jobke 460ef39b18 Merge pull request #2676 from nextcloud/smb-2.0.0
Update icewind/smb to 2.0.0
2017-01-05 17:07:12 +01:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Robin Appelman 8429687788
Update icewind/smb to 2.0.0
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-05 09:16:03 +01:00
Thomas Müller d5d726fc24
Fix generation of birthday, deathdate and anniversary in case where no year is set - which is allowed as per https://tools.ietf.org/html/rfc6350#section-6.2.5 (#26756)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-05 09:00:33 +01:00
Bjoern Schiessle 0c11209d33
allow to access mail shares even if public links are disabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-04 21:23:26 +01:00
Nextcloud bot 2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Nextcloud bot acad4ba93e
[tx-robot] updated from transifex 2017-01-03 01:07:46 +00:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603
Fixed size issues on main detail view and disappearing of share recipients (#26603)
2017-01-02 21:19:43 +01:00
Morris Jobke 47d7d26bda
remove unused parameters and add viewBox
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-02 15:32:16 +01:00
Roeland Jago Douma db3c918adb
Fix legacy caldav endpoints
* CaldavBackend is now endpoint aware (use old style principals on old
endpoint and new onces on new).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 15:02:18 +01:00
Lukas Reschke 3c34b8577c
Add test execution against legacy DAV backend
Since the tests to quite hugely rely on sync tokens being present I also included those in the legacy backend.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-01-02 15:02:18 +01:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 5c50df72b7
[tx-robot] updated from transifex 2017-01-01 01:07:30 +00:00
Nextcloud bot 02eb0f7fa4
[tx-robot] updated from transifex 2016-12-31 01:08:36 +00:00
Roeland Jago Douma 2f235d9693 Merge pull request #2894 from nextcloud/provisioning_api_middleware_tests
Adds provisioning middleware tests
2016-12-30 20:35:30 +01:00
Roeland Jago Douma e13affa29d
Adds provisioning middleware tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-30 14:12:10 +01:00
Nextcloud bot fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Roeland Jago Douma 3256a1c792
Add files_external webdav apache tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-29 12:47:48 +01:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Nextcloud bot bd20139f55
[tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Arthur Schiwon 754760fdbe
mention property to follow same style
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 17:01:58 +01:00
Michael Jobst 969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603)
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 16:56:55 +01:00
Lukas Reschke 56c016946d Merge pull request #2763 from nextcloud/fix_maindetailsview_favorite_star-patch
[downstream] Fix maindetailsview favorite star patch
2016-12-23 16:36:53 +01:00
Christoph Wurst cfada468e6
OC.Uploader does not have a 'state' method, therefore the
dead code can be removed

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-23 15:38:48 +01:00
Roeland Jago Douma 6f96af0fce Merge pull request #2819 from nextcloud/trash-ext-link-uselinkowner
Fallback to share link owner when no owner found
2016-12-23 14:36:34 +01:00
Roeland Jago Douma 886341aca4 Merge pull request #2816 from nextcloud/changing_how_favorites_are_serialized
Return explicit values instead of boolean from sabre (#26654)
2016-12-23 14:36:05 +01:00
Lukas Reschke c5cc0d87a8 Merge pull request #2833 from nextcloud/downstream-26750
Introduce group display name support (#26750)
2016-12-23 13:57:59 +01:00
Vincent Petry 504a1f0d57
Testing app switch to force-enable test user backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-23 12:38:04 +01:00
Lukas Reschke 91c87d3a7a Merge pull request #2820 from nextcloud/testing-md5home
Testing md5home (#26854)
2016-12-23 12:22:15 +01:00
Arthur Schiwon b4d779977a
fix tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-22 19:33:09 +01:00
Vincent Petry 14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Morris Jobke 0886788507 Merge pull request #2815 from nextcloud/fix-plural-files
Just use moment to comupte the time left for the upload - translation…
2016-12-22 15:30:22 +01:00
Morris Jobke bb8b647bd6 Merge pull request #2633 from nextcloud/2fa-activities
two-factor activities
2016-12-22 14:47:15 +01:00
Morris Jobke 6789685c4e Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
Remove config change hook that deletes link shares (#26612)
2016-12-22 14:45:20 +01:00
Thomas Müller aa8755bd4b
Add navigation via info.xml (#26785)
* Read navigation information from info.xml

* Load files navigation elements from info.xml

* Add comment about ignoring the exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 12:34:41 +01:00
Vincent Petry b32e252fb0
Testing md5home (#26854)
* Allow clearing default user backends in config.php

When specifying "user_backends" in config.php, a new option "default"
when set to false will prevent the default user backend to be
registered. The default one is the database backend.
This makes it possible to select exclusive user backends from apps.

* Testing app provides test user backend for alternative homes

The backend provide md5 result to getHome()

* Only md5 the user home when it's not the admin

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 11:03:42 +01:00
Morris Jobke 1588dd0ee0 Merge pull request #2802 from nextcloud/trash-improvements
let the owner restore files if they where moved out of a shared folder
2016-12-22 11:00:25 +01:00
Vincent Petry 34d466b2f6
Fallback to share link owner when no owner found
When creating link shares from external storage, the filesystem cannot
find an owner in some scenarios (ex: system-wide mounts). In such
cases, fall back to using the current user's trashbin which happens to
also be the user who created the link share.

Fixes an issue where this scenario made deletion impossible due to
missing user information.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:48:32 +01:00
Joas Schilling 8f664a00e1 Merge pull request #2803 from nextcloud/hide-notification-for-updates
Hide update notification if notification center is enabled
2016-12-22 10:39:15 +01:00
Sergio Bertolín 928f113361
Return explicit values instead of boolean from sabre (#26654)
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:10:29 +01:00
Morris Jobke f88d615445 Merge pull request #2808 from alantygel/patch-1
Translation string corrected > 1 user
2016-12-22 10:04:35 +01:00
Thomas Müller 2bf4661e40
Just use moment to comupte the time left for the upload - translations are delivered as part of moment.js - fixes #26804
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-22 10:01:58 +01:00
Nextcloud bot 0b64e96c9b
[tx-robot] updated from transifex 2016-12-22 01:07:28 +00:00
Alan Tygel efff51c7a8 Translation string corrected > 1 user 2016-12-21 16:34:24 -03:00
Bjoern Schiessle a1d6f3068a
make code more robust
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 18:02:19 +01:00
Bjoern Schiessle 60810b44bc
check for class name in case class is not loaded
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 17:28:50 +01:00
Bjoern Schiessle 0e4eeab3c1
add a copy to the owners trash bin if another user moves a file out of a shared folder
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-21 17:28:47 +01:00
Morris Jobke d498d0982e
Hide update notification if notification center is enabled
* then the notification center already contains this info

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-12-21 15:44:06 +01:00
Lukas Reschke 591b60d11c Merge pull request #2758 from nextcloud/only-one-dav-backend
Register only one dav backend
2016-12-21 13:03:48 +01:00
Nextcloud bot fe9a38d5b5
[tx-robot] updated from transifex 2016-12-21 01:07:18 +00:00
Lukas Reschke f0bb62f2fe Merge pull request #2273 from nextcloud/fix_invalid_calendar
Add DAV repair step to fix calendar data
2016-12-20 23:09:27 +01:00
Lukas Reschke 1c80307537
Add SMB tests and execute files_external tests
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-20 22:05:33 +01:00
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Joas Schilling e53d0c0d69
Escape the name for the jquery selector
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-20 09:32:47 +01:00
Arthur Schiwon 7887566cff
remove frequent, unimportant log message
Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-19 23:36:11 +01:00
Vincent Petry 000ba6484f
When grouping shares, sort by stime then id (#26777)
If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:38:33 +01:00
Lukas Reschke 450373fd18
Fix indentation
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:55 +01:00
Michael Jobst a7526b9837
Style modifications of favorite star on main detail view (#26658)
* Style modifications of favorite star on main detail view

* Removed unused opacity change on mouse over

* favorite star title fixed

* favorite star opacity should  always be .7

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 17:34:09 +01:00
Vincent Petry 9473ab5c19
Remove config change hook that deletes link shares (#26612)
Seems broken. But also if link shares are not allowed, the link shares
will continue to exist but will be denied.

A future cleanup could be done through a background job.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 16:18:51 +01:00
Thomas Müller 04cf77120c
Fix error when $view is null when being passed into some plugins
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:53:13 +01:00
Thomas Müller 6345748a70
Fix "Call to a member function getUID() on null"
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:18 +01:00
Thomas Müller b19aad88fb
No challenge within federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:10 +01:00
Thomas Müller 4a823188a9
Allow registration of federated auth
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:48:00 +01:00
Thomas Citharel dcbf434841
Register only one dav auth backend
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-19 15:47:52 +01:00
Christoph Wurst 3f4ba2d15d
fix typo
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 15:01:23 +01:00
Lukas Reschke 34fb313466 Merge pull request #2689 from andreas-p/fix-remote-conflict
Fix showConflict
2016-12-19 14:34:56 +01:00
Christoph Wurst 5bad93472d
catch specific BadMethodCallException
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 12:01:32 +01:00
Christoph Wurst ed4017dfb4
fix minor issues
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:48 +01:00
Christoph Wurst 9300312046
push activity when backup codes are generated
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
Christoph Wurst 7ae9442f3d
Publish, parse and filter 2FA activities
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-19 11:59:47 +01:00
pflug c7fc010215 Fix showConflict
use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
2016-12-19 08:11:04 +01:00
Roeland Jago Douma f86f4eb98d Merge pull request #2504 from nextcloud/downstream-ldap-15
Downstream LDAP Range Support
2016-12-16 16:40:04 +01:00
Lukas Reschke 00b4dedef5 Merge pull request #2550 from nextcloud/smb-notify-rename
Fix order of parameters when getting notified of smb renames
2016-12-16 16:11:39 +01:00
Lukas Reschke 511056dd3f Merge pull request #1678 from nextcloud/smb-stat-root
Fix mtimes for share root
2016-12-16 13:41:33 +01:00
Lukas Reschke 6fd421cc3c Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity
Remove leading slash from sharing activity
2016-12-16 13:20:27 +01:00
Roeland Jago Douma 82d76fbe96
Fix TodoTest
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-16 11:50:50 +01:00
Roeland Jago Douma 4fdefef7e8 Merge pull request #2625 from nextcloud/fix-todo-filter
Fix the Todos filter
2016-12-16 08:20:00 +01:00
Lukas Reschke 5b474e72d5 Merge pull request #2673 from nextcloud/shared-scanner-unmasked
use unmasked permissions in shared scanner
2016-12-15 15:54:32 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Morris Jobke 237791e315 Merge pull request #2674 from nextcloud/lookup-server-connector-12
mark nc12 as supported for the lookup_server_connector
2016-12-14 12:31:27 -06:00
Roeland Jago Douma 67f65677a1 Merge pull request #2665 from nextcloud/remove-db-class-and-interface
Remove IDb interface which was deprecated for 3 years already
2016-12-14 19:05:41 +01:00
Robin Appelman fc3b2f1139
mark nc12 as supporter
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 11:58:57 -06:00
Lukas Reschke 8a00638425
Don't set Content-Disposition header if one already exists
If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

Fixes https://github.com/nextcloud/server/issues/1992

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-14 17:35:27 +01:00
Robin Appelman 5d0897b8d7
use unmasked permissions in shared scanner
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-14 14:37:51 +01:00
Joas Schilling bc3da3a8f5
Remove IDb interface which was deprecated for 3 years already
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-14 11:42:16 +01:00
Roeland Jago Douma cd1929382f Merge pull request #2654 from nextcloud/increase-master-version
Update app versions and requirements
2016-12-14 11:20:58 +01:00
Roeland Jago Douma 9e353f6289
Fix overwriting parameter
Fixes #2641

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-13 22:28:09 +01:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01:00
Lukas Reschke edd01e3ce4 Merge pull request #2637 from nextcloud/mount-cache-storageid
also compare storage ids when checking for changed mounts
2016-12-13 14:02:49 +01:00
Robin Appelman bbe24d29ca
reuse cacheentry
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-13 12:30:29 +01:00
Lukas Reschke e49088315e Merge pull request #2615 from nextcloud/daita-sharecontroller
Download a file in a subfolder in a sharedlink is not working
2016-12-12 18:28:06 +01:00
Maxence Lange 43374292b1 update phpdoc
Signed-off-by: Maxence Lange <maxence@pontapreta.net>
2016-12-12 16:15:13 -01:00
Lukas Reschke 6cd421e603 Merge pull request #2620 from nextcloud/theming-externalfiles
Show theming icons on external storage folders
2016-12-12 16:04:48 +01:00
Joas Schilling 89ba394c89
Fix the Todos filter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-12 15:26:28 +01:00
Bjoern Schiessle 91303469e0
improve wording of admin settings to enable search on the public address book
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-12 13:55:12 +01:00
Julius Haertl b12db1b494
Show theming icons on external storage folders
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-12-12 12:18:38 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00