]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agofixes dav share issue with owner
Georg Ehrke [Wed, 14 Nov 2018 19:50:46 +0000 (20:50 +0100)]
fixes dav share issue with owner

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoMerge pull request #12455 from nextcloud/twofactor-backup-settings
Roeland Jago Douma [Wed, 14 Nov 2018 18:35:13 +0000 (19:35 +0100)]
Merge pull request #12455 from nextcloud/twofactor-backup-settings

Don't register twofactor_backup settings as "regular" settings

6 years agoMerge pull request #12450 from nextcloud/fix/11868/decryption_hardening
Roeland Jago Douma [Wed, 14 Nov 2018 18:34:26 +0000 (19:34 +0100)]
Merge pull request #12450 from nextcloud/fix/11868/decryption_hardening

Throw exception if decryption fails

6 years agotwofactor auth settings are not regular settings 12455/head
Robin Appelman [Wed, 14 Nov 2018 17:05:13 +0000 (18:05 +0100)]
twofactor auth settings are not regular settings

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoLog invalid settings class
Robin Appelman [Wed, 14 Nov 2018 17:04:52 +0000 (18:04 +0100)]
Log invalid settings class

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoThrow exception if decryption fails 12450/head
Roeland Jago Douma [Wed, 14 Nov 2018 11:47:35 +0000 (12:47 +0100)]
Throw exception if decryption fails

For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 14 Nov 2018 01:12:12 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12398 from nextcloud/fix/12378
Morris Jobke [Tue, 13 Nov 2018 16:21:09 +0000 (17:21 +0100)]
Merge pull request #12398 from nextcloud/fix/12378

change "Download" to "Download all files" for shared folders

6 years agoMerge pull request #12275 from nextcloud/bugfix/11975/oracle_calendar_subscriptions_s...
Morris Jobke [Tue, 13 Nov 2018 15:34:32 +0000 (16:34 +0100)]
Merge pull request #12275 from nextcloud/bugfix/11975/oracle_calendar_subscriptions_source

Fix Calendarsubscriptions source column change on Oracle

6 years agoFix Calendarsubscriptions source column change on Oracle 12275/head
Georg Ehrke [Mon, 5 Nov 2018 11:08:41 +0000 (12:08 +0100)]
Fix Calendarsubscriptions source column change on Oracle

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoMerge pull request #12439 from nextcloud/vcard_uid_repair_postgres
Morris Jobke [Tue, 13 Nov 2018 15:22:10 +0000 (16:22 +0100)]
Merge pull request #12439 from nextcloud/vcard_uid_repair_postgres

Fix SetVcardDatabaseUID when using postgresql

6 years agoFix SetVcardDatabaseUID when using postgresql 12439/head
Robin Appelman [Tue, 13 Nov 2018 13:26:33 +0000 (14:26 +0100)]
Fix SetVcardDatabaseUID when using postgresql

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 13 Nov 2018 01:12:40 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12359 from nextcloud/ie11-width-fix
Morris Jobke [Mon, 12 Nov 2018 22:45:17 +0000 (23:45 +0100)]
Merge pull request #12359 from nextcloud/ie11-width-fix

Fix IE rule for min width

6 years agoMerge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning...
Morris Jobke [Mon, 12 Nov 2018 21:44:55 +0000 (22:44 +0100)]
Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning-always

Remove outdated integrity warning on each page

6 years agoMerge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-insertIfN...
Morris Jobke [Mon, 12 Nov 2018 20:14:38 +0000 (21:14 +0100)]
Merge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist

Fix UniqueConstraintViolationException while insert into oc_groups

6 years agoMerge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-found
Morris Jobke [Mon, 12 Nov 2018 20:13:19 +0000 (21:13 +0100)]
Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-found

Ignore icons if the file could not be found

6 years agoMerge pull request #11942 from nextcloud/techdebt/noid/use-count-function
Morris Jobke [Mon, 12 Nov 2018 16:43:56 +0000 (17:43 +0100)]
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function

Use the defined func()->count() instead of manual counting

6 years agoFix UniqueConstraintViolationException while insert into oc_groups 12419/head
Morris Jobke [Mon, 12 Nov 2018 16:36:35 +0000 (17:36 +0100)]
Fix UniqueConstraintViolationException while insert into oc_groups

* fixes race condition in insert
* fixes potentiaol deadlock

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoDo not fail if the icon file doesn't exists 12420/head
Julius Härtl [Mon, 12 Nov 2018 16:31:54 +0000 (17:31 +0100)]
Do not fail if the icon file doesn't exists

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-constraint
Morris Jobke [Mon, 12 Nov 2018 16:27:09 +0000 (17:27 +0100)]
Merge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-constraint

Fix UniqueConstraintViolationException while insert into oc_file_locks

6 years agoRemove outdated integrity warning on each page 12418/head
Morris Jobke [Mon, 12 Nov 2018 15:54:38 +0000 (16:54 +0100)]
Remove outdated integrity warning on each page

* integrity warning is shown during update and in the admin setup checks
* there is also the plan to retire this old way of notification

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12411 from nextcloud/bugfix/6160/oc_filecache-unique-constraint
Morris Jobke [Mon, 12 Nov 2018 15:52:48 +0000 (16:52 +0100)]
Merge pull request #12411 from nextcloud/bugfix/6160/oc_filecache-unique-constraint

Fix UniqueConstraintViolationException while insert into oc_filecache

6 years agoFix UniqueConstraintViolationException while insert into oc_file_locks 12413/head
Morris Jobke [Mon, 12 Nov 2018 14:13:10 +0000 (15:13 +0100)]
Fix UniqueConstraintViolationException while insert into oc_file_locks

* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12409 from nextcloud/admin-vue-approval-fix
Morris Jobke [Mon, 12 Nov 2018 13:48:06 +0000 (14:48 +0100)]
Merge pull request #12409 from nextcloud/admin-vue-approval-fix

Use nextcloud-password-confirmation

6 years agoFix UniqueConstraintViolationException while insert into oc_filecache 12411/head
Morris Jobke [Mon, 12 Nov 2018 12:43:46 +0000 (13:43 +0100)]
Fix UniqueConstraintViolationException while insert into oc_filecache

* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violati...
Morris Jobke [Mon, 12 Nov 2018 12:41:00 +0000 (13:41 +0100)]
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist

Catch UniqueConstraintViolationException inside insertIfNotExist

6 years agofixup! Use nextcloud-password-confirmation 12409/head
John Molakvoæ (skjnldsv) [Mon, 12 Nov 2018 12:05:51 +0000 (13:05 +0100)]
fixup! Use nextcloud-password-confirmation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agofixup! Use nextcloud-password-confirmation
John Molakvoæ (skjnldsv) [Mon, 12 Nov 2018 11:54:17 +0000 (12:54 +0100)]
fixup! Use nextcloud-password-confirmation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoException is not thrown anymore 12371/head
Morris Jobke [Mon, 12 Nov 2018 11:22:04 +0000 (12:22 +0100)]
Exception is not thrown anymore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12408 from nextcloud/bugfix/noid/icon-cacher-update
Morris Jobke [Mon, 12 Nov 2018 11:16:43 +0000 (12:16 +0100)]
Merge pull request #12408 from nextcloud/bugfix/noid/icon-cacher-update

Make sure to always load the latest icons-vars.css file

6 years agoUse nextcloud-password-confirmation
John Molakvoæ (skjnldsv) [Mon, 12 Nov 2018 10:54:56 +0000 (11:54 +0100)]
Use nextcloud-password-confirmation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12384 from nextcloud/fix/12357/public-share-scrollbar
Morris Jobke [Mon, 12 Nov 2018 10:16:53 +0000 (11:16 +0100)]
Merge pull request #12384 from nextcloud/fix/12357/public-share-scrollbar

Reduces the footer link padding

6 years agoMake sure to always load the latest icons-vars.css file 12408/head
Julius Härtl [Mon, 12 Nov 2018 10:00:56 +0000 (11:00 +0100)]
Make sure to always load the latest icons-vars.css file

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12389 from nextcloud/fix-dav-groupid
John Molakvoæ [Mon, 12 Nov 2018 08:49:24 +0000 (09:49 +0100)]
Merge pull request #12389 from nextcloud/fix-dav-groupid

Fix displayName return of dav groups request

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 12 Nov 2018 01:12:49 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12388 from nextcloud/inline-input-confirm-margin-fix
Morris Jobke [Sun, 11 Nov 2018 22:34:33 +0000 (23:34 +0100)]
Merge pull request #12388 from nextcloud/inline-input-confirm-margin-fix

Fix inline input confirm margin

6 years agoMerge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix
Morris Jobke [Sun, 11 Nov 2018 22:30:14 +0000 (23:30 +0100)]
Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix

Fixes the grid toggle for none folder shares

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 11 Nov 2018 01:13:10 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

6 years agochange "Download" to "Download all files" for shared folders 12398/head
Jonas Sulzer [Sat, 10 Nov 2018 18:10:31 +0000 (19:10 +0100)]
change "Download" to "Download all files" for shared folders

fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
6 years agoFix displayName return of dav groups request 12389/head
John Molakvoæ (skjnldsv) [Sat, 10 Nov 2018 08:51:09 +0000 (09:51 +0100)]
Fix displayName return of dav groups request

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix inline input confirm margin 12388/head
John Molakvoæ (skjnldsv) [Sat, 10 Nov 2018 08:48:14 +0000 (09:48 +0100)]
Fix inline input confirm margin

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 10 Nov 2018 01:12:25 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoFixes the grid toggle for none folder shares 12385/head
Michael Weimann [Fri, 9 Nov 2018 21:28:19 +0000 (22:28 +0100)]
Fixes the grid toggle for none folder shares

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoFixes the footer #12357 12384/head
Michael Weimann [Fri, 9 Nov 2018 20:23:02 +0000 (21:23 +0100)]
Fixes the footer #12357

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoMerge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version
Morris Jobke [Fri, 9 Nov 2018 15:48:12 +0000 (16:48 +0100)]
Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version

Check for compatible apps from the appstore fails

6 years agoAdd deprecation message ofr insertIfNotExist
Morris Jobke [Fri, 9 Nov 2018 11:13:30 +0000 (12:13 +0100)]
Add deprecation message ofr insertIfNotExist

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoCatch UniqueConstraintViolationException inside insertIfNotExist
Morris Jobke [Fri, 9 Nov 2018 09:35:12 +0000 (10:35 +0100)]
Catch UniqueConstraintViolationException inside insertIfNotExist

This is the most common case for the usage of this method.

See also https://github.com/nextcloud/server/issues/12369 and the linked tickets.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAdjust unit tests 12358/head
Joas Schilling [Fri, 9 Nov 2018 09:22:19 +0000 (10:22 +0100)]
Adjust unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 9 Nov 2018 01:12:25 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12349 from nextcloud/feature/noid/populate-notification-message...
Morris Jobke [Thu, 8 Nov 2018 21:47:55 +0000 (22:47 +0100)]
Merge pull request #12349 from nextcloud/feature/noid/populate-notification-message-with-the-comment

Populate the mention-notification with the actual message

6 years agoMerge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public...
Morris Jobke [Thu, 8 Nov 2018 21:44:26 +0000 (22:44 +0100)]
Merge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu

Adjust acceptance tests to changes in public share page menu

6 years agoFix IE rule for min width 12359/head
John Molakvoæ (skjnldsv) [Thu, 8 Nov 2018 17:19:52 +0000 (18:19 +0100)]
Fix IE rule for min width

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoUse the defined func()->count() instead of manual counting 11942/head
Joas Schilling [Fri, 19 Oct 2018 14:44:28 +0000 (16:44 +0200)]
Use the defined func()->count() instead of manual counting

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoImprove style of incompatible apps list
Morris Jobke [Thu, 8 Nov 2018 14:28:58 +0000 (15:28 +0100)]
Improve style of incompatible apps list

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames
blizzz [Thu, 8 Nov 2018 14:13:24 +0000 (15:13 +0100)]
Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames

do not offer to change display name or password, if not possible.

6 years agoUse the version number when checking the appstore for compatible updates
Joas Schilling [Thu, 8 Nov 2018 13:50:12 +0000 (14:50 +0100)]
Use the version number when checking the appstore for compatible updates

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoFix overlapping update button in notifications 12354/head
Morris Jobke [Thu, 8 Nov 2018 13:19:46 +0000 (14:19 +0100)]
Fix overlapping update button in notifications

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAdjust acceptance tests to changes in public share page menu 12352/head
Daniel Calviño Sánchez [Thu, 8 Nov 2018 12:01:13 +0000 (13:01 +0100)]
Adjust acceptance tests to changes in public share page menu

The "Download" item in the menu of public share pages is no longer shown
in wide (>768px) windows (although the element is in the DOM and shown
if resized to a narrow window).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #12310 from nextcloud/version/noid/15.0.0beta1 v15.0.0beta1
Morris Jobke [Thu, 8 Nov 2018 12:12:30 +0000 (13:12 +0100)]
Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1

15.0.0 beta 1

6 years agoPopulate the mention-notification with the actual message 12349/head
Joas Schilling [Thu, 8 Nov 2018 10:54:41 +0000 (11:54 +0100)]
Populate the mention-notification with the actual message

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years ago15.0.0 beta 1 12310/head
Morris Jobke [Tue, 6 Nov 2018 12:27:43 +0000 (13:27 +0100)]
15.0.0 beta 1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated
Morris Jobke [Thu, 8 Nov 2018 10:14:41 +0000 (11:14 +0100)]
Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated

Basic CSP no longer deprecated

6 years agoMerge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars
Morris Jobke [Thu, 8 Nov 2018 09:54:18 +0000 (10:54 +0100)]
Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars

cache webcal calendars on server

6 years agoBasic CSP no longer deprecated 12348/head
Roeland Jago Douma [Thu, 8 Nov 2018 09:37:48 +0000 (10:37 +0100)]
Basic CSP no longer deprecated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12313 from nextcloud/generated-avatar-major-cleanup
Roeland Jago Douma [Thu, 8 Nov 2018 09:28:09 +0000 (10:28 +0100)]
Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup

Clear avatar cache with frontend repair

6 years agoClear avatar cache with frontend repair 12313/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 14:43:53 +0000 (15:43 +0100)]
Clear avatar cache with frontend repair

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 8 Nov 2018 01:12:18 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontent
Roeland Jago Douma [Wed, 7 Nov 2018 21:38:10 +0000 (22:38 +0100)]
Merge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontent

Add fix for IE11 flexbox height bug

6 years agodo not offer to change display name or password, if not possible. 12335/head
Arthur Schiwon [Wed, 7 Nov 2018 15:35:51 +0000 (16:35 +0100)]
do not offer to change display name or password, if not possible.

Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #12316 from nextcloud/public-download-button-fix
Roeland Jago Douma [Wed, 7 Nov 2018 21:31:31 +0000 (22:31 +0100)]
Merge pull request #12316 from nextcloud/public-download-button-fix

Better primary visual on public pages

6 years agoMerge pull request #12340 from nextcloud/ie11-function-fix
Roeland Jago Douma [Wed, 7 Nov 2018 19:25:02 +0000 (20:25 +0100)]
Merge pull request #12340 from nextcloud/ie11-function-fix

Remove arrow function for ie compatibility

6 years agoAdd fix for IE11 flexbox height bug 12342/head
Julius Härtl [Wed, 7 Nov 2018 18:51:00 +0000 (19:51 +0100)]
Add fix for IE11 flexbox height bug

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoRemove arrow function for ie compatibility 12340/head
John Molakvoæ (skjnldsv) [Wed, 7 Nov 2018 16:46:55 +0000 (17:46 +0100)]
Remove arrow function for ie compatibility

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12332 from nextcloud/bugfix/12314/existing-link-title
Morris Jobke [Wed, 7 Nov 2018 15:58:41 +0000 (16:58 +0100)]
Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-title

Also use default label if share label is null

6 years agoMerge pull request #12334 from nextcloud/bugfix/12164/share-dialog-userid
Morris Jobke [Wed, 7 Nov 2018 15:56:55 +0000 (16:56 +0100)]
Merge pull request #12334 from nextcloud/bugfix/12164/share-dialog-userid

Only show label if the shareWith value is relevant

6 years agoBetter primary visual on public pages 12316/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 17:02:47 +0000 (18:02 +0100)]
Better primary visual on public pages

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12324 from nextcloud/add-password-response-parameter-for-returnin...
Morris Jobke [Wed, 7 Nov 2018 15:29:05 +0000 (16:29 +0100)]
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares

Add "password" parameter to the response data of link shares

6 years agoMerge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces
Morris Jobke [Wed, 7 Nov 2018 15:27:36 +0000 (16:27 +0100)]
Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces

Comment mentions with spaces

6 years agoMerge pull request #12329 from nextcloud/feature/noid/test-unique-constraint-violation
Morris Jobke [Wed, 7 Nov 2018 15:16:01 +0000 (16:16 +0100)]
Merge pull request #12329 from nextcloud/feature/noid/test-unique-constraint-violation

Add test that unique constraint is working

6 years agoupdate 3rdparty to fix phan error message 10059/head
Georg Ehrke [Wed, 7 Nov 2018 15:11:05 +0000 (16:11 +0100)]
update 3rdparty to fix phan error message

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoAlso use default label if share label is null 12332/head
Julius Härtl [Wed, 7 Nov 2018 14:14:29 +0000 (15:14 +0100)]
Also use default label if share label is null

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12317 from nextcloud/deps/noid/es6-polyfill
Morris Jobke [Wed, 7 Nov 2018 15:03:33 +0000 (16:03 +0100)]
Merge pull request #12317 from nextcloud/deps/noid/es6-polyfill

Add es6-shim as polyfill and minify core vendor scripts

6 years agoOnly show label if the shareWith value is relevant 12334/head
Julius Härtl [Wed, 7 Nov 2018 14:40:50 +0000 (15:40 +0100)]
Only show label if the shareWith value is relevant

For local users / groups the display name is enough to show, we just need details for email/remote shares

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #11569 from nextcloud/bug-11514/hide-header-actions-for-filedrops
Morris Jobke [Wed, 7 Nov 2018 14:01:37 +0000 (15:01 +0100)]
Merge pull request #11569 from nextcloud/bug-11514/hide-header-actions-for-filedrops

Hides the header actions for file drops

6 years agocache webcal calendars on server
Georg Ehrke [Thu, 28 Jun 2018 11:07:33 +0000 (13:07 +0200)]
cache webcal calendars on server

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoFix the comments UI and activities for space-mentions 11836/head
Joas Schilling [Fri, 12 Oct 2018 12:26:22 +0000 (14:26 +0200)]
Fix the comments UI and activities for space-mentions

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMatch mentions when the username is wrapped in quotes
Joas Schilling [Fri, 12 Oct 2018 12:25:46 +0000 (14:25 +0200)]
Match mentions when the username is wrapped in quotes

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #12328 from nextcloud/more-icon-move
Morris Jobke [Wed, 7 Nov 2018 11:28:36 +0000 (12:28 +0100)]
Merge pull request #12328 from nextcloud/more-icon-move

Fix missing dot before class name

6 years agoFix file move tests 12317/head
Julius Härtl [Wed, 7 Nov 2018 10:13:56 +0000 (11:13 +0100)]
Fix file move tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd es6-shim as polyfill and minify underscore.js
Julius Härtl [Tue, 6 Nov 2018 16:49:22 +0000 (17:49 +0100)]
Add es6-shim as polyfill and minify underscore.js

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFix unit tests 11569/head
Morris Jobke [Wed, 7 Nov 2018 09:25:36 +0000 (10:25 +0100)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoReduce function calls
Morris Jobke [Tue, 6 Nov 2018 09:55:49 +0000 (10:55 +0100)]
Reduce function calls

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoImprove text to be better translatable and use CSS instead of HTML for bold text
Morris Jobke [Tue, 6 Nov 2018 09:55:32 +0000 (10:55 +0100)]
Improve text to be better translatable and use CSS instead of HTML for bold text

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoFix indentation of CSS
Morris Jobke [Tue, 6 Nov 2018 09:54:58 +0000 (10:54 +0100)]
Fix indentation of CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAdapts the code to the new master state
Michael Weimann [Mon, 5 Nov 2018 19:17:00 +0000 (20:17 +0100)]
Adapts the code to the new master state

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoMoves the terms of service into a dialog
Michael Weimann [Sun, 28 Oct 2018 13:58:21 +0000 (14:58 +0100)]
Moves the terms of service into a dialog

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoInlines the share note for file drops
Michael Weimann [Wed, 3 Oct 2018 07:40:22 +0000 (09:40 +0200)]
Inlines the share note for file drops

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoInlines the share note for file drops
Michael Weimann [Wed, 3 Oct 2018 07:40:22 +0000 (09:40 +0200)]
Inlines the share note for file drops

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoHides the header actions for file drops
Michael Weimann [Tue, 2 Oct 2018 22:06:12 +0000 (00:06 +0200)]
Hides the header actions for file drops

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>