[09:18:57 CDT(-0500)] <cindyli> michelled: Andrey replied to my question about the proper way to issue a pull request for master - "All your branches should be based on master." boo… cherry pick then
[09:23:02 CDT(-0500)] <michelled> that's an odd response given that he told me they should be based on staging 
[09:24:27 CDT(-0500)] <cindyli> I guess we'd better keep 2 branches for each ticket: one based on "master" and merge whatever in there into the other one based on staging
[09:24:58 CDT(-0500)] <cindyli> anastasiac, alexn1: fyi too ^
[09:26:33 CDT(-0500)] <michelled> I guess that's the best plan
[09:28:12 CDT(-0500)] <alexn1> michelled, cindyli: sourceTree makes cherry picking very easy. Let me know if you want me to show how to do it…. just saying 
[09:28:39 CDT(-0500)] <cindyli> thanks, alexn1
[09:32:04 CDT(-0500)] <clown> anastasiac: my tests with various ways of hiding — http://clown.idrc.ocad.ca/Fluid/aria/HiddenPermutations.html
[09:33:10 CDT(-0500)] <clown> anastasiac: the UA spec on how various a11y APIs handle show/hide: http://www.w3.org/WAI/PF/aria-implementation/#mapping_events_visibility
[11:02:57 CDT(-0500)] <clown> fluid-everyone: anyone know anything about 'gslint'? It's a google tool for lint'ing javascript (https://developers.google.com/closure/utilities/community)
[11:03:35 CDT(-0500)] <clown> if you do know, what versions of javascript does it handle? Does it understand 'let' for example?
[13:13:56 CDT(-0500)] <anastasiac> michelled, ready for review: https://github.com/acheetham/OER-Commons/tree/562-slides
[13:14:13 CDT(-0500)] <michelled> thx anastasiac
[13:24:32 CDT(-0500)] <Justin_o> colinclark: just filed this jira http://issues.fluidproject.org/browse/FLUID-4721 seems that the units aren't localizable in Uploader
[13:25:21 CDT(-0500)] <colinclark> ooh, that sucks
[13:25:22 CDT(-0500)] <michelled> anastasiac or cindyli: can you remind me how to generate CSS from the Sass files?
[13:25:24 CDT(-0500)] <colinclark> should be an easy fix
[13:25:38 CDT(-0500)] <cindyli> michelled: sass a.scss a.css
[13:25:55 CDT(-0500)] <michelled> nice and easy - thx!
[13:26:19 CDT(-0500)] <cindyli> np
[13:27:38 CDT(-0500)] <cindyli> michelled: i imagine merging "authoring-a11y" into "master" will be a big trouble since all our work are currently based on "staging" branch
[14:02:10 CDT(-0500)] <michelled> cindyli: yeah - I'm sure you're right
[14:02:17 CDT(-0500)] <michelled> cindyli: it might be a manual process
[14:10:18 CDT(-0500)] <michelled> cindyli: I think we'll make a patch with a diff between authoring-a11y and staging and then create a new branch off master and apply that patch
[14:10:42 CDT(-0500)] <cindyli> good idea, michelled
[15:08:27 CDT(-0500)] <cindyli> michelled: I submitted a pull request to fix a couple of issues with "leaner options" button - https://github.com/ISKME/OER-Commons/pull/113
[15:08:38 CDT(-0500)] <michelled> thx cindyli
[15:08:42 CDT(-0500)] <cindyli> np
[15:13:09 CDT(-0500)] <michelled> cindyli: I could use your help if you have a moment