- fix Photos not shown in large browser windows #630

[skjnldsv]

cc @dsmic

see #684 #664
fix #630

[skjnldsv]

/backport to stable21

[skjnldsv]

/backport to stable20

[skjnldsv]

/backport to stable19

[dsmic]

This pull request is not possible now. The reason is, that I had to report a bug in the
pull request environment.

Pull request environment allways reports node.12 failure #685

And two forks are not possible....

As soon as I can build and create valid pull requests, I will create a new one?

[skjnldsv]

As soon as I can build and create valid pull requests, I will create a new one?

Please don't close my pull request ^^
I want this to go in so we can move on, we can fix other stuff later

[skjnldsv]

/compile amend /

[dsmic]

OK, than I have to reintroduce the fix.

I will do it now!

[skjnldsv]

OK, than I have to reintroduce the fix.

I will do it now!

don't push on this branch

[skjnldsv]

Here we go! @dsmic
If you want to approve, we can merge this! 🚀

[dsmic]

OK, than I have to reintroduce the fix.
I will do it now!

don't push on this branch

ok, I would not be able to, as I deleted this fork. But the commit seems fine.

[dsmic]

Thanks for your patience :)

[backportbot-nextcloud]

The backport to stable20 failed. Please do this backport manually.

[backportbot-nextcloud]

The backport to stable19 failed. Please do this backport manually.

[Exist2Resist]

The backport to stable20 failed. Please do this backport manually.

Any update on this.

[skjnldsv]

AH, backporting failed

[skjnldsv]

@dsmic can you manually open to stable20 and stable19

[dsmic]

Sorry, but I don‘t know how to do this. If I get bored the next weeks I might look into it….

[skjnldsv]

Checkout the stable branches, cherry-pick 3bc1742 and solve conflicts. Then push :)

[dsmic]

Ok, but I am not too happy with this. The conflict results from

(base) detlef@ubuntu-i7:~/tmp/devnextcloud/server/photos$ git cherry-pick 3bc1742 
warning: Cannot merge binary files: js/photos-main.js.map (HEAD vs. 3bc1742... - fix Photos not shown in large browser windows #630)
warning: Cannot merge binary files: js/photos-main.js (HEAD vs. 3bc1742... - fix Photos not shown in large browser windows #630)
warning: Cannot merge binary files: js/photos-3.js.map (HEAD vs. 3bc1742... - fix Photos not shown in large browser windows #630)
warning: Cannot merge binary files: js/photos-0.js.map (HEAD vs. 3bc1742... - fix Photos not shown in large browser windows #630)
warning: Cannot merge binary files: js/photos-0.js (HEAD vs. 3bc1742... - fix Photos not shown in large browser windows #630)
error: Konnte 3bc1742... (- fix Photos not shown in large browser windows #630) nicht anwenden
Hinweis: nach Auflösung der Konflikte markieren Sie die korrigierten Pfade
Hinweis: mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit
Hinweis: 'git commit' ein

which seems kind of no fun. Should the backport bot not run make build-js-production to allow such changes to be backported?

Of cause I can run make build-js-production and than push, but

this way I do not trust my dev environment enough to just push this map and js files to a stable brunch ...