]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMerge pull request #4409 from nextcloud/socialharing_mail
Morris Jobke [Thu, 20 Apr 2017 22:59:55 +0000 (17:59 -0500)]
Merge pull request #4409 from nextcloud/socialharing_mail

Allow social sharing to specify if a new window is opened

7 years agoMerge pull request #4404 from Ardinis/master
Morris Jobke [Thu, 20 Apr 2017 22:59:35 +0000 (17:59 -0500)]
Merge pull request #4404 from Ardinis/master

Remove json handling for files_external:config

7 years agoMerge pull request #3595 from nextcloud/dav-sharing-changes
Morris Jobke [Thu, 20 Apr 2017 21:44:16 +0000 (16:44 -0500)]
Merge pull request #3595 from nextcloud/dav-sharing-changes

Restrict DAV share handling to the owner only

7 years agoFix unit tests 3595/head
Morris Jobke [Thu, 20 Apr 2017 21:01:26 +0000 (16:01 -0500)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4411 from nextcloud/fix-it
Morris Jobke [Thu, 20 Apr 2017 15:53:03 +0000 (10:53 -0500)]
Merge pull request #4411 from nextcloud/fix-it

Remove accidentially commited module

7 years agoRemove accidentially commited module 4411/head
Morris Jobke [Thu, 20 Apr 2017 15:51:05 +0000 (10:51 -0500)]
Remove accidentially commited module

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4402 from nextcloud/fix-clickable-area
Björn Schießle [Thu, 20 Apr 2017 14:49:00 +0000 (16:49 +0200)]
Merge pull request #4402 from nextcloud/fix-clickable-area

Fix clickable area in share permissions menu

7 years agoMerge pull request #4303 from nextcloud/enforce-password-mailshare
Björn Schießle [Thu, 20 Apr 2017 14:46:36 +0000 (16:46 +0200)]
Merge pull request #4303 from nextcloud/enforce-password-mailshare

allow admin to enforce password on mail shares

7 years agofix typo 4303/head
Morris Jobke [Wed, 19 Apr 2017 23:06:40 +0000 (18:06 -0500)]
fix typo

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix casing
Morris Jobke [Wed, 19 Apr 2017 22:54:17 +0000 (17:54 -0500)]
Fix casing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agofix unit tests
Bjoern Schiessle [Wed, 19 Apr 2017 15:08:52 +0000 (17:08 +0200)]
fix unit tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agorespect password policy for auto generated passwords
Bjoern Schiessle [Wed, 19 Apr 2017 14:56:34 +0000 (16:56 +0200)]
respect password policy for auto generated passwords

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoimprove mail text
Bjoern Schiessle [Wed, 19 Apr 2017 13:53:33 +0000 (15:53 +0200)]
improve mail text

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agocreate activity if a password was send by mail
Bjoern Schiessle [Wed, 19 Apr 2017 13:10:22 +0000 (15:10 +0200)]
create activity if a password was send by mail

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoallow to set a password for shares which where created without a password before...
Bjoern Schiessle [Tue, 11 Apr 2017 19:29:54 +0000 (21:29 +0200)]
allow to set a password for shares which where created without a password before the admin started to enforce the password

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agotemplates no longer needed
Bjoern Schiessle [Thu, 13 Apr 2017 09:32:59 +0000 (11:32 +0200)]
templates no longer needed

7 years agoallow admin to enforce password on mail shares
Bjoern Schiessle [Mon, 10 Apr 2017 16:36:23 +0000 (18:36 +0200)]
allow admin to enforce password on mail shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoAllow social sharing to specify if a new window is opened 4409/head
Roeland Jago Douma [Thu, 20 Apr 2017 14:32:46 +0000 (16:32 +0200)]
Allow social sharing to specify if a new window is opened

For example mail shares should not open a new window because it looks
weird.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoreviewed 4404/head
Ardinis [Thu, 20 Apr 2017 09:31:04 +0000 (11:31 +0200)]
reviewed

7 years agoMerge pull request #4398 from nextcloud/fix_accesslistcode
Joas Schilling [Thu, 20 Apr 2017 09:03:22 +0000 (11:03 +0200)]
Merge pull request #4398 from nextcloud/fix_accesslistcode

Get proper accesslist for userFolder

7 years agoMerge pull request #4212 from individual-it/master
Joas Schilling [Thu, 20 Apr 2017 08:50:56 +0000 (10:50 +0200)]
Merge pull request #4212 from individual-it/master

validate file name before uploading in upload only folder

7 years agoFix remaining "PHP Inspection" warnings
Joas Schilling [Thu, 23 Feb 2017 09:37:49 +0000 (10:37 +0100)]
Fix remaining "PHP Inspection" warnings

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd public access modifier to all methods
Joas Schilling [Thu, 23 Feb 2017 09:33:54 +0000 (10:33 +0100)]
Add public access modifier to all methods

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoRestrict share handling to the owner only
Joas Schilling [Thu, 23 Feb 2017 09:31:28 +0000 (10:31 +0100)]
Restrict share handling to the owner only

Otherwise group members can remove the share for the complete group,
remove edit permissions and even single user shares for other users.

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoGet proper accesslist for userFolder 4398/head
Roeland Jago Douma [Wed, 19 Apr 2017 13:11:54 +0000 (15:11 +0200)]
Get proper accesslist for userFolder

If the accesslist is requested for a users root folder we should
properly construct the path

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4381 from nextcloud/2954_take_2
Joas Schilling [Thu, 20 Apr 2017 08:25:16 +0000 (10:25 +0200)]
Merge pull request #4381 from nextcloud/2954_take_2

Fix group settings routes and fix route regression

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

7 years agoMerge pull request #4384 from nextcloud/renderHtml-fix
Morris Jobke [Wed, 19 Apr 2017 22:52:37 +0000 (17:52 -0500)]
Merge pull request #4384 from nextcloud/renderHtml-fix

Rename renderHTML to renderHtml

7 years agoFix clickable area in share permissions menu 4402/head
Morris Jobke [Wed, 19 Apr 2017 22:41:26 +0000 (17:41 -0500)]
Fix clickable area in share permissions menu

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRename renderHTML to renderHtml 4384/head
Morris Jobke [Tue, 18 Apr 2017 22:09:25 +0000 (17:09 -0500)]
Rename renderHTML to renderHtml

* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4387 from nextcloud/fix-little-glitch
Morris Jobke [Wed, 19 Apr 2017 19:45:48 +0000 (14:45 -0500)]
Merge pull request #4387 from nextcloud/fix-little-glitch

Fix font-weight of settings button

7 years agoMerge pull request #4388 from nextcloud/remove-unused-stuff
Morris Jobke [Wed, 19 Apr 2017 19:45:32 +0000 (14:45 -0500)]
Merge pull request #4388 from nextcloud/remove-unused-stuff

Remove unused CSS styles

7 years agoMerge pull request #4386 from nextcloud/improve-menu-css
Morris Jobke [Wed, 19 Apr 2017 18:12:31 +0000 (13:12 -0500)]
Merge pull request #4386 from nextcloud/improve-menu-css

Improve menu CSS

7 years agoImprove menu CSS 4386/head
Morris Jobke [Wed, 19 Apr 2017 02:30:56 +0000 (21:30 -0500)]
Improve menu CSS

* fix mess with menus and actions in the files app
* reduces amount of !important usages
* keeps the behaviour on mobile as well as on desktop

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4385 from nextcloud/remove-unused-css
Roeland Jago Douma [Wed, 19 Apr 2017 17:27:05 +0000 (19:27 +0200)]
Merge pull request #4385 from nextcloud/remove-unused-css

Remove unused CSS

7 years agoMerge pull request #4395 from nextcloud/fix_4394
Lukas Reschke [Wed, 19 Apr 2017 15:01:27 +0000 (17:01 +0200)]
Merge pull request #4395 from nextcloud/fix_4394

Do not show empty admin sections

7 years agoDo not show empty admin sections 4395/head
Roeland Jago Douma [Wed, 19 Apr 2017 11:11:19 +0000 (13:11 +0200)]
Do not show empty admin sections

Fixes #4393

It is far from efficient code. But then again it is easy to understand
and I doubt admins will browse it 24/7

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4382 from nextcloud/use-proper-reply-to
Lukas Reschke [Wed, 19 Apr 2017 10:04:18 +0000 (12:04 +0200)]
Merge pull request #4382 from nextcloud/use-proper-reply-to

Add "Reply-To" on ShareByMailProvider mails

7 years agoFix indentation 4382/head
Lukas Reschke [Wed, 19 Apr 2017 10:03:54 +0000 (12:03 +0200)]
Fix indentation

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations
Roeland Jago Douma [Wed, 19 Apr 2017 07:27:23 +0000 (09:27 +0200)]
Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations

Adjust existing bruteforce protection code

7 years agoRemove unused CSS styles 4388/head
Morris Jobke [Wed, 19 Apr 2017 03:26:18 +0000 (22:26 -0500)]
Remove unused CSS styles

* could not find an traces of .popup and .arrow anywhere else

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix font-weight of settings button 4387/head
Morris Jobke [Wed, 19 Apr 2017 02:38:49 +0000 (21:38 -0500)]
Fix font-weight of settings button

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRemove unused CSS 4385/head
Morris Jobke [Wed, 19 Apr 2017 01:36:54 +0000 (20:36 -0500)]
Remove unused CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4371 from nextcloud/dont-allow-dot-usernames
Morris Jobke [Wed, 19 Apr 2017 01:04:32 +0000 (20:04 -0500)]
Merge pull request #4371 from nextcloud/dont-allow-dot-usernames

Better validation of allowed user names

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 19 Apr 2017 00:07:40 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 18 Apr 2017 23:08:43 +0000 (23:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4369 from nextcloud/fix-translations
Morris Jobke [Tue, 18 Apr 2017 23:01:50 +0000 (18:01 -0500)]
Merge pull request #4369 from nextcloud/fix-translations

Fix translations

7 years agoMerge pull request #3585 from nextcloud/popover-clickable-area
Morris Jobke [Tue, 18 Apr 2017 22:59:42 +0000 (17:59 -0500)]
Merge pull request #3585 from nextcloud/popover-clickable-area

expand clickable area of popover menu entries to full width

7 years agoMerge pull request #4379 from nextcloud/nicely-designed-confirmation-mail
Morris Jobke [Tue, 18 Apr 2017 22:17:40 +0000 (17:17 -0500)]
Merge pull request #4379 from nextcloud/nicely-designed-confirmation-mail

Beautify test email

7 years agoexpand clickable area of popover menu entries to full width 3585/head
Jan-Christoph Borchardt [Wed, 22 Feb 2017 16:29:45 +0000 (17:29 +0100)]
expand clickable area of popover menu entries to full width

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoFix translations 4369/head
Joas Schilling [Tue, 18 Apr 2017 07:53:02 +0000 (09:53 +0200)]
Fix translations

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #4380 from nextcloud/show-instance-name-in-from
Morris Jobke [Tue, 18 Apr 2017 21:22:56 +0000 (16:22 -0500)]
Merge pull request #4380 from nextcloud/show-instance-name-in-from

Add instance name to default sender

7 years agoBeautify test email 4379/head
Lukas Reschke [Tue, 18 Apr 2017 19:30:31 +0000 (21:30 +0200)]
Beautify test email

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4372 from nextcloud/smtp-password
Morris Jobke [Tue, 18 Apr 2017 21:13:31 +0000 (16:13 -0500)]
Merge pull request #4372 from nextcloud/smtp-password

Don't put the SMTP password into the HTML code

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 18 Apr 2017 20:47:45 +0000 (20:47 +0000)]
[tx-robot] updated from transifex

7 years agoAdd "Reply-To" on ShareByMailProvider mails
Lukas Reschke [Tue, 18 Apr 2017 20:23:07 +0000 (22:23 +0200)]
Add "Reply-To" on ShareByMailProvider mails

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

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix unit tests 4372/head
Morris Jobke [Tue, 18 Apr 2017 20:08:38 +0000 (15:08 -0500)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMake group settings routes explicit 4381/head
Roeland Jago Douma [Tue, 18 Apr 2017 20:00:22 +0000 (22:00 +0200)]
Make group settings routes explicit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoRevert "Match slashes in ../{id} resource routes"
Roeland Jago Douma [Tue, 18 Apr 2017 19:50:25 +0000 (21:50 +0200)]
Revert "Match slashes in ../{id} resource routes"

This reverts commit 31f9be7a75712e9f8b7831ed29397527f9fa8baf.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd instance name to default sender 4380/head
Lukas Reschke [Tue, 18 Apr 2017 19:44:37 +0000 (21:44 +0200)]
Add instance name to default sender

Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4376 from nextcloud/add-bruteforce-protection-to-change-self...
Christoph Wurst [Tue, 18 Apr 2017 19:43:11 +0000 (21:43 +0200)]
Merge pull request #4376 from nextcloud/add-bruteforce-protection-to-change-self-password

Add bruteforce protection to changePersonalPassword

7 years agoAdd bruteforce protection to changePersonalPassword 4376/head
Lukas Reschke [Tue, 18 Apr 2017 15:55:51 +0000 (17:55 +0200)]
Add bruteforce protection to changePersonalPassword

While the risk is actually quite low because one would already have the user session and could potentially do other havoc it makes sense to throttle here in case of invalid previous password attempts.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoremove accidently left over *f*it 4212/head
Artur Neumann [Tue, 18 Apr 2017 15:02:39 +0000 (20:47 +0545)]
remove accidently left over *f*it

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agoJS tests for upload only function
Artur Neumann [Tue, 18 Apr 2017 14:58:25 +0000 (20:43 +0545)]
JS tests for upload only function

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agorefactor to make it easier to test
Artur Neumann [Tue, 18 Apr 2017 14:53:43 +0000 (20:38 +0545)]
refactor to make it easier to test

Signed-off-by: Artur Neumann <info@individual-it.net>
7 years agoFix some more stuff
Joas Schilling [Tue, 18 Apr 2017 14:11:29 +0000 (16:11 +0200)]
Fix some more stuff

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix tests
Joas Schilling [Tue, 18 Apr 2017 14:08:29 +0000 (16:08 +0200)]
Fix tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't put the SMTP password into the HTML code
Joas Schilling [Tue, 18 Apr 2017 13:44:20 +0000 (15:44 +0200)]
Don't put the SMTP password into the HTML code

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoBetter validation of allowed user names 4371/head
Joas Schilling [Wed, 12 Apr 2017 08:29:28 +0000 (10:29 +0200)]
Better validation of allowed user names

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 18 Apr 2017 00:07:25 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 17 Apr 2017 00:07:33 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 16 Apr 2017 00:07:23 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #2834 from nextcloud/accesListToShareManager
Morris Jobke [Sat, 15 Apr 2017 18:06:24 +0000 (13:06 -0500)]
Merge pull request #2834 from nextcloud/accesListToShareManager

Access list to share manager

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

7 years agoRemove json handling for files_external:config 4351/head
Ardinis [Fri, 14 Apr 2017 13:42:45 +0000 (15:42 +0200)]
Remove json handling for files_external:config

#4347

7 years agoAdjust existing bruteforce protection code 4350/head
Lukas Reschke [Fri, 14 Apr 2017 11:42:40 +0000 (13:42 +0200)]
Adjust existing bruteforce protection code

- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #4330 from nextcloud/activities-for-password-mail-change
Roeland Jago Douma [Fri, 14 Apr 2017 06:16:43 +0000 (08:16 +0200)]
Merge pull request #4330 from nextcloud/activities-for-password-mail-change

Add activities when email or password is changed

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 agoFix autoloader 4330/head
Morris Jobke [Thu, 13 Apr 2017 21:28:07 +0000 (16:28 -0500)]
Fix autoloader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
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 agoMail shares trigger the public key 2834/head
Roeland Jago Douma [Thu, 13 Apr 2017 13:14:30 +0000 (15:14 +0200)]
Mail shares trigger the public key

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate autoloader
Roeland Jago Douma [Thu, 13 Apr 2017 12:56:05 +0000 (14:56 +0200)]
Update autoloader

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix server container registration
Roeland Jago Douma [Thu, 13 Apr 2017 12:52:09 +0000 (14:52 +0200)]
Fix server container registration

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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 agoNot needed in the DIContainer anymore
Roeland Jago Douma [Thu, 13 Apr 2017 11:37:39 +0000 (13:37 +0200)]
Not needed in the DIContainer anymore

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDo not set full path if not currentAccess
Roeland Jago Douma [Thu, 13 Apr 2017 10:58:29 +0000 (12:58 +0200)]
Do not set full path if not currentAccess

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd samples to the docs
Joas Schilling [Tue, 11 Apr 2017 12:45:18 +0000 (14:45 +0200)]
Add samples to the docs

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd more tests for the share helper
Joas Schilling [Tue, 11 Apr 2017 12:45:02 +0000 (14:45 +0200)]
Add more tests for the share helper

Signed-off-by: Joas Schilling <coding@schilljs.com>