hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into shigusegubu-vue3

Browse source 
* develop: (32 commits)
  Update Font Awesome to v6.1.2
  Update dependency chromedriver to v103
  Update dependency body-scroll-lock to v3
  Update vue monorepo
  Fix poll duration i18n
  Update dependency sass to v1.54.0
  Update dependency @vuelidate/validators to v2.0.0-alpha.31
  Update dependency @vue/test-utils to v2.0.2
  Update dependency @vuelidate/core to v2.0.0-alpha.43
  Fix tests
  Update dependency vue-router to v4.1.2
  Update dependency vue-i18n to v9.2.0-beta.40
  Update Node.js to v16
  Update Font Awesome to v6
  Update babel monorepo to v7.18.9
  Use node 16
  Update Node.js to v18
  Fix non-8bit string export problem
  Update dependency eslint-plugin-import to v2.26.0
  Update babel monorepo
  ...
This commit is contained in:
Henry Jameson 2022-07-31 13:20:08 +03:00
commit 7413e1c82d
7 changed files with 1698 additions and 1308 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/poll/poll_form.vue
View file

@ -84,7 +84,7 @@
:key="unit"
:value="unit"
>
{{ $t(`time.${unit}_short`, ['']) }}
{{ $tc(`time.unit.${unit}_short`, expiryAmount, ['']) }}
</option>
</Select>
</div>

4
src/services/export_import/export_import.js
View file

@ -1,9 +1,11 @@
import utf8 from 'utf8'
export const newExporter = ({
filename = 'data',
getExportedObject
}) => ({
exportData () {
const stringified = JSON.stringify(getExportedObject(), null, 2) // Pretty-print and indent with 2 spaces
const stringified = utf8.encode(JSON.stringify(getExportedObject(), null, 2)) // Pretty-print and indent with 2 spaces
// Create an invisible link with a data url and simulate a click
const e = document.createElement('a')