[11:45:16 CST(-0600)] <michelled> cindyli, alexn: so, based on the conversation we had after standup it sounds like you might need to throw away some of the work you've done?

[11:45:36 CST(-0600)] <michelled> since we no longer want to alter the size of the video at all

[11:45:56 CST(-0600)] <michelled> at least not dynamically

[11:46:14 CST(-0600)] <michelled> we want to change the size in the actual demo by default

[11:47:17 CST(-0600)] <alexn> michelled: well we decided not to touch video sizes from the beginning and just concentrate on the markup and integrity of the videoPlayer so that it does not look broken. So we did not lose time on trying to scale video according to changes in UIO options

[11:47:32 CST(-0600)] <michelled> oh, that's perfect

[11:47:36 CST(-0600)] <michelled> I'm glad to hear it

[11:47:38 CST(-0600)] <alexn> the whole idea of dynamic video size is VERY complicated

[11:47:48 CST(-0600)] <michelled> and thankfully off the table now

[11:47:54 CST(-0600)] <alexn> yes!

[11:48:04 CST(-0600)] <alexn> we might want to do it later but I guess not for the demo

[11:49:55 CST(-0600)] <alexn> michelled: I pushed a commit with our modifications. There are still left things to do and I disabled few interactions so that we could style the videoPlayer easily but if you want I can send you the link to the branch so you can take a look of what is done

[11:50:34 CST(-0600)] <alexn> or we could show it once we done with making it work on Chrome and Safari

[11:55:17 CST(-0600)] <michelled> alexn: maybe drop the link in - I'll take a look at it in a bit

[13:40:15 CST(-0600)] <michelled> alexn, cindyli: the work I'm doing is going to cause me to change the markup.

[13:40:21 CST(-0600)] <michelled> how far along is your branch?

[13:40:25 CST(-0600)] <michelled> is it ready for merging?

[13:40:46 CST(-0600)] <cindyli> michelled: still trying to fix the chrome issue

[13:40:50 CST(-0600)] <michelled> I'd rather work off you branch instead of dealing with merge conflicts later

[13:41:05 CST(-0600)] <michelled> do you think I'm safe to work off your branch?

[13:41:53 CST(-0600)] <cindyli> certainly, michelled, here's the branch - https://github.com/xOZx/videoPlayer/tree/FLUID-4619

[13:41:59 CST(-0600)] <michelled> thx

[13:42:39 CST(-0600)] <michelled> btw - cindyli, I pushed colin's high contrast branch to demo

[13:42:45 CST(-0600)] <michelled> you probably should update

[13:42:52 CST(-0600)] <cindyli> cool. thanks, michelled

[13:42:55 CST(-0600)] <michelled> np

[13:45:28 CST(-0600)] <cindyli> Justin_o: when i merge pull request into master, there are a couple of options need to be specified. what are they?

[13:47:44 CST(-0600)] <michelled> --no-ff and --log

[13:47:54 CST(-0600)] <cindyli> cool, thanks, michelled

[13:47:58 CST(-0600)] <michelled> if there have been a lot of changes you might specify a number to log

[13:48:08 CST(-0600)] <cindyli> ok

[13:48:15 CST(-0600)] <Justin_o> cindyli: sorry.. michelled beat me to it

[13:48:16 CST(-0600)] <michelled> like: git merge x --no-ff --log=100

[13:48:41 CST(-0600)] <cindyli> cool. thanks, guys

[13:49:04 CST(-0600)] <michelled> np

Browser not supported