]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMerge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation
Roeland Jago Douma [Fri, 14 Apr 2017 06:15:55 +0000 (08:15 +0200)]
Merge pull request #4346 from nextcloud/properly-do-bruteforce-protection-via-annotation

Make BruteForceProtection annotation more clever

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 14 Apr 2017 00:07:36 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMake BruteForceProtection annotation more clever 4346/head
Lukas Reschke [Thu, 13 Apr 2017 20:50:44 +0000 (22:50 +0200)]
Make BruteForceProtection annotation more clever

This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.

Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4326 from nextcloud/downstream-27562
Morris Jobke [Thu, 13 Apr 2017 18:11:47 +0000 (13:11 -0500)]
Merge pull request #4326 from nextcloud/downstream-27562

Reorder the entries of the log for easier reading

7 years agoMerge pull request #4308 from nextcloud/lost-password-email
Lukas Reschke [Thu, 13 Apr 2017 18:02:15 +0000 (20:02 +0200)]
Merge pull request #4308 from nextcloud/lost-password-email

Update email template for lost password email

7 years agoMerge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login
Morris Jobke [Thu, 13 Apr 2017 17:16:38 +0000 (12:16 -0500)]
Merge pull request #2424 from nextcloud/fix-login-controller-test-consolidate-login

Fix login controller test and consolidate login

7 years agoImprove PHPDoc 2424/head
Morris Jobke [Thu, 13 Apr 2017 17:16:12 +0000 (12:16 -0500)]
Improve PHPDoc

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4337 from nextcloud/fix-adblock-share-icon
Morris Jobke [Thu, 13 Apr 2017 17:10:37 +0000 (12:10 -0500)]
Merge pull request #4337 from nextcloud/fix-adblock-share-icon

Fix AdBlock blocking share icon, ref #866

7 years agoUse constants 4326/head
Joas Schilling [Wed, 12 Apr 2017 11:04:28 +0000 (13:04 +0200)]
Use constants

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4341 from nextcloud/local-link-explanation
Morris Jobke [Thu, 13 Apr 2017 17:01:57 +0000 (12:01 -0500)]
Merge pull request #4341 from nextcloud/local-link-explanation

Explain local link

7 years agoExplain local link 4341/head
Jos Poortvliet [Thu, 13 Apr 2017 09:30:35 +0000 (11:30 +0200)]
Explain local link

The local link is a clever thing and the clients should support this imho but it might not be clear to all users. For one, the term 'local link' is a bit odd. Local with respect to what? It links directly to the file or folder, so direct link seems to make more sense to me. And we should explain the difference with a public link. So this PR:
* renames local link to direct link
* adds a short explanation, noting it only works for users who have access to this file/folder.

As other links are called public link you could also consider calling this 'private link', I suppose. But the links we sent by mail to ppl could also be called 'private link' (they are for one user, who git it by email) so I think it might be confusing. What do @nextcloud/designers think?

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4336 from nextcloud/add-ratelimiting
Lukas Reschke [Thu, 13 Apr 2017 16:53:56 +0000 (18:53 +0200)]
Merge pull request #4336 from nextcloud/add-ratelimiting

Add support for ratelimiting via annotations

7 years agoMerge pull request #4342 from nextcloud/update-certificate-bundle
Morris Jobke [Thu, 13 Apr 2017 15:40:12 +0000 (10:40 -0500)]
Merge pull request #4342 from nextcloud/update-certificate-bundle

Update CA bundle

7 years agoMerge pull request #4344 from nextcloud/dont-load-handlebars
Roeland Jago Douma [Thu, 13 Apr 2017 14:08:29 +0000 (16:08 +0200)]
Merge pull request #4344 from nextcloud/dont-load-handlebars

Don't load handlebars in template

7 years agoDon't load handlebars in template 4344/head
Lukas Reschke [Thu, 13 Apr 2017 12:01:21 +0000 (14:01 +0200)]
Don't load handlebars in template

It's already loaded in core.json

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4313 from nextcloud/ldap-name-change
Lukas Reschke [Thu, 13 Apr 2017 10:28:24 +0000 (12:28 +0200)]
Merge pull request #4313 from nextcloud/ldap-name-change

Change LDAP method names

