]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoFixed jsunit 11844/head
John Molakvoæ (skjnldsv) [Thu, 1 Nov 2018 15:22:22 +0000 (16:22 +0100)]
Fixed jsunit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoPassword policy fix and menu open on first share
John Molakvoæ (skjnldsv) [Thu, 1 Nov 2018 13:55:32 +0000 (14:55 +0100)]
Password policy fix and menu open on first share

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix wording, sort 'Add another link' to bottom so it does not confuse
Jan-Christoph Borchardt [Thu, 1 Nov 2018 01:36:05 +0000 (02:36 +0100)]
Fix wording, sort 'Add another link' to bottom so it does not confuse

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoAdjust acceptance tests to changes in link shares
Daniel Calviño Sánchez [Wed, 31 Oct 2018 20:34:51 +0000 (21:34 +0100)]
Adjust acceptance tests to changes in link shares

Although now it is possible to create several link shares the acceptance
tests currently handles only the first link share; this first link share
is now created by clicking an "Add new share" button instead of a
checkbox.

Besides that, the "Copy link" button has been moved from the menu to the
row, next to the menu trigger.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoUse primary color for share link icon background instead of bland grey
Jan-Christoph Borchardt [Wed, 31 Oct 2018 11:24:04 +0000 (12:24 +0100)]
Use primary color for share link icon background instead of bland grey

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoFix password enforcement
John Molakvoæ (skjnldsv) [Wed, 31 Oct 2018 10:43:05 +0000 (11:43 +0100)]
Fix password enforcement

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix enforce date
John Molakvoæ (skjnldsv) [Wed, 31 Oct 2018 10:22:47 +0000 (11:22 +0100)]
Fix enforce date

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix note display
John Molakvoæ (skjnldsv) [Wed, 31 Oct 2018 09:49:06 +0000 (10:49 +0100)]
Fix note display

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoCopy link outside menu
John Molakvoæ (skjnldsv) [Wed, 31 Oct 2018 09:28:18 +0000 (10:28 +0100)]
Copy link outside menu

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMigrate link shares to array
John Molakvoæ (skjnldsv) [Mon, 29 Oct 2018 12:58:14 +0000 (13:58 +0100)]
Migrate link shares to array

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoadjust unit tests
Bjoern Schiessle [Wed, 31 Oct 2018 19:10:05 +0000 (20:10 +0100)]
adjust unit tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoallow to update lables for public link shares
Bjoern Schiessle [Wed, 17 Oct 2018 08:50:58 +0000 (10:50 +0200)]
allow to update lables for public link shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoallow to add labels to shares
Bjoern Schiessle [Tue, 16 Oct 2018 08:31:38 +0000 (10:31 +0200)]
allow to add labels to shares

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoallow to create multiple link shares via share api
Bjoern Schiessle [Mon, 15 Oct 2018 10:43:22 +0000 (12:43 +0200)]
allow to create multiple link shares via share api

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 31 Oct 2018 01:12:52 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12020 from nextcloud/bugfix/11795/calendar_invitation_fallback_lang
blizzz [Tue, 30 Oct 2018 21:05:20 +0000 (22:05 +0100)]
Merge pull request #12020 from nextcloud/bugfix/11795/calendar_invitation_fallback_lang

Calendar invitation: use system default instead of sender's language as fallback

6 years agoMerge pull request #12047 from nextcloud/interfaces-files-fulltextsearch
Roeland Jago Douma [Tue, 30 Oct 2018 20:16:13 +0000 (21:16 +0100)]
Merge pull request #12047 from nextcloud/interfaces-files-fulltextsearch

Public interfaces Files_FullTextSearch

6 years agoMerge pull request #12140 from nextcloud/fix/expired_token_throttler
Roeland Jago Douma [Tue, 30 Oct 2018 19:17:03 +0000 (20:17 +0100)]
Merge pull request #12140 from nextcloud/fix/expired_token_throttler

Expired tokens should not trigger bruteforce protection

