Skip to content
This repository has been archived by the owner on Sep 27, 2022. It is now read-only.

4.2.x #168

Open
wants to merge 25 commits into
base: 4.x
Choose a base branch
from
Open

4.2.x #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fdcfb8b
feat: upgrade v-calendar from 0.9.7 to 2.3.4
snyk-bot Jan 29, 2022
9569add
feat: upgrade history from 4.10.1 to 5.2.0
snyk-bot Jan 29, 2022
1c5ff37
feat: upgrade query-string from 6.14.1 to 7.1.0
snyk-bot Jan 29, 2022
3d03fb6
feat: upgrade vue from 2.6.14 to 3.2.26
snyk-bot Jan 29, 2022
09ddae5
feat: upgrade vue-router from 3.5.3 to 4.0.11
snyk-bot Jan 29, 2022
8d0faad
feat: upgrade v-calendar from 0.9.7 to 2.3.4
snyk-bot Jan 29, 2022
839ebdd
feat: upgrade history from 4.10.1 to 5.2.0
snyk-bot Jan 29, 2022
64b5268
feat: upgrade query-string from 6.14.1 to 7.1.0
snyk-bot Jan 29, 2022
08886a9
feat: upgrade multiple dependencies with Snyk
snyk-bot Apr 28, 2022
af2877f
Merge pull request #134 from ymcatwincities/snyk-upgrade-3090d03df658…
podarok May 11, 2022
c98a0af
Merge pull request #135 from ymcatwincities/snyk-upgrade-e80b75503cee…
podarok May 11, 2022
9b88f82
Merge branch '4.2.x' into snyk-upgrade-ff8bdc7f304e8d79fccc98d3a6d4c99d
podarok May 11, 2022
f034b65
Merge pull request #136 from ymcatwincities/snyk-upgrade-ff8bdc7f304e…
podarok May 11, 2022
131730d
Merge branch '4.x' into snyk-upgrade-b9f55989b9e103815d014475a9091691
podarok May 11, 2022
603fc0a
Merge pull request #137 from ymcatwincities/snyk-upgrade-b9f55989b9e1…
podarok May 11, 2022
45b36f8
Merge branch '4.2.x' into snyk-upgrade-c23cb8e8eddec618fe7b83e64d388509
podarok May 11, 2022
e59a8ea
Merge pull request #138 from ymcatwincities/snyk-upgrade-c23cb8e8edde…
podarok May 11, 2022
38395f6
Merge pull request #140 from ymcatwincities/snyk-upgrade-68bc3c56df3d…
podarok May 11, 2022
8479ca7
Merge pull request #141 from ymcatwincities/snyk-upgrade-388e7e85c5b8…
podarok May 11, 2022
7865870
Merge branch '4.2.x' into snyk-upgrade-994544f3cfcae7faf4b444eca6ba1963
podarok May 11, 2022
8021c29
Merge pull request #142 from ymcatwincities/snyk-upgrade-994544f3cfca…
podarok May 11, 2022
8e60e4a
Merge pull request #167 from ymcatwincities/snyk-upgrade-fb1b947a5bcf…
podarok May 11, 2022
c2c2c97
fix: package.json comma
podarok May 11, 2022
bb50711
fix: solve fontawesome for vue 3
podarok May 11, 2022
8475c96
feat: compile fix. First try.
podarok May 11, 2022
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
7 changes: 4 additions & 3 deletions openy_af4_vue_app/dist/activity_finder_4.umd.min.js
View file
Open in desktop

Large diffs are not rendered by default.

19,922 changes: 11,718 additions & 8,204 deletions openy_af4_vue_app/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions openy_af4_vue_app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/vue-fontawesome": "^2.0.6",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/vue-fontawesome": "^3.0.0-5",
"axios": "^0.26.0",
"bootstrap": "^4.6.1",
"bootstrap-vue": "^2.21.2",
"core-js": "^3.20.3",
"vue": "^2.6.14",
"vue-router": "^3.5.3"
"vue": "^3.2.26",
"vue-router": "^4.0.11"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.13",
Expand Down
8 changes: 4 additions & 4 deletions openy_af4_vue_app/src/components/modals/ActivityDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</a>
<a
v-if="!isBookmarked(age) && !legacyMode"
key="bookmark"
key="bookmarked_not_legacy"
role="button"
class="bookmark"
title="Add bookmark"
Expand All @@ -119,7 +119,7 @@
</a>
<a
v-else-if="!legacyMode"
key="bookmark"
key="bookmark_not_legacy"
role="button"
class="bookmark bookmarked"
title="Remove bookmark"
Expand All @@ -140,7 +140,7 @@
</a>
<a
v-if="!isBookmarked(age) && !legacyMode"
key="bookmark"
key="not_bookmarked_not_legacy"
role="button"
class="bookmark"
title="Add bookmark"
Expand All @@ -150,7 +150,7 @@
</a>
<a
v-else-if="!legacyMode"
key="bookmark"
key="bookmark_not_legacy"
role="button"
class="bookmark bookmarked"
title="Remove bookmark"
Expand Down
76 changes: 31 additions & 45 deletions openy_af_vue_app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions openy_af_vue_app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"dependencies": {
"axios": "^0.26.1",
"bootstrap-vue": "^2.0.2",
"history": "^4.10.1",
"history": "^5.2.0",
"lodash": "^4.17.13",
"query-string": "^7.1.0",
"moment": "^2.29.2",
"query-string": "^6.8.3",
"set-value": ">=4.1.0",
"v-calendar": "^0.9.7",
"v-calendar": "^2.3.4",
"vue-bootstrap-typeahead": "^0.2.6"
},
"devDependencies": {
Expand Down
76 changes: 31 additions & 45 deletions openy_cf_vue_app/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions openy_cf_vue_app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"dependencies": {
"axios": "^0.26.0",
"bootstrap-vue": "^2.0.0-rc.20",
"history": "^4.9.0",
"history": "^5.2.0",
"lodash": "^4.17.13",
"query-string": "^7.1.0",
"moment": "^2.29.2",
"query-string": "^6.5.0",
"v-calendar": "^0.9.7",
"v-calendar": "^2.3.4",
"vue-bootstrap-typeahead": "^0.2.6"
},
"devDependencies": {
Expand Down