#amara

sylvainc, can you please check this pull request for gh-1195 when you have some time.

janeted, sure looking at it now

thanks

and sylvainc https://github.com/pculture/unisubs/pull/1221 too if you don't mind

sure janeted,

Did you notice if the "new paragraph" indocators were still there?

the changes are quite complex and I am not sure I understand that part right

sylvainc, yes they are still there and I checked that they get exported properly

great, thanks!!

and this is the babelsubs pull request that goes along with the 1195 changes

ehazlett, if you are around, can you please check this pull request

yes

thanks ehazlett sylvainc

ehazlett, can you deploy production now. It will require an update of babelsubs.

janeted, 1221 and 1220 have been merged. In the process there was a normal conflict to resolve (as usual, with compiled CSS), so it it worth giving a short look at the editor layout, just in case

ok - will do

thanks

ok I will need to rebuild the image. I will do this in a bit and let you know.

ok perfect

Hi maggie_s

later ehazlett will be deploying staging and it will have the changes for 751 (the download on save fail)

janeted: great!

safari will fallback to using the old copy paste, and the rest will have the automatic download using filesaver.js

so that will be a big improvement

also will be the escaped chars thing in the editors, gh-1195

those are in staging right?

I just need to merrge and deploy?

yes - those the pulls that were merged earlier

awesome thx

yes - and the babelsuubs

so we'll want to check on staging, and then maybe deploy tomorrow.

janeted: ok, I'll look at that tonight

that will be great.

I've checked locally and I'm running the sel tests and also checked for the js injection - and it all seems fine.

sylvain also mentioned double checking the editor - as he resolved a typical merge conflict when he was merging, but just wants to be sure

janeted: the new editor? anything in particular or general functioning?

just general - as far as I konw

janeted: ok, noted

yes - because the 1195 changes did have a lot of effects.

you can see in the ticket

janeted: true, it did

actually maggie_s - I'm not seeing the subs in the new editor overlayed on the video

that maybe merge-conflict fallout

because I know those test passed on the 1195 branch

janeted: locally or on staging?

my local copy of staging

janeted: ah, I see

yes - so it works for me locally on the gh-1215 branch and on the gh-1195 branch

and the gh-1125 is ok

and now when I run the gh-751 branch they don't show, and that's where the merge conflicts were resolved.

maggie_s, I sent a note to ben and sylvain about that, so hopefully we can get that resolved tomorrow.

really want to see 1195 get out

ok - saying good night now.

janeted: thanks! good night, ttyl

da