6 years ago+files_fulltextsearch in autoloader 12047/head
Maxence Lange [Tue, 30 Oct 2018 19:07:29 +0000 (20:07 +0100)]
+files_fulltextsearch in autoloader

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
6 years agoMerge remote-tracking branch 'origin/interfaces-files-fulltextsearch' into interfaces...
Maxence Lange [Tue, 30 Oct 2018 18:59:35 +0000 (19:59 +0100)]
Merge remote-tracking branch 'origin/interfaces-files-fulltextsearch' into interfaces-files-fulltextsearch

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
6 years agoMerge pull request #12056 from nextcloud/interfaces-fulltextsearch-2
Roeland Jago Douma [Tue, 30 Oct 2018 18:53:01 +0000 (19:53 +0100)]
Merge pull request #12056 from nextcloud/interfaces-fulltextsearch-2

Public interfaces FullTextSearch

6 years agoMerge pull request #12145 from olivermg/master
Roeland Jago Douma [Tue, 30 Oct 2018 18:35:35 +0000 (19:35 +0100)]
Merge pull request #12145 from olivermg/master

Extending documentation in config.sample.php for `trusted_proxies`

6 years agoError out early on an expired token 12140/head
Roeland Jago Douma [Tue, 30 Oct 2018 12:19:59 +0000 (13:19 +0100)]
Error out early on an expired token

Fixes #12131

If we hit an expired token there is no need to continue checking. Since
we know it is a token.

We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMove ExpiredTokenException to the correct namespace
Roeland Jago Douma [Tue, 30 Oct 2018 12:18:41 +0000 (13:18 +0100)]
Move ExpiredTokenException to the correct namespace

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation
Roeland Jago Douma [Tue, 30 Oct 2018 18:27:05 +0000 (19:27 +0100)]
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation

Sharing user consolidation

6 years agoMerge pull request #11898 from nextcloud/feature/read_only_public_share
Roeland Jago Douma [Tue, 30 Oct 2018 18:25:44 +0000 (19:25 +0100)]
Merge pull request #11898 from nextcloud/feature/read_only_public_share

Feature/read only public share

6 years agopublic interfaces FullTextSearch 12056/head
Maxence Lange [Tue, 30 Oct 2018 17:24:15 +0000 (18:24 +0100)]
public interfaces FullTextSearch

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-@return mixed

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Merge remote-tracking branch 'origin/interfaces-fulltextsearch-2' into interfaces-fulltextsearch-2

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
6 years agoExtending documentation in config.sample.php for `trusted_proxies` 12145/head
Oliver Wegner [Tue, 30 Oct 2018 16:36:41 +0000 (17:36 +0100)]
Extending documentation in config.sample.php for `trusted_proxies`

Signed-off-by: Oliver Wegner <void1976@gmail.com>
6 years agoAdd acceptance tests for hiding download in link shares 11898/head
Daniel Calviño Sánchez [Mon, 22 Oct 2018 10:01:25 +0000 (12:01 +0200)]
Add acceptance tests for hiding download in link shares

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoAdd "Hide download" to the menu of link shares
Daniel Calviño Sánchez [Mon, 22 Oct 2018 09:06:53 +0000 (11:06 +0200)]
Add "Hide download" to the menu of link shares

Hiding the download does not depend on other settings and it does not
affect other settings either (for example, it would be possible to hide
the downloads yet make the share editable), so a simple checkbox was
added to the menu. However, note that this option is only available for
files, but not for folders.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoHonour "hide download" in the public share page
Daniel Calviño Sánchez [Mon, 22 Oct 2018 08:54:01 +0000 (10:54 +0200)]
Honour "hide download" in the public share page

When the "hide download" property of a share is set the public share
page will not show the download button nor the menu with the download,
direct link and "Add to your Nextcloud" actions; the "downloadURL"
hidden field will not be included either in the generated HTML.

Despite that, note that the "downloadURL" parameter is still set and
passed to the template, as this could be needed anyway to generate
previews (for example, of audio files).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoExpose hide download to public page
Roeland Jago Douma [Thu, 18 Oct 2018 10:43:08 +0000 (12:43 +0200)]
Expose hide download to public page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoPropegate hide download state in share provider
Roeland Jago Douma [Thu, 18 Oct 2018 10:38:07 +0000 (12:38 +0200)]
Propegate hide download state in share provider

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoExtend IShare to show hide download state
Roeland Jago Douma [Mon, 15 Oct 2018 06:47:07 +0000 (08:47 +0200)]
Extend IShare to show hide download state

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoAdd db column to store hide download state
Roeland Jago Douma [Mon, 15 Oct 2018 06:32:06 +0000 (08:32 +0200)]
Add db column to store hide download state

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12138 from nextcloud/fix/3752/inline-block-button
John Molakvoæ [Tue, 30 Oct 2018 14:07:44 +0000 (15:07 +0100)]
Merge pull request #12138 from nextcloud/fix/3752/inline-block-button