7 years agoRemove expired attempts 4336/head
Lukas Reschke [Wed, 12 Apr 2017 21:00:02 +0000 (23:00 +0200)]
Remove expired attempts

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd tests for multiple parameters
Lukas Reschke [Wed, 12 Apr 2017 20:26:09 +0000 (22:26 +0200)]
Add tests for multiple parameters

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoEnable testing app in CI step
Lukas Reschke [Wed, 12 Apr 2017 20:19:45 +0000 (22:19 +0200)]
Enable testing app in CI step

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate static autoloadermap
Lukas Reschke [Wed, 12 Apr 2017 20:17:59 +0000 (22:17 +0200)]
Update static autoloadermap

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMove to dedicated MiddleWare
Lukas Reschke [Wed, 12 Apr 2017 20:14:11 +0000 (22:14 +0200)]
Move to dedicated MiddleWare

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix .drone.yml
Lukas Reschke [Wed, 12 Apr 2017 19:53:47 +0000 (21:53 +0200)]
Fix .drone.yml

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd isset() as it can be an empty result
Lukas Reschke [Wed, 12 Apr 2017 19:37:10 +0000 (21:37 +0200)]
Add isset() as it can be an empty result

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRegister in ServerContainer
Lukas Reschke [Wed, 12 Apr 2017 19:27:40 +0000 (21:27 +0200)]
Register in ServerContainer

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd support for ratelimiting via annotations
Lukas Reschke [Wed, 12 Apr 2017 18:32:48 +0000 (20:32 +0200)]
Add support for ratelimiting via annotations

This allows adding rate limiting via annotations to controllers, as one example:

```
@UserRateThrottle(limit=5, period=100)
@AnonRateThrottle(limit=1, period=100)
```

Would mean that logged-in users can access the page 5 times within 100 seconds, and anonymous users 1 time within 100 seconds. If only an AnonRateThrottle is specified that one will also be applied to logged-in users.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate CA bundle 4342/head
Lukas Reschke [Thu, 13 Apr 2017 09:55:12 +0000 (11:55 +0200)]
Update CA bundle

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4340 from nextcloud/remove-invalid-route
Roeland Jago Douma [Thu, 13 Apr 2017 09:26:05 +0000 (11:26 +0200)]
Merge pull request #4340 from nextcloud/remove-invalid-route

Remove invalid route

7 years agoRemove invalid route 4340/head
Lukas Reschke [Thu, 13 Apr 2017 09:05:44 +0000 (11:05 +0200)]
Remove invalid route

Said file doesn't exist anymore and accessing it would just return a 500

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3966 from nextcloud/downstream-26570
Lukas Reschke [Thu, 13 Apr 2017 08:51:09 +0000 (10:51 +0200)]
Merge pull request #3966 from nextcloud/downstream-26570

Override config.php values through environment variables

7 years agoMerge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login
Morris Jobke [Thu, 13 Apr 2017 06:04:11 +0000 (01:04 -0500)]
Merge pull request #3043 from nextcloud/issue-3038-no-logentry-on-email-login

Dont create a log entry on email login

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 13 Apr 2017 00:08:02 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4338 from nextcloud/handlebars-min
Lukas Reschke [Wed, 12 Apr 2017 21:14:12 +0000 (23:14 +0200)]
Merge pull request #4338 from nextcloud/handlebars-min

Move to handlebars.min.js

7 years agoMove to handlebars.min.js 4338/head
Roeland Jago Douma [Wed, 12 Apr 2017 20:22:38 +0000 (22:22 +0200)]
Move to handlebars.min.js

core.js is now below 1mb!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate email template for lost password email 4308/head
Morris Jobke [Tue, 11 Apr 2017 22:24:58 +0000 (17:24 -0500)]
Update email template for lost password email

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4307 from nextcloud/sharing-emails
Roeland Jago Douma [Wed, 12 Apr 2017 19:23:11 +0000 (21:23 +0200)]
Merge pull request #4307 from nextcloud/sharing-emails

New emails for sharebymail

7 years agoMerge pull request #4335 from nextcloud/jquery-ui-min
Lukas Reschke [Wed, 12 Apr 2017 18:58:05 +0000 (20:58 +0200)]
Merge pull request #4335 from nextcloud/jquery-ui-min

Moved to jquery-ui.custom.min.js

7 years agoMerge pull request #4282 from nextcloud/oci-connect-string
Morris Jobke [Wed, 12 Apr 2017 18:11:00 +0000 (13:11 -0500)]
Merge pull request #4282 from nextcloud/oci-connect-string

use the same oci connectstring in all code paths

7 years agoMoved to jquery-ui.custom.min.js 4335/head
Roeland Jago Douma [Wed, 12 Apr 2017 18:03:00 +0000 (20:03 +0200)]
Moved to jquery-ui.custom.min.js

