[13:14:25 CDT(-0500)] <athena> EricDalquist: i think this pull request is now ready to be merged into trunk: https://github.com/Jasig/uPortal/pull/80

[13:14:32 CDT(-0500)] <athena> it has a lot of merges from trunk back though

[13:14:44 CDT(-0500)] <athena> do we want to clean this up before pulling it?

[13:14:45 CDT(-0500)] <EricDalquist> cool

[13:14:47 CDT(-0500)] <EricDalquist> sure

[13:14:52 CDT(-0500)] <EricDalquist> are you interested in learning how to do that?

[13:14:56 CDT(-0500)] <athena> sure

[13:15:01 CDT(-0500)] <athena> i assume this requires a rebase, perhaps?

[13:15:06 CDT(-0500)] <EricDalquist> yup

[13:15:09 CDT(-0500)] <EricDalquist> so on that page

[13:15:18 CDT(-0500)] <athena> yeah, saw you'd added some notes about that

[13:15:21 CDT(-0500)] <EricDalquist> the little i in a circle to the left of the merge button

[13:15:32 CDT(-0500)] <EricDalquist> you'll want to do steps 1 & 2

[13:15:45 CDT(-0500)] <EricDalquist> then do "git rebase master"

[13:15:49 CDT(-0500)] <EricDalquist> that should fix all the merge commits

[13:15:56 CDT(-0500)] <EricDalquist> then do step 3

[13:16:02 CDT(-0500)] <athena> ok, terrific

[13:16:07 CDT(-0500)] <athena> that makes sense

[13:16:11 CDT(-0500)] <EricDalquist> yeah, its pretty straight forward

[13:16:14 CDT(-0500)] <athena> yeah

[13:16:20 CDT(-0500)] <athena> wanted to make sure i was rebasing at the right spot

[13:16:24 CDT(-0500)] <athena> but that totally makes sense

[13:16:42 CDT(-0500)] <athena> suspecting we want to make rebasing part of the normal pull request flow at this point

[13:16:54 CDT(-0500)] <athena> since otherwise i think it's more awkward to pull changes back into the maintenance branch?

[13:17:06 CDT(-0500)] <EricDalquist> well it depends on the pull

[13:17:19 CDT(-0500)] <EricDalquist> if it was "branch, commit(s), pull" then it isn't a big deal

[13:17:23 CDT(-0500)] <athena> yeah

[13:17:26 CDT(-0500)] <athena> but for something like this

[13:17:39 CDT(-0500)] <EricDalquist> the problem comes if they ever merge from master back into the branch

[13:17:50 CDT(-0500)] <athena> yeah

[13:27:19 CDT(-0500)] <drewwills> EricDalquist do you have a sec to discuss the pull request for persondir?

[13:27:25 CDT(-0500)] <EricDalquist> not yet

[13:27:35 CDT(-0500)] <EricDalquist> I was off this morning

[13:27:41 CDT(-0500)] <EricDalquist> just got in about 15 minutes ago

[13:27:52 CDT(-0500)] <drewwills> np

[13:28:18 CDT(-0500)] <drewwills> one big question I see is: is this approach too conservative?

[13:28:49 CDT(-0500)] <EricDalquist> no idea

[13:28:55 CDT(-0500)] <EricDalquist> I honestly haven't looked at it at all

[13:29:13 CDT(-0500)] <drewwills> yeah, roger... that remark is for when you get to it

[13:30:45 CDT(-0500)] <EricDalquist> ok

[15:45:41 CDT(-0500)] <EricDalquist> athena: we're looking for a "help" icon in the style of http://jquerymobile.com/test/docs/buttons/buttons-icons.html

[15:45:52 CDT(-0500)] <EricDalquist> like a ? in the round background

[15:46:04 CDT(-0500)] <EricDalquist> it doesn't look like jQm has one built in :/

[15:50:19 CDT(-0500)] <athena> hm i think jacob added another icon set that had more stuff

[15:50:25 CDT(-0500)] <athena> wondering if there's something in there

[15:51:24 CDT(-0500)] <athena> yep~

[15:51:33 CDT(-0500)] <athena> uportal-war/src/main/webapp/media/skins/muniversality/common/jquerymobile/images/icons-36-black-pack.png

[15:52:03 CDT(-0500)] <EricDalquist> cool

[15:52:11 CDT(-0500)] <EricDalquist> now to find the css class that references it

[15:52:15 CDT(-0500)] <athena> yeah

[15:53:14 CDT(-0500)] <athena> my guess is the name is "question"

[15:53:18 CDT(-0500)] <athena> try that in the data icon thingy

[15:53:24 CDT(-0500)] <athena> from a quick glance at the css

[15:53:38 CDT(-0500)] <EricDalquist> ok

Browser not supported