make .button inline-block

6 years agoMerge pull request #11946 from nextcloud/bugfix/11945/fix-js-namespace-of-files-external
Morris Jobke [Tue, 30 Oct 2018 13:57:57 +0000 (14:57 +0100)]
Merge pull request #11946 from nextcloud/bugfix/11945/fix-js-namespace-of-files-external

Fix JS namespace of files_external app

6 years agoStyling papercuts 11899/head
Julius Härtl [Tue, 30 Oct 2018 13:43:34 +0000 (14:43 +0100)]
Styling papercuts

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoUpdate AddressBookImpl documentation
Julius Härtl [Tue, 30 Oct 2018 13:43:08 +0000 (14:43 +0100)]
Update AddressBookImpl documentation

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth
Roeland Jago Douma [Tue, 30 Oct 2018 13:26:50 +0000 (14:26 +0100)]
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth

Reset bruteforce on token refresh OAuth

6 years agoMerge pull request #12054 from nextcloud/fix/5212/interact-with-userobject
Roeland Jago Douma [Tue, 30 Oct 2018 12:38:16 +0000 (13:38 +0100)]
Merge pull request #12054 from nextcloud/fix/5212/interact-with-userobject

LDAP: announce display name changes so that addressbook picks it up

6 years agomake .button inline-block 12138/head
Jonas Sulzer [Tue, 30 Oct 2018 12:03:20 +0000 (13:03 +0100)]
make .button inline-block

fix #3752

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
6 years agodo not run into UniqueConstraintViolationException 12054/head
Arthur Schiwon [Fri, 26 Oct 2018 15:38:42 +0000 (17:38 +0200)]
do not run into UniqueConstraintViolationException

… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoFix injection to get the user id
Julius Härtl [Tue, 30 Oct 2018 10:41:56 +0000 (11:41 +0100)]
Fix injection to get the user id

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoDon't enforce merged property
Julius Härtl [Tue, 30 Oct 2018 10:37:11 +0000 (11:37 +0100)]
Don't enforce merged property

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoReset bruteforce on token refresh OAuth 12130/head
Roeland Jago Douma [Mon, 29 Oct 2018 21:12:18 +0000 (22:12 +0100)]
Reset bruteforce on token refresh OAuth

When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12036 from olivermg/master
Morris Jobke [Tue, 30 Oct 2018 09:49:08 +0000 (10:49 +0100)]
Merge pull request #12036 from olivermg/master

Add capability of specifying "trusted_proxies" entries in CIDR notation (IPv4)

