mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 06:21:27 +00:00
Merge pull request #4890 from pixelfed/staging
Update AccountImport.vue, fix new IG export format
This commit is contained in:
commit
9dcb25c8e2
36 changed files with 3 additions and 2 deletions
|
@ -90,6 +90,7 @@
|
||||||
- Update login view, add email prefill logic ([d76f0168](https://github.com/pixelfed/pixelfed/commit/d76f0168))
|
- Update login view, add email prefill logic ([d76f0168](https://github.com/pixelfed/pixelfed/commit/d76f0168))
|
||||||
- Update LoginController, fix captcha validation error message ([0325e171](https://github.com/pixelfed/pixelfed/commit/0325e171))
|
- Update LoginController, fix captcha validation error message ([0325e171](https://github.com/pixelfed/pixelfed/commit/0325e171))
|
||||||
- Update ApiV1Controller, properly cast boolean sensitive parameter. Fixes #4888 ([0aff126a](https://github.com/pixelfed/pixelfed/commit/0aff126a))
|
- Update ApiV1Controller, properly cast boolean sensitive parameter. Fixes #4888 ([0aff126a](https://github.com/pixelfed/pixelfed/commit/0aff126a))
|
||||||
|
- Update AccountImport.vue, fix new IG export format ([59aa6a4b](https://github.com/pixelfed/pixelfed/commit/59aa6a4b))
|
||||||
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
- ([](https://github.com/pixelfed/pixelfed/commit/))
|
||||||
|
|
||||||
## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)
|
## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)
|
||||||
|
|
BIN
public/js/account-import.js
vendored
BIN
public/js/account-import.js
vendored
Binary file not shown.
BIN
public/js/admin.js
vendored
BIN
public/js/admin.js
vendored
Binary file not shown.
BIN
public/js/collectioncompose.js
vendored
BIN
public/js/collectioncompose.js
vendored
Binary file not shown.
BIN
public/js/collections.js
vendored
BIN
public/js/collections.js
vendored
Binary file not shown.
BIN
public/js/compose.chunk.10e7f993dcc726f9.js
vendored
BIN
public/js/compose.chunk.10e7f993dcc726f9.js
vendored
Binary file not shown.
BIN
public/js/compose.chunk.1ac292c93b524406.js
vendored
Normal file
BIN
public/js/compose.chunk.1ac292c93b524406.js
vendored
Normal file
Binary file not shown.
BIN
public/js/compose.js
vendored
BIN
public/js/compose.js
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js
vendored
Normal file
BIN
public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js
vendored
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
public/js/home.chunk.351f55e9d09b6482.js
vendored
BIN
public/js/home.chunk.351f55e9d09b6482.js
vendored
Binary file not shown.
BIN
public/js/home.chunk.f3f4f632025b560f.js
vendored
Normal file
BIN
public/js/home.chunk.f3f4f632025b560f.js
vendored
Normal file
Binary file not shown.
BIN
public/js/landing.js
vendored
BIN
public/js/landing.js
vendored
Binary file not shown.
BIN
public/js/manifest.js
vendored
BIN
public/js/manifest.js
vendored
Binary file not shown.
BIN
public/js/portfolio.js
vendored
BIN
public/js/portfolio.js
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
public/js/profile.js
vendored
BIN
public/js/profile.js
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
public/js/spa.js
vendored
BIN
public/js/spa.js
vendored
Binary file not shown.
BIN
public/js/status.js
vendored
BIN
public/js/status.js
vendored
Binary file not shown.
BIN
public/js/stories.js
vendored
BIN
public/js/stories.js
vendored
Binary file not shown.
BIN
public/js/timeline.js
vendored
BIN
public/js/timeline.js
vendored
Binary file not shown.
Binary file not shown.
|
@ -381,7 +381,7 @@
|
||||||
let file = this.$refs.zipInput.files[0];
|
let file = this.$refs.zipInput.files[0];
|
||||||
let entries = await this.model(file);
|
let entries = await this.model(file);
|
||||||
if (entries && entries.length) {
|
if (entries && entries.length) {
|
||||||
let files = await entries.filter(e => e.filename === 'content/posts_1.json');
|
let files = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json');
|
||||||
|
|
||||||
if(!files || !files.length) {
|
if(!files || !files.length) {
|
||||||
this.contactModal(
|
this.contactModal(
|
||||||
|
@ -402,7 +402,7 @@
|
||||||
let entries = await this.model(file);
|
let entries = await this.model(file);
|
||||||
if (entries && entries.length) {
|
if (entries && entries.length) {
|
||||||
this.zipFiles = entries;
|
this.zipFiles = entries;
|
||||||
let media = await entries.filter(e => e.filename === 'content/posts_1.json')[0].getData(new zip.TextWriter());
|
let media = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json')[0].getData(new zip.TextWriter());
|
||||||
this.filterPostMeta(media);
|
this.filterPostMeta(media);
|
||||||
|
|
||||||
let imgs = await Promise.all(entries.filter(entry => {
|
let imgs = await Promise.all(entries.filter(entry => {
|
||||||
|
|
Loading…
Reference in a new issue