#amara

all: the dev branch in the git repo is now ready to receive your commits

sjl: i has all teh commits

sjl: what about the recent commits (last week + today)? are they on dev yet?

maggie_s_: the git branch, yes

maggie_s_: I doubt jenkins has finished deploying those to dev though

probably gonna be a few minutes

sjl: sweet, thanks!

Project i_2093 build #1837: FAILURE in 10 min: http://dev.universalsubtitles.org:8888/job/i_20...

arthur: you online?

arthur: I was skyping with Steve when your email came in.

arthurdebert: do you know if we use version 2 or version 3 of the youtube data api?

janeted1: v2, or what the gdata client uses by default https://github.com/pculture/unisubs/blob/i-2098...

thx honza

all: morning

honza: how do?

all: morning

fernandotakai: howdy there, pahtna

all: hallo

cz: hey

fernandotakai: whatcha been workin on?

cz: fixing session expiring/session conflicts on the new editor

cz: did you guys get my message yesterday about me leaving for the hospital?

my internet connection was quite bad and i'm not sure it went through

fernandotakai: I did not

fernandotakai: everything ok?

cz: ah, totally sorry

cz: felling shitty - shortness of breath, dizziness

cz: going to the doctor today to schedule some tests (blood, x-rays and etc)

fernandotakai: sheesh, hope everything goes ok

all: morning

ehazlett: howdy tater

all: so if something has to go before DMR we use staging now right?

er branch off of staging

ehazlett: yiss

thx

ehazlett: wait no, is it going to go to prod before any of this DMR?

sjl: possibly -- i was working on the redis cache stuff

ehazlett: make that a feature branch from prod then

sjl: ah ok

ehazlett: -1 for listening to me

sjl: +1 for guidance

lol

honza: -1 for mis-guidance :P

honza: +1 for effort ;)

scoreboard

mr_honza: 186, mr_nicksergeant: 159, mr_sjl: 148, mr_ehazlett: 142, mr_arthurdebert: 118, ms_maggie_s: 60, mr_cz: 58, mr_fernandotakai: 48, ms_janeted: 8

[o__o]: animate me too much coffee

wat

all: maybe we should have a call at some point to make sure we're all clear on the new workflow? Or are we all good?

i think it's sufficient if we just instruct people to ignore my advice

Project unisubs-staging build #1860: FAILURE in 7 min 47 sec: http://dev.universalsubtitles.org:8888/job/unis...

* Steve Losh: 2063: tern should use source order for translations

* Steve Losh: Fix PALC migration.

sjl: it looks like dev was deployed ok -- did the re-structure of the repo go ok?

ehazlett: I believe so. I still need to get staging server updated properly... I think the pull is going to cause trouble because it won't be a fast forward

ah

ehazlett: should I just update the repo manually?

with pull --force?

sjl: that doesn't sound good

yeah, basically we're reverting to an older commit

although it's just staging and we're not actually destroying anything right? it's just reverting?

correct. dev is now pointing to the latest commit so everything is safe there

cool

sjl: +10 for repo fixing

all: howday

all: baby duty, will be a bit late for work still

ehazlett: am I gonna need to update any other repos besides the main one? are there any others hidden around somewhere?

sjl: not that i'm aware of

sjl: the integration repo didn't have anything that needed reverted right?

ehazlett: well

effectively the integration repo branchs shouldn't matter on the server

right?

it should always check out whatever hash is in the optional/... file

sjl: right

I think some sell-your-stuff-on-ebay company must have an email address similar to one of my old ones, because about once a month I get an email from some random person with a picture of a random object asking me if I want to sell it

haha

ugh god I don't have any of my git aliases on the server this hurts so bad

today it's this http://i.imgur.com/cCyQ9dl.jpg

sjl hey, what's up? are we now commiting / looking at dev only?

arthurdebert: yes, dev is where all new dmr-related development should go

actually I'm going to send an email I guess

sjl tks!

honza: was there a ticket to change subtitle start times from seconds -> time expressions?

nicksergeant: oui

nicksergeant: https://unisubs.sifterapp.com/issues/2116

honza: oh, ok. cz, did you see this? original editor comps had seconds instead of time expressions

honza: holy mother https://github.com/pculture/unisubs/pull/115#is...

honza: why does github say there are a bazillion commits there

nicksergeant: check your email

hahaha

nicksergeant: branches have been reset, github is probably confused as hell

sjl: I saw the email ;)

sjl: word

I didn't know pull requests were dependent on things happening outside of them

that is insanely confusing

a pull request should be a conical set of changes imo

canonical

blame github and it'd auto-updating pull requests based on new commits to branches

yeah. I do

basically, a pull request means "pull this branch into this one"

not "pull these changes into this branch"

yeah, I figured that after I saw what it did.

basically "we use feature branches at github, this is nice for that, if you don't use feature branches gtfo"

nicksergeant honza: I think we need to figure something out where we show an abbreviated timestamp by default but make it easy to see (and eventually edit) the full time expression

nicksergeant honza: is that change live on staging yet?

honza: when you throw new options onto a popcorn plugin instance, it uses the _update method instead of the start method: https://github.com/pculture/unisubs/blob/dev/me...

honza: this is confusing because it's not yet documented by the popcorn project as far as I can tell (I was talking with the devs to figure that piece out)

cz: no I think it's still an open pull request

honza: screenshot me what it looks like on your local plz

cz: k

honza: http://popcornjs.org/popcorn-docs/addon-develop...

honza: you can see some docs there about it

cz: http://i.imgur.com/OZEq4uG.png

eek

!clean

nicksergeant: can we have that display rounded by default and show the full expression on hover?

nicksergeant: those are awful

cz: yea they are

cz: we *can* round it, but: https://unisubs.sifterapp.com/issues/2116

cz: never taking an unassigned ticket again