6 years agoAdd uuid/name entry to Remote/MailPlugin tests
Julius Härtl [Tue, 30 Oct 2018 09:18:58 +0000 (10:18 +0100)]
Add uuid/name entry to Remote/MailPlugin tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd name field to mail and remote results
Julius Härtl [Fri, 26 Oct 2018 11:46:47 +0000 (13:46 +0200)]
Add name field to mail and remote results

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoShow one share method per contact for inaccurate results
Julius Härtl [Fri, 26 Oct 2018 11:46:24 +0000 (13:46 +0200)]
Show one share method per contact for inaccurate results

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoUse tab to complete selected entry to the share entry
Julius Härtl [Thu, 25 Oct 2018 19:36:44 +0000 (21:36 +0200)]
Use tab to complete selected entry to the share entry

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd local share if remote cloud id matches a local user ones
Julius Härtl [Tue, 23 Oct 2018 07:24:04 +0000 (09:24 +0200)]
Add local share if remote cloud id matches a local user ones

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMake enhancing entries with type property optional
Julius Härtl [Mon, 29 Oct 2018 16:00:09 +0000 (17:00 +0100)]
Make enhancing entries with type property optional

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMake dropdown height 6 1/2 entries
Julius Härtl [Tue, 23 Oct 2018 07:21:33 +0000 (09:21 +0200)]
Make dropdown height 6 1/2 entries

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoSimplify share list text
Julius Härtl [Thu, 18 Oct 2018 10:38:22 +0000 (12:38 +0200)]
Simplify share list text

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd talk icon
Julius Härtl [Thu, 18 Oct 2018 10:37:54 +0000 (12:37 +0200)]
Add talk icon

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoIncrease max-width of the share autocompletion suggestions
Julius Härtl [Thu, 18 Oct 2018 10:37:26 +0000 (12:37 +0200)]
Increase max-width of the share autocompletion suggestions

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge contacts and add type of result to the UI
Julius Härtl [Thu, 18 Oct 2018 10:36:37 +0000 (12:36 +0200)]
Merge contacts and add type of result to the UI

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd type to Remote and Mail plugins
Julius Härtl [Thu, 18 Oct 2018 10:33:23 +0000 (12:33 +0200)]
Add type to Remote and Mail plugins

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd type of properties to address book results
Julius Härtl [Thu, 18 Oct 2018 10:31:57 +0000 (12:31 +0200)]
Add type of properties to address book results

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoGroup share suggestions by userid
Julius Härtl [Wed, 17 Oct 2018 19:57:47 +0000 (21:57 +0200)]
Group share suggestions by userid

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd collaborators uuid to properly render the avatar and for later grouping
Julius Härtl [Wed, 17 Oct 2018 19:57:22 +0000 (21:57 +0200)]
Add collaborators uuid to properly render the avatar and for later grouping

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoHighlight search term in sharing results
Julius Härtl [Wed, 17 Oct 2018 19:56:41 +0000 (21:56 +0200)]
Highlight search term in sharing results

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFilter out generic remote result for local users
Julius Härtl [Wed, 17 Oct 2018 19:21:39 +0000 (21:21 +0200)]
Filter out generic remote result for local users

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFilter out local users from address book remote searches
Julius Härtl [Wed, 17 Oct 2018 19:20:15 +0000 (21:20 +0200)]
Filter out local users from address book remote searches

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoRemove federated sharing address books which are the same as local ones
Julius Härtl [Wed, 17 Oct 2018 19:16:13 +0000 (21:16 +0200)]
Remove federated sharing address books which are the same as local ones

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoImprove share select list
Julius Härtl [Wed, 10 Oct 2018 12:58:58 +0000 (14:58 +0200)]
Improve share select list

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12085 from nextcloud/add-gss-to-excluded-backends
Morris Jobke [Tue, 30 Oct 2018 09:16:07 +0000 (10:16 +0100)]
Merge pull request #12085 from nextcloud/add-gss-to-excluded-backends

add global site selector as user back-end which doesn't support password confirmation

6 years agoMerge pull request #12070 from nextcloud/fix/noid/announce-chosen-uid
Morris Jobke [Tue, 30 Oct 2018 09:12:04 +0000 (10:12 +0100)]
Merge pull request #12070 from nextcloud/fix/noid/announce-chosen-uid

announce the chosen uid (fixes wrong variable usage)

6 years agoFix JS namespace of files_external app 11946/head
Joas Schilling [Fri, 19 Oct 2018 15:35:13 +0000 (17:35 +0200)]
Fix JS namespace of files_external app

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoAdding handling of CIDR notation to trusted_proxies for IPv4 12036/head
Oliver Wegner [Thu, 25 Oct 2018 09:36:52 +0000 (11:36 +0200)]
Adding handling of CIDR notation to trusted_proxies for IPv4

Signed-off-by: Oliver Wegner <void1976@gmail.com>
6 years agoMerge pull request #12000 from nextcloud/dependabot/npm_and_yarn/build/karma-3.1.1
Roeland Jago Douma [Tue, 30 Oct 2018 07:52:40 +0000 (08:52 +0100)]
Merge pull request #12000 from nextcloud/dependabot/npm_and_yarn/build/karma-3.1.1

Bump karma from 2.0.4 to 3.1.1 in /build

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 30 Oct 2018 01:12:54 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #11627 from nextcloud/feature/noid/cli-remove-app
Morris Jobke [Mon, 29 Oct 2018 23:35:45 +0000 (00:35 +0100)]
Merge pull request #11627 from nextcloud/feature/noid/cli-remove-app

Add occ app:remove CLI command

6 years agoMerge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies
Morris Jobke [Mon, 29 Oct 2018 22:38:37 +0000 (23:38 +0100)]
Merge pull request #12052 from nextcloud/bugfix/11594/fix-setup-check-trusted-proxies

Fix setup check trusted proxies

6 years agoMerge pull request #12127 from nextcloud/fix/proper_folder_mimetype
Morris Jobke [Mon, 29 Oct 2018 22:28:39 +0000 (23:28 +0100)]
Merge pull request #12127 from nextcloud/fix/proper_folder_mimetype

A folder should get a folder mimetype

6 years agoA folder should get a folder mimetype 12127/head
Roeland Jago Douma [Mon, 29 Oct 2018 20:35:08 +0000 (21:35 +0100)]
A folder should get a folder mimetype

If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.

If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12113 from nextcloud/fileinfo-getextension
Morris Jobke [Mon, 29 Oct 2018 16:23:27 +0000 (17:23 +0100)]
Merge pull request #12113 from nextcloud/fileinfo-getextension

Add getExtension() to FileInfo

6 years agoMerge pull request #12107 from nextcloud/fix/12086/no-unintentional-empty-attributes
Morris Jobke [Mon, 29 Oct 2018 16:00:14 +0000 (17:00 +0100)]
Merge pull request #12107 from nextcloud/fix/12086/no-unintentional-empty-attributes

remove unneeded empty LDAP search attribute values

6 years agoMerge pull request #12041 from nextcloud/gridfixes
Roeland Jago Douma [Mon, 29 Oct 2018 15:12:44 +0000 (16:12 +0100)]
Merge pull request #12041 from nextcloud/gridfixes

Properly hide files when searching

6 years agoMerge pull request #12019 from nextcloud/icons-svg-api-fixes
John Molakvoæ [Mon, 29 Oct 2018 14:45:45 +0000 (15:45 +0100)]
Merge pull request #12019 from nextcloud/icons-svg-api-fixes

Move svg api endpoint

6 years agoAdd getExtension() to FileInfo 12113/head
Robin Appelman [Mon, 29 Oct 2018 14:23:33 +0000 (15:23 +0100)]
Add getExtension() to FileInfo

this is a fairly common operation so it makes sense to prevent having
to repeatedly implement it.

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #12106 from nextcloud/bugfix/noid/federated-settings-logo
Roeland Jago Douma [Mon, 29 Oct 2018 13:54:20 +0000 (14:54 +0100)]
Merge pull request #12106 from nextcloud/bugfix/noid/federated-settings-logo

Fix logo path in personal federated sharing settings

6 years agoMerge pull request #12100 from nextcloud/dependabot/npm_and_yarn/settings/webpack...
Roeland Jago Douma [Mon, 29 Oct 2018 13:53:11 +0000 (14:53 +0100)]
Merge pull request #12100 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.23.1

Bump webpack from 4.22.0 to 4.23.1 in /settings

6 years agoProperly hide files when searching 12041/head
John Molakvoæ (skjnldsv) [Thu, 25 Oct 2018 12:40:18 +0000 (14:40 +0200)]
Properly hide files when searching

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12097 from nextcloud/dependabot/npm_and_yarn/settings/vue-infinit...
Roeland Jago Douma [Mon, 29 Oct 2018 13:31:45 +0000 (14:31 +0100)]
Merge pull request #12097 from nextcloud/dependabot/npm_and_yarn/settings/vue-infinite-loading-2.4.0

Bump vue-infinite-loading from 2.3.5 to 2.4.0 in /settings

6 years agoMerge pull request #12104 from nextcloud/move-acceptance-tests-that-crash-the-php...
Roeland Jago Douma [Mon, 29 Oct 2018 13:28:42 +0000 (14:28 +0100)]
Merge pull request #12104 from nextcloud/move-acceptance-tests-that-crash-the-php-built-in-server-to-apache

Move acceptance tests that crash the PHP built-in server to Apache

