Bookmark tags with master #759

Merged
merged 20 commits into from Aug 8, 2012

Projects

None yet

3 participants

@CristinaRO
Organization for Transformative Works member

Main author is Elz!

But I've fiddled with some leftover bugginess, and also carefully merged with latest master. I don't think I lost any of the changes done to views/tags/edit in between, so submitting for consideration. ;)

(Compare view with latest master shows ok.)

elzj and others added some commits Jul 26, 2011
@CristinaRO
Organization for Transformative Works member

Updated so it sorts any unsorted tags that get used on works into whatever category they got used as.

@CristinaRO
Organization for Transformative Works member

Updated to not cause infinite loop in certain conditions, regarding changing the type from Fandom to another user-defined type and the other way around.

Two specs still fail, but they fail on master too (on my webdev) and they concern things I haven't mucked with at all.

I've tested in browser all that I could, Emilie and other TW staff have also tested, so this is as good as it gets for now.

@shalott shalott merged commit 30b77f3 into otwcode:master Aug 8, 2012
@shalott
Organization for Transformative Works member

Is there a google code issue for this one?

@shalott
Organization for Transformative Works member
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment