Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(fairuse): Adjust website URL #1637

Merged
merged 2 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/notifications-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-main.js.map

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Components/Notification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</div>
<div v-else-if="externalLink" class="notification-actions">
<NcButton type="primary"
href="https://nextcloud.com/pushnotifications"
href="https://nextcloud.com/fairusepolicy"
class="action-button pull-right"
target="_blank"
rel="noreferrer noopener">
Expand All @@ -84,7 +84,7 @@
import Action from './Action.vue'
import { generateOcsUrl, generateFilePath } from '@nextcloud/router'
import moment from '@nextcloud/moment'
import RichText from '@nextcloud/vue-richtext'

Check warning on line 87 in src/Components/Notification.vue

View workflow job for this annotation

GitHub Actions / eslint

Using exported name 'RichText' as identifier for default export
import DefaultParameter from './Parameters/DefaultParameter.vue'
import File from './Parameters/File.vue'
import User from './Parameters/User.vue'
Expand Down Expand Up @@ -243,7 +243,7 @@
},

mounted() {
this._$el = $(this.$el)

Check warning on line 246 in src/Components/Notification.vue

View workflow job for this annotation

GitHub Actions / eslint

The global property or function $ was deprecated in Nextcloud 19.0.0

// Parents: TransitionGroup > Transition > HeaderMenu
if (typeof this.$parent.$parent.$parent.showBrowserNotifications === 'undefined') {
Expand Down
4 changes: 2 additions & 2 deletions src/NotificationsApp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
datetime="warning"
app="core"
:icon="warningIcon"
external-link="https://nextcloud.com/pushnotifications"
external-link="https://nextcloud.com/fairusepolicy"
:message="emptyContentDescription"
:subject="emptyContentMessage"
:index="2016" />
Expand Down Expand Up @@ -78,7 +78,7 @@

<template v-if="hasThrottledPushNotifications" #action>
<NcButton type="primary"
href="https://nextcloud.com/pushnotifications"
href="https://nextcloud.com/fairusepolicy"
target="_blank"
rel="noreferrer noopener">
<template #icon>
Expand Down Expand Up @@ -212,12 +212,12 @@

mounted() {
this.tabId = OC.requestToken || ('' + Math.random())
this._$icon = $(this.$refs.icon)

Check warning on line 215 in src/NotificationsApp.vue

View workflow job for this annotation

GitHub Actions / eslint

The global property or function $ was deprecated in Nextcloud 19.0.0
this._oldcount = 0

// Bind the button click event
console.debug('Registering notifications container as a menu')
OC.registerMenu($(this.$refs.button), $(this.$refs.container), undefined, true)

Check warning on line 220 in src/NotificationsApp.vue

View workflow job for this annotation

GitHub Actions / eslint

The global property or function $ was deprecated in Nextcloud 19.0.0

Check warning on line 220 in src/NotificationsApp.vue

View workflow job for this annotation

GitHub Actions / eslint

The global property or function $ was deprecated in Nextcloud 19.0.0

this.checkWebNotificationPermissions()

Expand Down
Loading