Shaves off about 200kb of the default loaded js libs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4306 from nextcloud/followup-3905
Roeland Jago Douma [Wed, 12 Apr 2017 17:57:16 +0000 (19:57 +0200)]
Merge pull request #4306 from nextcloud/followup-3905

Favorites integration tests for shared files

7 years agoMerge pull request #4331 from nextcloud/query-builder-sum
Morris Jobke [Wed, 12 Apr 2017 17:55:09 +0000 (12:55 -0500)]
Merge pull request #4331 from nextcloud/query-builder-sum

Add sum() to the query function builder

7 years agoFix unit tests 4307/head
Morris Jobke [Wed, 12 Apr 2017 17:34:42 +0000 (12:34 -0500)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFavorites integration tests for shared files 4306/head
Morris Jobke [Tue, 11 Apr 2017 20:00:37 +0000 (15:00 -0500)]
Favorites integration tests for shared files

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4329 from nextcloud/move-out-shared-folder
Morris Jobke [Wed, 12 Apr 2017 16:44:26 +0000 (11:44 -0500)]
Merge pull request #4329 from nextcloud/move-out-shared-folder

Fix moving files out of a shared folder

7 years agoDont add click-button text for plaintext mails
Joas Schilling [Wed, 12 Apr 2017 13:33:35 +0000 (15:33 +0200)]
Dont add click-button text for plaintext mails

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoNo newlines when heading is empty
Joas Schilling [Wed, 12 Apr 2017 13:33:14 +0000 (15:33 +0200)]
No newlines when heading is empty

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agomake the plain text footer standard compliant and add a space after '--'. It also...
Bjoern Schiessle [Wed, 12 Apr 2017 10:43:55 +0000 (12:43 +0200)]
make the plain text footer standard compliant and add a space after '--'. It also adds a line break in front so that there is some spacing between the mail body and the footer

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoUse instance name as alt-text
Joas Schilling [Wed, 12 Apr 2017 09:52:58 +0000 (11:52 +0200)]
Use instance name as alt-text

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't duplicate the sentence with the header
Joas Schilling [Wed, 12 Apr 2017 09:52:33 +0000 (11:52 +0200)]
Don't duplicate the sentence with the header

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoUse new email design for sharebymail emails
Morris Jobke [Tue, 11 Apr 2017 21:18:31 +0000 (16:18 -0500)]
Use new email design for sharebymail emails

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoProperly escape heading, body and button text
Morris Jobke [Tue, 11 Apr 2017 21:17:44 +0000 (16:17 -0500)]
Properly escape heading, body and button text

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd addBodyButton to add a single button to email templates
Morris Jobke [Tue, 11 Apr 2017 21:13:34 +0000 (16:13 -0500)]
Add addBodyButton to add a single button to email templates

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoChange LDAP method names 4313/head
Morris Jobke [Wed, 12 Apr 2017 04:21:04 +0000 (23:21 -0500)]
Change LDAP method names

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd sub() to the query function builder 4331/head
Robin Appelman [Wed, 12 Apr 2017 14:09:35 +0000 (16:09 +0200)]
Add sub() to the query function builder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4325 from nextcloud/downstream-27522
Roeland Jago Douma [Wed, 12 Apr 2017 14:04:03 +0000 (16:04 +0200)]
Merge pull request #4325 from nextcloud/downstream-27522

Optimize put - Dont try to fetch filecache for not existing filecache…

7 years agoMerge pull request #3614 from nextcloud/discover-federatedsharing-endpoints
Björn Schießle [Wed, 12 Apr 2017 14:01:07 +0000 (16:01 +0200)]
Merge pull request #3614 from nextcloud/discover-federatedsharing-endpoints

Discover federatedsharing endpoints

7 years agoMerge pull request #4323 from nextcloud/downstream-27613
Roeland Jago Douma [Wed, 12 Apr 2017 13:56:15 +0000 (15:56 +0200)]
Merge pull request #4323 from nextcloud/downstream-27613

Allow file upload when storage is unlimited

7 years agoMerge pull request #4324 from nextcloud/downstream-27581-27602
Roeland Jago Douma [Wed, 12 Apr 2017 13:54:46 +0000 (15:54 +0200)]
Merge pull request #4324 from nextcloud/downstream-27581-27602

Fix casing of same origin frame option

7 years agoFix AdBlock blocking share icon, ref #866 4337/head
Jan-Christoph Borchardt [Wed, 12 Apr 2017 13:04:12 +0000 (15:04 +0200)]
Fix AdBlock blocking share icon, ref #866

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agouse unjailed path when moving files out of a shared storage 4329/head
Robin Appelman [Wed, 12 Apr 2017 12:56:51 +0000 (14:56 +0200)]
use unjailed path when moving files out of a shared storage

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agorename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath
Robin Appelman [Wed, 12 Apr 2017 12:55:47 +0000 (14:55 +0200)]
rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::getSourcePath

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoSimplify the test 4325/head
Joas Schilling [Wed, 12 Apr 2017 11:23:55 +0000 (13:23 +0200)]
Simplify the test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoReorder the entries of the log for easier reading
Juan Pablo Villafáñez [Tue, 4 Apr 2017 08:12:41 +0000 (10:12 +0200)]
Reorder the entries of the log for easier reading

7 years agoOptimize put - Dont try to fetch filecache for not existing filecache in encription
Piotr M [Tue, 28 Mar 2017 12:49:06 +0000 (14:49 +0200)]
Optimize put - Dont try to fetch filecache for not existing filecache in encription

7 years agoFix casing of same origin frame option 4324/head
Joas Schilling [Wed, 12 Apr 2017 10:37:32 +0000 (12:37 +0200)]
Fix casing of same origin frame option

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow file upload when storage is unlimited 4323/head
Joas Schilling [Wed, 12 Apr 2017 10:27:47 +0000 (12:27 +0200)]
Allow file upload when storage is unlimited

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3905 from nextcloud/downstream-27069
Joas Schilling [Wed, 12 Apr 2017 09:09:42 +0000 (11:09 +0200)]
Merge pull request #3905 from nextcloud/downstream-27069

Add integration test for trashbin

7 years agoMerge pull request #4317 from nextcloud/cleanup-files_trashbin-update
Björn Schießle [Wed, 12 Apr 2017 08:57:09 +0000 (10:57 +0200)]
Merge pull request #4317 from nextcloud/cleanup-files_trashbin-update

[files_trashbin] Remove unneeded update steps

7 years agoMerge pull request #4316 from nextcloud/cleanup-files_sharing-update
Björn Schießle [Wed, 12 Apr 2017 08:56:25 +0000 (10:56 +0200)]
Merge pull request #4316 from nextcloud/cleanup-files_sharing-update

[files_sharing] Remove unneeded update steps

7 years agoMerge pull request #4312 from nextcloud/cleanup-name
Björn Schießle [Wed, 12 Apr 2017 08:54:20 +0000 (10:54 +0200)]
Merge pull request #4312 from nextcloud/cleanup-name

Update comments to Nextcloud

7 years agoMerge pull request #4315 from nextcloud/cleanup-files_external-update
Lukas Reschke [Wed, 12 Apr 2017 08:16:42 +0000 (10:16 +0200)]
Merge pull request #4315 from nextcloud/cleanup-files_external-update

[files_external] Remove unneeded update steps

7 years agoMerge pull request #4309 from nextcloud/remove-unused-code
Lukas Reschke [Wed, 12 Apr 2017 08:15:59 +0000 (10:15 +0200)]
Merge pull request #4309 from nextcloud/remove-unused-code

Removes unused code for link share emails

7 years agoMerge pull request #4310 from nextcloud/allow-plain-text-email
Lukas Reschke [Wed, 12 Apr 2017 08:15:06 +0000 (10:15 +0200)]
Merge pull request #4310 from nextcloud/allow-plain-text-email

Allow to set text versions for the plain text email

7 years agoMerge pull request #4314 from nextcloud/remove-not-needed-update.php
Lukas Reschke [Wed, 12 Apr 2017 08:14:04 +0000 (10:14 +0200)]
Merge pull request #4314 from nextcloud/remove-not-needed-update.php

Remove update.php of files app

7 years ago[files_trashbin] Remove unneeded update steps 4317/head
Morris Jobke [Wed, 12 Apr 2017 05:52:27 +0000 (00:52 -0500)]
[files_trashbin] Remove unneeded update steps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[files_sharing] Remove unneeded update steps 4316/head
Morris Jobke [Wed, 12 Apr 2017 05:49:50 +0000 (00:49 -0500)]
[files_sharing] Remove unneeded update steps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[files_external] Remove unneeded update steps 4315/head
Morris Jobke [Wed, 12 Apr 2017 05:45:19 +0000 (00:45 -0500)]
[files_external] Remove unneeded update steps

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove update.php of files app 4314/head
Morris Jobke [Wed, 12 Apr 2017 05:35:12 +0000 (00:35 -0500)]
Remove update.php of files app

* contains only update steps for 8.1/8.2 to 9.0 update

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate comments to Nextcloud 4312/head
Morris Jobke [Wed, 12 Apr 2017 04:16:27 +0000 (23:16 -0500)]
Update comments to Nextcloud

* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 12 Apr 2017 00:07:44 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoAllow to set text versions for the plain text email 4310/head
Morris Jobke [Tue, 11 Apr 2017 22:45:05 +0000 (17:45 -0500)]
Allow to set text versions for the plain text email

* allows different texts for HTML and text version of the email

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemoves unused code for link share emails 4309/head
Morris Jobke [Tue, 11 Apr 2017 22:32:48 +0000 (17:32 -0500)]
Removes unused code for link share emails

* now handled by sharebymail app
* see https://github.com/nextcloud/server/pull/657

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4304 from nextcloud/add-email-template-to-ocp
Morris Jobke [Tue, 11 Apr 2017 20:09:27 +0000 (15:09 -0500)]
Merge pull request #4304 from nextcloud/add-email-template-to-ocp

Add IEMailTemplate to public OCP API

7 years agoAdd drone.yml config 3905/head
Morris Jobke [Fri, 17 Mar 2017 05:54:13 +0000 (23:54 -0600)]
Add drone.yml config

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd integration test for trashbin
Vincent Petry [Wed, 1 Feb 2017 09:54:10 +0000 (10:54 +0100)]
Add integration test for trashbin

Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4302 from nextcloud/test-integration-test
Roeland Jago Douma [Tue, 11 Apr 2017 19:29:58 +0000 (21:29 +0200)]
Merge pull request #4302 from nextcloud/test-integration-test

[Integration Tests] Clear opcode cache after config change

7 years agoRemove constructor from interface 4304/head
Lukas Reschke [Tue, 11 Apr 2017 19:22:39 +0000 (21:22 +0200)]
Remove constructor from interface

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3876 from nextcloud/downstream-26583
Roeland Jago Douma [Tue, 11 Apr 2017 19:01:12 +0000 (21:01 +0200)]
Merge pull request #3876 from nextcloud/downstream-26583

Share api expanded by tags

7 years agoMerge pull request #4285 from nextcloud/bump-md5
Morris Jobke [Tue, 11 Apr 2017 17:07:02 +0000 (12:07 -0500)]
Merge pull request #4285 from nextcloud/bump-md5

[js] Bump blueimp-md5

7 years agoClear opcode cache after config change 4302/head
Lukas Reschke [Tue, 11 Apr 2017 11:58:18 +0000 (13:58 +0200)]
Clear opcode cache after config change

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoshare api expanded by tags (#26583) 3876/head
Michael Jobst [Thu, 10 Nov 2016 08:13:25 +0000 (09:13 +0100)]
share api expanded by tags (#26583)

* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4293 from nextcloud/fix_4248
Morris Jobke [Tue, 11 Apr 2017 16:53:01 +0000 (11:53 -0500)]
Merge pull request #4293 from nextcloud/fix_4248

Do reload shared views

7 years agoAdjust class references
Lukas Reschke [Tue, 11 Apr 2017 15:35:59 +0000 (17:35 +0200)]
Adjust class references

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd IEMailTemplate to public OCP API
Lukas Reschke [Tue, 11 Apr 2017 14:35:46 +0000 (16:35 +0200)]
Add IEMailTemplate to public OCP API

Also adds `\OCP\Mail\IMailer::createEMailTemplate` as helper so the functionality can easily be used within apps.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate autoloader 3614/head
Roeland Jago Douma [Tue, 11 Apr 2017 13:04:15 +0000 (15:04 +0200)]
Update autoloader

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDo proper DI
Roeland Jago Douma [Wed, 5 Apr 2017 20:35:59 +0000 (22:35 +0200)]
Do proper DI

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agogive old end-points a seperate name
Bjoern Schiessle [Mon, 13 Mar 2017 09:55:08 +0000 (10:55 +0100)]
give old end-points a seperate name

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agofix constructor
Bjoern Schiessle [Mon, 13 Mar 2017 09:35:44 +0000 (10:35 +0100)]
fix constructor

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoremove discovery manager in favour of the OCSDiscoveryService
Bjoern Schiessle [Fri, 10 Mar 2017 14:37:21 +0000 (15:37 +0100)]
remove discovery manager in favour of the OCSDiscoveryService

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoadd tests for discovery service
Bjoern Schiessle [Thu, 9 Mar 2017 15:32:13 +0000 (16:32 +0100)]
add tests for discovery service

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoadjust existing tests
Bjoern Schiessle [Thu, 9 Mar 2017 10:36:54 +0000 (11:36 +0100)]
adjust existing tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>