Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/tasks.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package-lock.json59
-rw-r--r--package.json2
-rw-r--r--src/components/AppNavigation/TheSettings.vue1
-rw-r--r--src/components/TaskBody.vue1
-rw-r--r--src/components/TheCollections/General.vue1
-rw-r--r--src/components/TheCollections/Week.vue1
-rw-r--r--src/components/TheDetails.vue1
-rw-r--r--src/main.js2
-rw-r--r--src/models/task.js1
-rw-r--r--src/store/storeHelper.js1
-rw-r--r--src/store/tasks.js1
-rw-r--r--tests/javascript/unit/setup.js3
12 files changed, 65 insertions, 9 deletions
diff --git a/package-lock.json b/package-lock.json
index 276d3c0a..86bb641f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3924,6 +3924,52 @@
}
}
},
+ "@nextcloud/moment": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@nextcloud/moment/-/moment-1.1.1.tgz",
+ "integrity": "sha512-lh7Xn9Ver12pLfE0rpjxE6x/ipscAV+7fw1u+7TJak1QR1T1UDRMZ9dA7z77W8mZH2C3yveTh/VEHZIflKBrng==",
+ "requires": {
+ "@nextcloud/l10n": "1.2.0",
+ "core-js": "3.6.4",
+ "jed": "^1.1.1",
+ "moment": "2.24.0",
+ "node-gettext": "^2.0.0"
+ },
+ "dependencies": {
+ "@nextcloud/l10n": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.2.0.tgz",
+ "integrity": "sha512-aPsVAewCYMNe2h0yse3Fj7LofvnvFPimojw24K47ip1+I1gawMIsQL+BYAnN8wzlcbsDTEc7I1FxtOh+8dHHIA==",
+ "requires": {
+ "core-js": "^3.6.4",
+ "node-gettext": "^3.0.0"
+ },
+ "dependencies": {
+ "node-gettext": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-3.0.0.tgz",
+ "integrity": "sha512-/VRYibXmVoN6tnSAY2JWhNRhWYJ8Cd844jrZU/DwLVoI4vBI6ceYbd8i42sYZ9uOgDH3S7vslIKOWV/ZrT2YBA==",
+ "requires": {
+ "lodash.get": "^4.4.2"
+ }
+ }
+ }
+ },
+ "core-js": {
+ "version": "3.6.4",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+ "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+ },
+ "node-gettext": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-2.1.0.tgz",
+ "integrity": "sha512-vsHImHl+Py0vB7M2UXcFEJ5NJ3950gcja45YclBFtYxYeZiqdfQdcu+G9s4L7jpRFSh/J/7VoS3upR4JM1nS+g==",
+ "requires": {
+ "lodash.get": "^4.4.2"
+ }
+ }
+ }
+ },
"@nextcloud/router": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.0.2.tgz",
@@ -5517,7 +5563,7 @@
},
"mkdirp": {
"version": "0.5.4",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+ "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
"integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
"dev": true,
"requires": {
@@ -6186,10 +6232,10 @@
"dev": true
},
"cdav-library": {
- "version": "github:nextcloud/cdav-library#ae2d8e269b0e0d7e1c2dd5cf5b4d3e3ccd392d31",
- "from": "github:nextcloud/cdav-library#ae2d8e269b0e0d7e1c2dd5cf5b4d3e3ccd392d31",
+ "version": "github:nextcloud/cdav-library#2783ae4502bdd130d718e83090e5a8607d2729da",
+ "from": "github:nextcloud/cdav-library",
"requires": {
- "core-js": "^3.6.4",
+ "core-js": "^3.6.5",
"regenerator-runtime": "^0.13.5"
},
"dependencies": {
@@ -11461,6 +11507,11 @@
"istanbul-lib-report": "^3.0.0"
}
},
+ "jed": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
+ "integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ="
+ },
"jest": {
"version": "25.3.0",
"resolved": "https://registry.npmjs.org/jest/-/jest-25.3.0.tgz",
diff --git a/package.json b/package.json
index 9356a30d..70f3e57f 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"dependencies": {
"@nextcloud/axios": "^1.3.2",
"@nextcloud/dialogs": "1.2.2",
+ "@nextcloud/moment": "1.1.1",
"@nextcloud/router": "1.0.2",
"@nextcloud/vue": "1.5.0",
"@vue/test-utils": "^1.0.0-beta.33",
@@ -41,7 +42,6 @@
"markdown-it-link-attributes": "~3.0.0",
"markdown-it-task-lists": "~2.1.1",
"md5": "^2.2.1",
- "moment": "^2.24.0",
"p-limit": "^2.3.0",
"p-queue": "^6.3.0",
"uuid": "^7.0.3",
diff --git a/src/components/AppNavigation/TheSettings.vue b/src/components/AppNavigation/TheSettings.vue
index 69d4010b..b4c683c4 100644
--- a/src/components/AppNavigation/TheSettings.vue
+++ b/src/components/AppNavigation/TheSettings.vue
@@ -61,6 +61,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</template>
<script>
+import moment from '@nextcloud/moment'
import { mapState, mapGetters, mapActions } from 'vuex'
export default {
diff --git a/src/components/TaskBody.vue b/src/components/TaskBody.vue
index c3a73040..501dd2cc 100644
--- a/src/components/TaskBody.vue
+++ b/src/components/TaskBody.vue
@@ -158,6 +158,7 @@ import { linkify } from '../directives/linkify.js'
import TaskStatusDisplay from './TaskStatusDisplay'
import TaskDragContainer from './TaskDragContainer'
+import moment from '@nextcloud/moment'
import Actions from '@nextcloud/vue/dist/Components/Actions'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import { showError } from '@nextcloud/dialogs'
diff --git a/src/components/TheCollections/General.vue b/src/components/TheCollections/General.vue
index d20da38e..2b0bc125 100644
--- a/src/components/TheCollections/General.vue
+++ b/src/components/TheCollections/General.vue
@@ -62,6 +62,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</template>
<script>
+import moment from '@nextcloud/moment'
import { mapGetters, mapActions } from 'vuex'
import { sort, isTaskInList, isParentInList } from '../../store/storeHelper'
import SortorderDropdown from '../SortorderDropdown'
diff --git a/src/components/TheCollections/Week.vue b/src/components/TheCollections/Week.vue
index 2ad23ec4..0053955a 100644
--- a/src/components/TheCollections/Week.vue
+++ b/src/components/TheCollections/Week.vue
@@ -59,6 +59,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
</template>
<script>
+import moment from '@nextcloud/moment'
import { mapGetters, mapActions } from 'vuex'
import { sort, isTaskInList } from '../../store/storeHelper'
import SortorderDropdown from '../SortorderDropdown'
diff --git a/src/components/TheDetails.vue b/src/components/TheDetails.vue
index 593cfd2a..413ea1fd 100644
--- a/src/components/TheDetails.vue
+++ b/src/components/TheDetails.vue
@@ -384,6 +384,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
<script>
import { mapGetters, mapActions } from 'vuex'
import { overdue } from '../store/storeHelper'
+import moment from '@nextcloud/moment'
import DatetimePicker from '@nextcloud/vue/dist/Components/DatetimePicker'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
import Markdown from './Markdown'
diff --git a/src/main.js b/src/main.js
index b5c22bdd..756b931d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -86,8 +86,6 @@ OCA.Tasks.App = new Vue({
this.$OC.Search = new OCA.Search(this.filter, this.cleanSearch)
},
beforeMount() {
- // Configure the locale of moment.js
- moment.locale(this.$OC.getLocale().replace('_', '-').toLowerCase())
this.$store.dispatch('loadCollections')
this.$store.dispatch('loadSettings')
},
diff --git a/src/models/task.js b/src/models/task.js
index 661bc1d3..ed6b1853 100644
--- a/src/models/task.js
+++ b/src/models/task.js
@@ -22,6 +22,7 @@
*
*/
+import moment from '@nextcloud/moment'
import { v4 as uuid } from 'uuid'
import ICAL from 'ical.js'
import PQueue from 'p-queue'
diff --git a/src/store/storeHelper.js b/src/store/storeHelper.js
index 12b513bb..c50a79e5 100644
--- a/src/store/storeHelper.js
+++ b/src/store/storeHelper.js
@@ -21,6 +21,7 @@
*/
'use strict'
+import moment from '@nextcloud/moment'
import ICAL from 'ical.js'
/**
diff --git a/src/store/tasks.js b/src/store/tasks.js
index f834141b..db9d6a4e 100644
--- a/src/store/tasks.js
+++ b/src/store/tasks.js
@@ -29,6 +29,7 @@ import TaskStatus from '../models/taskStatus'
import router from '../router'
import { findVTODObyUid } from './cdav-requests'
import { showError } from '@nextcloud/dialogs'
+import moment from '@nextcloud/moment'
Vue.use(Vuex)
diff --git a/tests/javascript/unit/setup.js b/tests/javascript/unit/setup.js
index 4414f56a..5464a055 100644
--- a/tests/javascript/unit/setup.js
+++ b/tests/javascript/unit/setup.js
@@ -1,6 +1,6 @@
import { config } from '@vue/test-utils'
import { OC } from './OC.js'
-import moment from 'moment'
+import moment from '@nextcloud/moment'
// eslint-disable-next-line node/no-unpublished-import
import MockDate from 'mockdate'
@@ -8,7 +8,6 @@ import MockDate from 'mockdate'
MockDate.set(moment('20190101T123456', 'YYYYMMDDTHHmmss'))
global.OC = new OC()
-global.moment = moment
// Mock nextcloud translate functions
config.mocks.$t = function(app, string) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 08:05:12 +0300