6 years agoremove unneeded empty search attribute values, fixes #12086 12107/head
Arthur Schiwon [Mon, 29 Oct 2018 12:21:02 +0000 (13:21 +0100)]
remove unneeded empty search attribute values, fixes #12086

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoFix logo path in personal federated sharing settings 12106/head
Julius Härtl [Mon, 29 Oct 2018 12:12:23 +0000 (13:12 +0100)]
Fix logo path in personal federated sharing settings

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #11993 from nextcloud/headings-standards
John Molakvoæ [Mon, 29 Oct 2018 12:15:55 +0000 (13:15 +0100)]
Merge pull request #11993 from nextcloud/headings-standards

Headings standard

6 years agoFix tests 12019/head
Julius Härtl [Mon, 29 Oct 2018 12:06:55 +0000 (13:06 +0100)]
Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoBump webpack from 4.22.0 to 4.23.1 in /settings 12100/head
dependabot[bot] [Mon, 29 Oct 2018 11:59:23 +0000 (11:59 +0000)]
Bump webpack from 4.22.0 to 4.23.1 in /settings

Bumps [webpack](https://github.com/webpack/webpack) from 4.22.0 to 4.23.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.22.0...v4.23.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #12099 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack...
Roeland Jago Douma [Mon, 29 Oct 2018 11:57:27 +0000 (12:57 +0100)]
Merge pull request #12099 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.23.1

Bump webpack from 4.22.0 to 4.23.1 in /apps/oauth2

6 years agoMove acceptance tests that crash the PHP built-in server to Apache 12104/head
Daniel Calviño Sánchez [Sun, 28 Oct 2018 18:51:13 +0000 (19:51 +0100)]
Move acceptance tests that crash the PHP built-in server to Apache

The PHP built-in server can crash when certain actions are performed in
Nextcloud (but although the crash is triggered by Nextcloud it does not
seem to be a Nextcloud bug), which can lead to failures in the
acceptance tests that would have otherwise passed.

A crash of the PHP built-in server during an acceptance test can be
identified by the message "sh: 1: kill: No such process" in the
acceptance tests output; as the PHP built-in server crashed its process
does no longer exist when it is tried to be killed when the scenario
ends.

Although the crash has been observed in other tests too it is more
prevalent in the tests for tags and the theming app. In order to
reduce the false positives those tests are now run on Apache instead of
on the PHP built-in sever. However, the rest of tests are still run on
the PHP built-in server due to its lower resource consumption.

In order to run a feature or just a scenario using Apache it has to be
tagged with "@apache"; features or scenarios without that tag (the
default) will run on the PHP built-in server instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoLink the default Apache directory to the Nextcloud server in all runners
Daniel Calviño Sánchez [Mon, 29 Oct 2018 11:23:01 +0000 (12:23 +0100)]
Link the default Apache directory to the Nextcloud server in all runners

In order to run the acceptance tests in Apache "/var/www/html" has to be
linked to the root directory of the Nextcloud server. Before this was
automatically done when launching the acceptance tests through
"./run.sh", but an explicit command was needed when run in Drone. Now
the linking was moved from "run.sh" to "run-local.sh", so it is
automatically done when run through "./run.sh" and in Drone, including
when running the tests for an app instead of for the server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoAdjust accessibility app color replacement
Julius Härtl [Mon, 29 Oct 2018 11:09:44 +0000 (12:09 +0100)]
Adjust accessibility app color replacement

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFix icon cacher url matching
Julius Härtl [Mon, 29 Oct 2018 11:09:30 +0000 (12:09 +0100)]
Fix icon cacher url matching

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMove svg api endpoint
John Molakvoæ (skjnldsv) [Wed, 24 Oct 2018 12:47:08 +0000 (14:47 +0200)]
Move svg api endpoint

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoBump webpack from 4.22.0 to 4.23.1 in /apps/oauth2 12099/head
dependabot[bot] [Mon, 29 Oct 2018 10:43:49 +0000 (10:43 +0000)]
Bump webpack from 4.22.0 to 4.23.1 in /apps/oauth2

Bumps [webpack](https://github.com/webpack/webpack) from 4.22.0 to 4.23.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.22.0...v4.23.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #12076 from trendzetter/patch-3
John Molakvoæ [Mon, 29 Oct 2018 10:32:39 +0000 (11:32 +0100)]
Merge pull request #12076 from trendzetter/patch-3

Add missing tag