]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoRemove legacy home tests 2846/head
Vincent Petry [Wed, 21 Dec 2016 14:06:59 +0000 (15:06 +0100)]
Remove legacy home tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoNuke the legacy storage fallback from orbit
Vincent Petry [Wed, 21 Dec 2016 10:10:14 +0000 (11:10 +0100)]
Nuke the legacy storage fallback from orbit

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2820 from nextcloud/testing-md5home
Lukas Reschke [Fri, 23 Dec 2016 11:22:15 +0000 (12:22 +0100)]
Merge pull request #2820 from nextcloud/testing-md5home

Testing md5home (#26854)

7 years agoMerge pull request #2823 from nextcloud/downstream-integration-tests-adding-report
Morris Jobke [Thu, 22 Dec 2016 14:49:15 +0000 (15:49 +0100)]
Merge pull request #2823 from nextcloud/downstream-integration-tests-adding-report

Downstream integration tests adding report

7 years agoMerge pull request #2815 from nextcloud/fix-plural-files
Morris Jobke [Thu, 22 Dec 2016 14:30:22 +0000 (15:30 +0100)]
Merge pull request #2815 from nextcloud/fix-plural-files

Just use moment to comupte the time left for the upload - translation…

7 years agoMerge pull request #2828 from nextcloud/only-show-version
Roeland Jago Douma [Thu, 22 Dec 2016 14:21:10 +0000 (15:21 +0100)]
Merge pull request #2828 from nextcloud/only-show-version

Only show version in settings

7 years agoMerge pull request #2633 from nextcloud/2fa-activities
Morris Jobke [Thu, 22 Dec 2016 13:47:15 +0000 (14:47 +0100)]
Merge pull request #2633 from nextcloud/2fa-activities

two-factor activities

7 years agoMerge pull request #2759 from nextcloud/kill-appconfig-delete-share-link
Morris Jobke [Thu, 22 Dec 2016 13:45:20 +0000 (14:45 +0100)]
Merge pull request #2759 from nextcloud/kill-appconfig-delete-share-link

Remove config change hook that deletes link shares (#26612)

7 years agoOnly show version in settings - do not list channel 2828/head
Morris Jobke [Thu, 22 Dec 2016 13:19:29 +0000 (14:19 +0100)]
Only show version in settings - do not list channel

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdded functionaly for not shared elements 2823/head
Sergio Bertolin [Thu, 24 Nov 2016 14:13:58 +0000 (14:13 +0000)]
Added functionaly for not shared elements

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdded more favorites report cases
Sergio Bertolin [Thu, 24 Nov 2016 12:00:56 +0000 (12:00 +0000)]
Added more favorites report cases

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdded flexibility to properties
Sergio Bertolin [Wed, 23 Nov 2016 17:43:57 +0000 (17:43 +0000)]
Added flexibility to properties

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFixed failing problems
Sergio Bertolin [Wed, 23 Nov 2016 12:02:09 +0000 (12:02 +0000)]
Fixed failing problems

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoWIP commit, adding report support
Sergio Bertolin [Wed, 23 Nov 2016 09:43:55 +0000 (09:43 +0000)]
WIP commit, adding report support

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2788 from nextcloud/memcached-ci
Lukas Reschke [Thu, 22 Dec 2016 11:06:42 +0000 (12:06 +0100)]
Merge pull request #2788 from nextcloud/memcached-ci

Add Memcached CI

7 years agoMerge pull request #2761 from nextcloud/dont-resolve-shares-if-public-sharing-is...
Björn Schießle [Thu, 22 Dec 2016 10:57:05 +0000 (11:57 +0100)]
Merge pull request #2761 from nextcloud/dont-resolve-shares-if-public-sharing-is-disabled

Don't resolve public share token if public sharing is disabled

7 years agoMerge pull request #2563 from nextcloud/fix-password-reset
Morris Jobke [Thu, 22 Dec 2016 10:18:04 +0000 (11:18 +0100)]
Merge pull request #2563 from nextcloud/fix-password-reset

fix password reset if encryption is enabled

7 years agoTesting md5home (#26854) 2820/head
Vincent Petry [Thu, 22 Dec 2016 08:31:35 +0000 (09:31 +0100)]
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>
7 years agono need to throw a exception we catch two lines later 2761/head
Bjoern Schiessle [Thu, 22 Dec 2016 09:59:27 +0000 (10:59 +0100)]
no need to throw a exception we catch two lines later

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoMerge pull request #2802 from nextcloud/trash-improvements
Morris Jobke [Thu, 22 Dec 2016 10:00:25 +0000 (11:00 +0100)]
Merge pull request #2802 from nextcloud/trash-improvements

let the owner restore files if they where moved out of a shared folder

7 years agoMerge pull request #2803 from nextcloud/hide-notification-for-updates
Joas Schilling [Thu, 22 Dec 2016 09:39:15 +0000 (10:39 +0100)]
Merge pull request #2803 from nextcloud/hide-notification-for-updates

Hide update notification if notification center is enabled

7 years agoMerge pull request #2811 from nextcloud/extended_apcu_cas
Lukas Reschke [Thu, 22 Dec 2016 09:09:16 +0000 (10:09 +0100)]
Merge pull request #2811 from nextcloud/extended_apcu_cas

Extend APCu test with int CAS

7 years agoMerge pull request #2808 from alantygel/patch-1
Morris Jobke [Thu, 22 Dec 2016 09:04:35 +0000 (10:04 +0100)]
Merge pull request #2808 from alantygel/patch-1

Translation string corrected > 1 user

7 years agoJust use moment to comupte the time left for the upload - translations are delivered... 2815/head
Thomas Müller [Mon, 19 Dec 2016 14:40:36 +0000 (15:40 +0100)]
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>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 22 Dec 2016 01:07:28 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoExtend APCu test with int CAS 2811/head
Roeland Jago Douma [Wed, 21 Dec 2016 20:06:29 +0000 (21:06 +0100)]
Extend APCu test with int CAS

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDisable memcached binary protocol 2788/head
Roeland Jago Douma [Tue, 20 Dec 2016 20:57:43 +0000 (21:57 +0100)]
Disable memcached binary protocol

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd Memcached CI
Roeland Jago Douma [Tue, 20 Dec 2016 20:11:00 +0000 (21:11 +0100)]
Add Memcached CI

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoTranslation string corrected > 1 user 2808/head
Alan Tygel [Wed, 21 Dec 2016 19:34:24 +0000 (16:34 -0300)]
Translation string corrected > 1 user

7 years agomake code more robust 2802/head
Bjoern Schiessle [Wed, 21 Dec 2016 16:43:14 +0000 (17:43 +0100)]
make code more robust

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agocheck for class name in case class is not loaded
Bjoern Schiessle [Wed, 21 Dec 2016 15:37:03 +0000 (16:37 +0100)]
check for class name in case class is not loaded

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoadd a copy to the owners trash bin if another user moves a file out of a shared folder
Bjoern Schiessle [Wed, 21 Dec 2016 14:42:57 +0000 (15:42 +0100)]
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>
7 years agoMerge pull request #2792 from nextcloud/update-drone-images
Morris Jobke [Wed, 21 Dec 2016 14:52:51 +0000 (15:52 +0100)]
Merge pull request #2792 from nextcloud/update-drone-images

update drone images to latest version

7 years agoHide update notification if notification center is enabled 2803/head
Morris Jobke [Wed, 21 Dec 2016 14:44:06 +0000 (15:44 +0100)]
Hide update notification if notification center is enabled

* then the notification center already contains this info

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2796 from nextcloud/set-exit-code-to-1-if-test-is-failing
Morris Jobke [Wed, 21 Dec 2016 14:18:09 +0000 (15:18 +0100)]
Merge pull request #2796 from nextcloud/set-exit-code-to-1-if-test-is-failing

Set exit code to 1 if integration test is failing

7 years agoMerge pull request #2758 from nextcloud/only-one-dav-backend
Lukas Reschke [Wed, 21 Dec 2016 12:03:48 +0000 (13:03 +0100)]
Merge pull request #2758 from nextcloud/only-one-dav-backend

Register only one dav backend

7 years agoMerge pull request #2724 from nextcloud/fix-23591
Lukas Reschke [Wed, 21 Dec 2016 12:03:13 +0000 (13:03 +0100)]
Merge pull request #2724 from nextcloud/fix-23591

[downstream] Report failures for SignApp and SignCore

7 years agoMerge pull request #2784 from nextcloud/2fa_command_tests
Lukas Reschke [Wed, 21 Dec 2016 11:32:36 +0000 (12:32 +0100)]
Merge pull request #2784 from nextcloud/2fa_command_tests

Add tests for 2FA commands

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 21 Dec 2016 01:07:18 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoSet exit code to 1 if integration test is failing 2796/head
Lukas Reschke [Tue, 20 Dec 2016 22:39:56 +0000 (23:39 +0100)]
Set exit code to 1 if integration test is failing

Before it just checked the unit tests and ignored the integration test results. See https://drone.nextcloud.com/nextcloud/server/3374/35 for details.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoupdate drone images to latest version 2792/head
Morris Jobke [Tue, 20 Dec 2016 22:34:14 +0000 (23:34 +0100)]
update drone images to latest version

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2790 from nextcloud/update-integration-test-image
Morris Jobke [Tue, 20 Dec 2016 22:24:18 +0000 (23:24 +0100)]
Merge pull request #2790 from nextcloud/update-integration-test-image

Update integration test image

7 years agoMerge pull request #2273 from nextcloud/fix_invalid_calendar
Lukas Reschke [Tue, 20 Dec 2016 22:09:27 +0000 (23:09 +0100)]
Merge pull request #2273 from nextcloud/fix_invalid_calendar

Add DAV repair step to fix calendar data

7 years agoMerge pull request #2789 from nextcloud/add-smb-tests
Lukas Reschke [Tue, 20 Dec 2016 22:03:13 +0000 (23:03 +0100)]
Merge pull request #2789 from nextcloud/add-smb-tests

Add SMB tests execution and execute files_external tests

7 years agoRun coverage 2789/head
Lukas Reschke [Tue, 20 Dec 2016 21:10:09 +0000 (22:10 +0100)]
Run coverage

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd SMB tests and execute files_external tests
Lukas Reschke [Mon, 19 Dec 2016 20:40:08 +0000 (21:40 +0100)]
Add SMB tests and execute files_external tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate integration test image 2790/head
Lukas Reschke [Tue, 20 Dec 2016 20:56:16 +0000 (21:56 +0100)]
Update integration test image

Updates the composer dependencies so running the tests should now be faster again…

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2719 from nextcloud/behat-transferownership
Lukas Reschke [Tue, 20 Dec 2016 20:50:19 +0000 (21:50 +0100)]
Merge pull request #2719 from nextcloud/behat-transferownership

[downstream] Behat transferownership

7 years agoMerge pull request #2769 from nextcloud/improve_user_user_coverage
Morris Jobke [Tue, 20 Dec 2016 15:50:44 +0000 (16:50 +0100)]
Merge pull request #2769 from nextcloud/improve_user_user_coverage

Improve OC\User\User coverage

7 years agoAdd tests for 2FA commands 2784/head
Roeland Jago Douma [Tue, 20 Dec 2016 15:35:42 +0000 (16:35 +0100)]
Add tests for 2FA commands

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2765 from nextcloud/kill-repairlegacystorages
Christoph Wurst [Tue, 20 Dec 2016 14:43:27 +0000 (15:43 +0100)]
Merge pull request #2765 from nextcloud/kill-repairlegacystorages

[downstream] Remove obsolete RepairLegacyStorages repair step

7 years agofix 2fa activities tests 2633/head
Christoph Wurst [Tue, 20 Dec 2016 14:23:36 +0000 (15:23 +0100)]
fix 2fa activities tests

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 20 Dec 2016 12:02:31 +0000 (12:02 +0000)]
[tx-robot] updated from transifex

7 years agoImprove OC\User\User coverage 2769/head
Roeland Jago Douma [Mon, 19 Dec 2016 20:24:36 +0000 (21:24 +0100)]
Improve OC\User\User coverage

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #2774 from nextcloud/fix-2585
Lukas Reschke [Tue, 20 Dec 2016 10:03:54 +0000 (11:03 +0100)]
Merge pull request #2774 from nextcloud/fix-2585

remove frequent, unimportant log message

7 years agoOnly don't resolve public links
Roeland Jago Douma [Tue, 20 Dec 2016 07:52:31 +0000 (08:52 +0100)]
Only don't resolve public links

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDon't resolve public share token if public sharing is disabled
Lukas Reschke [Mon, 19 Dec 2016 16:15:55 +0000 (17:15 +0100)]
Don't resolve public share token if public sharing is disabled

Otherwise disabling sharing does prevent access to the view controllers but one can still access the shares using the public preview route or the public WebDAV endpoint.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoremove frequent, unimportant log message 2774/head
Arthur Schiwon [Mon, 19 Dec 2016 22:35:56 +0000 (23:35 +0100)]
remove frequent, unimportant log message

Fixes #2585

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #2764 from nextcloud/fix-groupshare-sharetimesort
Christoph Wurst [Mon, 19 Dec 2016 20:40:42 +0000 (21:40 +0100)]
Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort

[downstream] When grouping shares, sort by stime then id (#26777)

7 years agoMerge pull request #2762 from nextcloud/add-js-computerFileSize
Lukas Reschke [Mon, 19 Dec 2016 19:01:22 +0000 (20:01 +0100)]
Merge pull request #2762 from nextcloud/add-js-computerFileSize

[downstream] Add js computer file size

7 years agoUpdate autoloader files 2765/head
Lukas Reschke [Mon, 19 Dec 2016 18:46:18 +0000 (19:46 +0100)]
Update autoloader files

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRemove obsolete RepairLegacyStorages repair step
Vincent Petry [Tue, 6 Dec 2016 16:35:57 +0000 (17:35 +0100)]
Remove obsolete RepairLegacyStorages repair step

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix finding transferred folder in integration tests 2719/head
Vincent Petry [Mon, 14 Nov 2016 11:06:01 +0000 (12:06 +0100)]
Fix finding transferred folder in integration tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoWhen grouping shares, sort by stime then id (#26777) 2764/head
Vincent Petry [Tue, 6 Dec 2016 22:37:57 +0000 (23:37 +0100)]
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>
7 years agoVerify input, add more unit tests 2762/head
Patrick Paysant [Wed, 7 Dec 2016 10:43:44 +0000 (11:43 +0100)]
Verify input, add more unit tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd test for unparseable string
Patrick Paysant [Wed, 7 Dec 2016 10:05:07 +0000 (11:05 +0100)]
Add test for unparseable string

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoImplements all comments from @PVince81
Patrick Paysant [Wed, 7 Dec 2016 10:03:15 +0000 (11:03 +0100)]
Implements all comments from @PVince81

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdding computerFileSize in OC.Util
Patrick Paysant [Wed, 7 Dec 2016 09:38:54 +0000 (10:38 +0100)]
Adding computerFileSize in OC.Util

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2757 from nextcloud/cron-5.6
Lukas Reschke [Mon, 19 Dec 2016 16:22:10 +0000 (17:22 +0100)]
Merge pull request #2757 from nextcloud/cron-5.6

Also check in cron for old php version

7 years agoRemove config change hook that deletes link shares (#26612) 2759/head
Vincent Petry [Mon, 14 Nov 2016 08:34:14 +0000 (09:34 +0100)]
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>
7 years agoAdjust integration test to Nextcloud branding 2758/head
Lukas Reschke [Mon, 19 Dec 2016 15:12:17 +0000 (16:12 +0100)]
Adjust integration test to Nextcloud branding

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix error when $view is null when being passed into some plugins
Thomas Müller [Tue, 8 Nov 2016 09:03:25 +0000 (10:03 +0100)]
Fix error when $view is null when being passed into some plugins

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix "Call to a member function getUID() on null"
Thomas Müller [Thu, 20 Oct 2016 10:52:57 +0000 (12:52 +0200)]
Fix "Call to a member function getUID() on null"

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoNo challenge within federated auth
Thomas Müller [Thu, 20 Oct 2016 10:52:24 +0000 (12:52 +0200)]
No challenge within federated auth

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAllow registration of federated auth
Thomas Müller [Thu, 20 Oct 2016 10:51:54 +0000 (12:51 +0200)]
Allow registration of federated auth

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRegister only one dav auth backend
Thomas Citharel [Wed, 12 Oct 2016 10:36:40 +0000 (12:36 +0200)]
Register only one dav auth backend

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd test for duplicate 401 headers on DAV
Vincent Petry [Tue, 22 Nov 2016 17:24:36 +0000 (18:24 +0100)]
Add test for duplicate 401 headers on DAV

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the...
Lukas Reschke [Mon, 19 Dec 2016 14:38:45 +0000 (15:38 +0100)]
Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the-space

Use a form so firefox doesn't try to save the space as a password

7 years agoAdd proper tests 2724/head
Lukas Reschke [Mon, 19 Dec 2016 14:35:31 +0000 (15:35 +0100)]
Add proper tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAlso check in cron for old php version 2757/head
Roeland Jago Douma [Mon, 19 Dec 2016 14:29:52 +0000 (15:29 +0100)]
Also check in cron for old php version

Fixes #2756

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agofix typo
Christoph Wurst [Mon, 19 Dec 2016 14:01:23 +0000 (15:01 +0100)]
fix typo

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #2754 from nextcloud/activities-manager-publish-exception
Robin Appelman [Mon, 19 Dec 2016 14:00:17 +0000 (15:00 +0100)]
Merge pull request #2754 from nextcloud/activities-manager-publish-exception

Activities IManager throws an BadMethodCallException

7 years agoMerge pull request #2689 from andreas-p/fix-remote-conflict
Lukas Reschke [Mon, 19 Dec 2016 13:34:56 +0000 (14:34 +0100)]
Merge pull request #2689 from andreas-p/fix-remote-conflict

Fix showConflict

7 years agoActivities IManager throws an BadMethodCallException 2754/head
Christoph Wurst [Mon, 19 Dec 2016 13:15:19 +0000 (14:15 +0100)]
Activities IManager throws an BadMethodCallException

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoAdjust to Nextcloud changes
Lukas Reschke [Fri, 16 Dec 2016 16:29:27 +0000 (17:29 +0100)]
Adjust to Nextcloud changes

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd transfer ownership integration tests (#26543)
Vincent Petry [Mon, 7 Nov 2016 21:52:07 +0000 (22:52 +0100)]
Add transfer ownership integration tests (#26543)

* Add transfer ownership integration tests

* Added more transfer ownership tests and OCC checks

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUse a form so firefox doesn't try to save the space as a password 2752/head
Joas Schilling [Mon, 19 Dec 2016 11:43:31 +0000 (12:43 +0100)]
Use a form so firefox doesn't try to save the space as a password

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agocatch specific BadMethodCallException
Christoph Wurst [Mon, 19 Dec 2016 11:01:32 +0000 (12:01 +0100)]
catch specific BadMethodCallException

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agofix minor issues
Christoph Wurst [Tue, 13 Dec 2016 14:15:14 +0000 (15:15 +0100)]
fix minor issues

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agopush activity when backup codes are generated
Christoph Wurst [Tue, 13 Dec 2016 09:47:48 +0000 (10:47 +0100)]
push activity when backup codes are generated

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoPublish, parse and filter 2FA activities
Christoph Wurst [Tue, 13 Dec 2016 09:30:08 +0000 (10:30 +0100)]
Publish, parse and filter 2FA activities

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoMerge pull request #2727 from nextcloud/fix-colon-issue
Roeland Jago Douma [Mon, 19 Dec 2016 09:19:15 +0000 (10:19 +0100)]
Merge pull request #2727 from nextcloud/fix-colon-issue

[downstream] Fix colon issue

7 years agoMerge pull request #2721 from nextcloud/ocs-die-on-exception
Roeland Jago Douma [Mon, 19 Dec 2016 07:38:02 +0000 (08:38 +0100)]
Merge pull request #2721 from nextcloud/ocs-die-on-exception

[downstream] Die in OCS v1.php on exception

7 years agoMerge pull request #2723 from nextcloud/integrity-exit-code
Roeland Jago Douma [Mon, 19 Dec 2016 07:37:43 +0000 (08:37 +0100)]
Merge pull request #2723 from nextcloud/integrity-exit-code

[downstream] Return 1 if integrity check is failed. Fixes #22806

7 years agoFix showConflict 2689/head
pflug [Thu, 15 Dec 2016 09:19:55 +0000 (10:19 +0100)]
Fix showConflict

use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>
7 years agoMerge pull request #2726 from nextcloud/check-all-channels
Christoph Wurst [Sun, 18 Dec 2016 22:12:57 +0000 (23:12 +0100)]
Merge pull request #2726 from nextcloud/check-all-channels

[downstream] Consider all channel except blank and git to be signed

7 years agoMerge pull request #2735 from nextcloud/fix-settingsmenu
Christoph Wurst [Sun, 18 Dec 2016 19:50:20 +0000 (20:50 +0100)]
Merge pull request #2735 from nextcloud/fix-settingsmenu

Adjust shadows and fix positioning in header menus

7 years agoAdjust shadows and fix positioning 2735/head
Julius Haertl [Sat, 17 Dec 2016 19:05:57 +0000 (20:05 +0100)]
Adjust shadows and fix positioning

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoUpdate third-party ref for new sabre/uri version 2727/head
Lukas Reschke [Fri, 16 Dec 2016 17:15:13 +0000 (18:15 +0100)]
Update third-party ref for new sabre/uri version

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2725 from nextcloud/memcached-connect-once
Roeland Jago Douma [Sat, 17 Dec 2016 18:31:31 +0000 (19:31 +0100)]
Merge pull request #2725 from nextcloud/memcached-connect-once

[downstream] Set options, then add servers