Squashed commit of the following:

commit 59bcba470370da9b9b315c7fef75ede88635dc8a
Merge: 3016ce0 2544aa9
Author: Cristina <enigel@gmail.com>
Date:   Mon Apr 16 17:41:07 2012 -0700

    Merge pull request #582 from elzj/issue-2943-unwrangleable-tags

    Issue 2943: Unwrangleable tags

commit 3016ce0d0bf36b4d55a72f3837c34731d414af68
Merge: e5bc8cb 1c5436e
Author: Cristina <enigel@gmail.com>
Date:   Sun Apr 15 09:00:17 2012 -0700

    Merge pull request #580 from elzj/series-restricted

    Issue 2169: Series with public works stuck as restricted

commit e5bc8cbccd13a6859c37eb1293c33747ca700696
Merge: 2760113 81c54aa
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 15 08:52:05 2012 -0700

    Merge pull request #579 from mumble/issue3002

    Issue 3002, adds alt text display to complement issue 2541

commit 2760113643510d3bb548c3864d84e5b8ded059a5
Merge: 20e1f75 bc7118f
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 15 08:51:28 2012 -0700

    Merge pull request #581 from CristinaRO/tos-feature

    Updating cuke to reflect the changes in class structure

commit 2544aa9bd3b058256aaad3ecea89fc704b54d04b
Author: elz <elzj78@gmail.com>
Date:   Sun Apr 15 11:17:18 2012 -0400

    Display unwrangleable tags on wrangle pages and don't include then in unfilterable lists

commit bc7118f2d42122ace994c6590940e77e5c2db7c4
Author: Cristina <cristinar@gmail.com>
Date:   Sun Apr 15 15:13:42 2012 +0100

    Updating cuke to reflect the changes in class structure

commit 67cdc5c9a950e9c99d4024e53ab4680965e3535d
Author: elz <elzj78@gmail.com>
Date:   Sun Apr 15 10:12:14 2012 -0400

    Issue 2943: Allow wranglers to mark tags as unwrangleable

commit 1c5436e5bfcbc65b9d9402a91765ec7502f5ff50
Author: elz <elzj78@gmail.com>
Date:   Sun Apr 15 09:25:11 2012 -0400

    Issue 2169: Series with public works stuck as restricted

commit 81c54aaf11482791f9e928d5a54760435f2d2ffb
Author: mumble <mumble@gmail.com>
Date:   Sat Apr 14 20:52:09 2012 +0000

    Issue 3002, adds alt text display to complement issue 2541

commit 20e1f75bcaa7fbbfb3a4426c2c5583d947b87f46
Merge: fd0baf8 108120d
Author: Elz <elzj78@gmail.com>
Date:   Fri Apr 13 20:20:32 2012 -0700

    Merge pull request #576 from sarken/issue_2133

    Fix issue 2133 with pseud works index displaying user instead of pseud

commit 108120d6f3cdd7efc191c7fe36276e58dd93c814
Author: sarken <sarken@gmail.com>
Date:   Sat Apr 14 01:47:11 2012 +0000

    Fix error when not viewing pseud

commit fd0baf813119f390a3f0589f771db731aa1242fd
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Apr 14 01:28:53 2012 +0000

    rdoc update

commit 93cd7ad7678c225f41f73ea0ace7a917c95a21d8
Merge: af7b072 169a8c4
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:47:15 2012 -0700

    Merge pull request #575 from elzj/issue-2959-series-edit

    Issues 2959 and 2614: Series edit bugs

commit af7b072713baaf335111c67b576eb3f8949b197c
Merge: 54fa4a1 8c2039e
Author: Elz <elzj78@gmail.com>
Date:   Fri Apr 13 17:41:48 2012 -0700

    Merge pull request #574 from sarken/issue_650

    Issue 650 with CSS up/downcasing

commit 54fa4a1db2fe28739767d2efd4dce82361f1357c
Merge: 1b3d4a2 90f056f
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:39:02 2012 -0700

    Merge pull request #572 from elzj/issue-2995-draft-posting

    Issue 2995: drafts not being posted via post without preview

commit 1b3d4a2f77b163ad629469d3e80640f84ce16348
Merge: 278ba23 852c048
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:34:33 2012 -0700

    Merge pull request #573 from elzj/issue-2999-content-max

    Issue 2999: Increase max chapter length

commit 278ba23d73fe2206d45023cbe6c56ff89314752f
Merge: 70b8ec5 2f4b70b
Author: Cristina <enigel@gmail.com>
Date:   Fri Apr 13 17:30:43 2012 -0700

    Merge pull request #577 from elzj/errbit

    Switching to errbit, taking out piwik

commit 2f4b70bfa270f152567c9c2ec8fd7be7404c4afd
Author: elz <elzj78@gmail.com>
Date:   Fri Apr 13 20:21:44 2012 -0400

    Adding info for errbit error handling, removing Piwik plugin while I'm at it

commit 8c2039e2f0324a17ae89efa9533ae58df5ab581c
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 08:59:28 2012 +0000

    Missed a lowercase in mobile

commit 69f8233e0ff35cf9edd705cee50155b78cdb2e3d
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 05:46:56 2012 +0000

    Fix issue 2133 with pseud works index displaying user isntead of pseud

commit 169a8c464f907baa08401ed15b6198f3129d7f09
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 22:41:37 2012 -0400

    Issue 2959: fixing 500 error when series is invalid and live validation doesn't catch it. Also issue 2614: coauthor field on series form was broken.

commit 407e99318bd728b88a2be2b6ddddd703544a696d
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 01:42:43 2012 +0000

    Remove a font-variant override that should be unnecessary now

commit 9781455f35a2d324dc12138e06cbbefe8690f3fe
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 01:39:40 2012 +0000

    Fix Issue 650 removing remaining front end up/downcasing

commit 852c0486c368d5d4506396357b8e736bd6faf69a
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 21:36:14 2012 -0400

    Issue 2999: Continue to use old max chapter length value for live validation to decrease odds of html formatting validation wackiness

commit 8d4d05027cff7b3860e62caf7b6140119209e869
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 21:27:59 2012 -0400

    Issue 2999: Increase allowed chapter content length

commit 70b8ec54de7b16416ef55d13f01d4d5afaeafe73
Merge: 5614355 d11e0db
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:16:33 2012 -0700

    Merge pull request #571 from sarken/issue_2987

    Fix Issue 2987 with typo in password reset email

commit 56143554f510ee9f2fd7f04dfdd84fb1d6c60447
Merge: bf47d19 1755c9b
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:16:01 2012 -0700

    Merge pull request #570 from sarken/issue_2993

    Fix issue 2993 with broken line break tag in gift notification

commit bf47d193a5f84de4dadbae82c056e1a94ccab443
Merge: 3a157a0 19c7131
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:15:33 2012 -0700

    Merge pull request #569 from sarken/issue_2737

    Issue 2737 tidying main classes on site pages

commit 3a157a0cd4838c9456ff68e3c79d016216ccd032
Merge: 60e7ff6 4a73360
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:13:23 2012 -0700

    Merge pull request #568 from mumble/issue2579

    Quick fix for the problem with comments getting attached to unposted chapters

commit 60e7ff66a46676c85a1b169b3166df931e747e08
Merge: 5066ae3 71192ac
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:12:41 2012 -0700

    Merge pull request #567 from mumble/2064_pagetitles

    2064 pagetitles: take two

commit 5066ae3e75f7ca91ba28e10d43bb668c9891ed99
Merge: 9f01f88 8612aa8
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:11:32 2012 -0700

    Merge pull request #566 from sarken/issue_2994

    Fix issue 2994 with drafts being indistinct from posted works

commit 9f01f8839ac66a07cef0c90e45bf293d910d0bca
Merge: 75c5cad 649f5d3
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:11:03 2012 -0700

    Merge pull request #565 from CristinaRO/cuke-import-ffn

    updating the import cuke to the new and sad reality

commit 75c5cadc0399d38ab9ba14bf7fd398b7cb1c2f67
Merge: 5aa3e96 aa72029
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:10:42 2012 -0700

    Merge pull request #564 from CristinaRO/pmeme-reloaded

    Pmeme reloaded

commit 5aa3e968c4c923d7b31395f0faf9f11e7c9ade6b
Merge: ad5f588 87356d8
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:10:05 2012 -0700

    Merge pull request #481 from cesy/issue2541

    Issue 2541

commit ad5f5881e3e13baa8e8bb686c7b104327fe9cbdc
Merge: 8de2c0b 2fde0f5
Author: Elz <elzj78@gmail.com>
Date:   Thu Apr 12 18:09:19 2012 -0700

    Merge pull request #563 from derenrich/master

    Crush the rest of the PNGs

commit 90f056f76b1572a5023837e89b5b6b289adc9438
Author: elz <elzj78@gmail.com>
Date:   Thu Apr 12 20:56:06 2012 -0400

    Issue 2995: drafts not being posted via post without preview

commit d11e0dbaf0aab4c3fe62a3ba31e0b3c0bf5d7211
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 00:23:21 2012 +0000

    Fix Issue 2987 with typo in password reset email

commit 1755c9b0df0172ca37690cbe59d90396625b9e93
Author: sarken <sarken@gmail.com>
Date:   Fri Apr 13 00:16:03 2012 +0000

    Fix issue 2993 with typo in gift email br tag

commit 19c7131c1fb3464fd92533bd5fa2e95ec8306d20
Author: sarken <sarken@gmail.com>
Date:   Thu Apr 12 22:51:04 2012 +0000

    Fix classes on TOS FAQ

commit 4a733604234cc13bcb1f9708400efd7a61b456f1
Author: mumble <mumble@gmail.com>
Date:   Thu Apr 12 20:09:08 2012 +0000

    Quick fix for the problem with comments getting attached to unposted chapters

commit d3d7e15112c46981e31d431b1dd509e99844a987
Author: sarken <sarken@gmail.com>
Date:   Thu Apr 12 01:30:31 2012 +0000

    Fix resulting first login help box issue

commit c3fb7a1ca743c70ba4251323462cfff0d3f29485
Author: sarken <sarken@gmail.com>
Date:   Thu Apr 12 01:06:59 2012 +0000

    Modify helper, change CSS, fix classes

commit 71192ac940c54f9fccd5e01841c901ce1fecd902
Author: mumble <mumble@gmail.com>
Date:   Wed Apr 11 18:53:21 2012 +0000

    Adds subtitles to wrangling area, most importantly to wrangler pages and show/edit/wrangle tags

commit 04ed1c9ada5610c2e96ee0822cf6f9703f62f660
Author: mumble <mumble@gmail.com>
Date:   Wed Apr 11 17:59:44 2012 +0000

    Adds subtitle for series index by pseud

commit ac600aa728c8e67eec2f4c2925e147062fe58088
Author: mumble <mumble@gmail.com>
Date:   Wed Apr 11 17:54:58 2012 +0000

    Adds subtitles for bookmark indices by tag and by pseud

commit ea658456c24c69ccacae88a4f34152d2912f7e64
Author: sarken <sarken@gmail.com>
Date:   Wed Apr 11 03:23:50 2012 +0000

    Make the classes work

commit a00e81dab6f8612866d58fda7e3fb2ed11b36591
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 10 03:39:12 2012 +0000

    Add tos, tos faq, donate, and site map

commit 8612aa8d8f73864b4e9ff56bafea5c3bae6ada37
Author: sarken <sarken@gmail.com>
Date:   Mon Apr 9 21:09:00 2012 +0000

    Fix issue 2994 with drafts being indistinct from posted works

commit 649f5d3e9ab9287c792a2f4b8e350cc90ab11f6a
Author: Cristina <cristinar@gmail.com>
Date:   Mon Apr 9 21:18:20 2012 +0100

    updating the import cuke to the new and sad reality

commit aa720297b20751f0d7244445164557d040c689a4
Author: Cristina <cristinar@gmail.com>
Date:   Mon Apr 9 20:58:43 2012 +0100

    oops, removing debug step

commit 6dfa4e6ea56137f6b9918a10026672c16e789643
Author: Cristina <cristinar@gmail.com>
Date:   Mon Apr 9 20:53:45 2012 +0100

    fixing a cuke related to the fix for issue 2876

commit 8de2c0b6cfcec5ec97ca8eb6b20d15425debc3be
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Apr 7 01:28:46 2012 +0000

    rdoc update

commit 97bf62ad046c647923c5965236f698e52b30f787
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 22:06:53 2012 +0000

    Add classes to more areas

commit 3beae0f50330b4a2a8b10e82f2d9c6d627fc6a62
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 20:44:58 2012 +0000

    Put hyphen back in for most cases

commit 0923dc98451009dc4af0e41f5384646d2b4242b0
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 09:22:34 2012 +0000

    Modify classes for known issues, support, faq

commit 4a8d0ee7b536e341789ca16b52eb307573a7b0cc
Author: sarken <sarken@gmail.com>
Date:   Tue Apr 3 08:36:56 2012 +0000

    Remove hyphen between controller name and action name

commit 2fde0f53dd28c684179a92b313e97fd81dffbf60
Author: Daniel Erenrich <daniel@erenrich.net>
Date:   Sun Apr 1 10:40:03 2012 -0700

    crush all remaining pngs, saving ~400kB total

commit 5b81cb693f56c8b5a842c901035cec03bab2e78a
Merge: 189eaee 3cb81bd
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 09:57:43 2012 -0700

    Merge pull request #480 from cesy/issue2876-b

    Issue 2876 view fulfilled claims on user page

commit 189eaee0939bfb622bcf56faafe6409bfe4bf684
Merge: fecb91f 0fe77fa
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 09:56:55 2012 -0700

    Merge pull request #559 from derenrich/master

    Apply pngcrush to some of the images

commit fecb91f3e5d90f2704162bba512a0404cdf51d47
Merge: ddd3597 7dff27d
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:39:57 2012 -0700

    Merge pull request #562 from sarken/issue_2837

    Fix issue 2837 with delete series confirmation message

commit ddd359777c4e84ef347f4cfd987959d0efa37818
Merge: 3758263 d772150
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:38:42 2012 -0700

    Merge pull request #558 from sarken/issue_2983

    Fix issue 2983 with links opening in new window

commit 3758263cce30c141800be6ae9bdfa7c331da86e9
Merge: 1761cbe 00a5978
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:38:18 2012 -0700

    Merge pull request #557 from sarken/issue_2985

    Fix issue 2985 with invalid cursor value

commit 1761cbe507969994d4b657f7f5bbd3232d245649
Merge: 255421c 539aac3
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:38:01 2012 -0700

    Merge pull request #556 from sarken/issue_2984

    Fix Issue 2984 changing cursor on filter headings

commit 255421c10a4e275b75394e99ef6c5907edb1435a
Merge: 6ea0a28 3bf215a
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:37:46 2012 -0700

    Merge pull request #555 from sarken/issue_2532

    Fix Issue 2532 adding main ARIA landmark to home page

commit 6ea0a28d45e214b99b8fa4d5c06174382e7c3dce
Merge: 706b1b1 305dfce
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:37:26 2012 -0700

    Merge pull request #554 from sarken/issue_2889

    Issue 2889 stylesheet links do not meet XHTML standards

commit 706b1b154167a9db3c2e87f1d208c302423081d1
Merge: d05d548 9e1b034
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:37:07 2012 -0700

    Merge pull request #553 from sarken/issue_1205

    Fix Issue 1205 with styling on error messages for create user page

commit d05d548a4aba8ad6d59562bff6c46e941f420c00
Merge: b57ea93 368542f
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:36:48 2012 -0700

    Merge pull request #552 from sarken/issue_2981

    Issue 2981 with missing paragraph tag on canonical field's text on tags edit

commit b57ea936d6832ebd4c03620db918ab496e69a883
Merge: 6ac29fc fbf604c
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:36:29 2012 -0700

    Merge pull request #551 from sarken/issue_2906

    Issue 2906 with chapter draft notice text

commit 6ac29fc1925832b273d19b333ed34a2d194077ba
Merge: 8603318 a397503
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:35:38 2012 -0700

    Merge pull request #549 from sarken/issue_2597

    Fix Issue 2597 with missing hidden-by-admin icon on bookmarks

commit 8603318a85d3d8012e01133560c4838f5c32993e
Merge: f47e5a6 0c7a6ad
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:35:19 2012 -0700

    Merge pull request #548 from sarken/issue_2695

    Fix Issue 2695 with comment textarea resizing on edit with error

commit f47e5a64e34d7c024ce9df2243347005992b07cb
Merge: cf07999 fc41435
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 08:34:59 2012 -0700

    Merge pull request #528 from mumble/2064_pagetitles

    Issue 2064 - prettier pagetitles

commit cf079990745fef9a05cbbb320af8d8bb911181e6
Author: Elz <elzj78@gmail.com>
Date:   Sun Apr 1 09:18:03 2012 -0300

    Commenting out after task that was already run

commit 7dff27dc29f2f04e6e838eee118408de1358f713
Author: sarken <sarken@gmail.com>
Date:   Sun Apr 1 09:00:54 2012 +0000

    Fix issue 2837 with delete series confirmation message

commit 0370a4dacb42ba3e2d8d8ce7dd6d057f71d60804
Merge: a675d3f 10f4e4d
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 31 15:49:24 2012 -0700

    Merge pull request #561 from elzj/ffnet_import_message

    Adding messages to make it clear why ff.net imports aren't working

commit 10f4e4d09d686806583d40fa00e5917108c215d8
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 31 18:43:17 2012 -0400

    Adding messages to make it clear why ff.net imports aren't working

commit a675d3f04d8fbdfd484cfee8c5d888f4c9b979a2
Merge: a4e3050 13744cd
Author: Elz <elzj78@gmail.com>
Date:   Sat Mar 31 14:42:16 2012 -0700

    Merge pull request #560 from CristinaRO/hit_counters_rake

    Updating syntax to get hit counters rake working again

commit 13744cd1cebfc3af9f10b4114118078150db973a
Author: Cristina <cristinar@gmail.com>
Date:   Sat Mar 31 21:22:31 2012 +0100

    Updating syntax to get hit counters rake working again

commit a4e30508bb89968bb6766a6f38c3453abcc90e83
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Mar 31 01:28:45 2012 +0000

    rdoc update

commit 0fe77faa45d30c7fb6bb18df06d5d4c4273fe608
Author: Daniel Erenrich <daniel@erenrich.net>
Date:   Fri Mar 30 17:57:21 2012 -0700

    crush logos

commit 03362208355f030e10dbbf00e6bff2cd17482315
Author: Daniel Erenrich <daniel@erenrich.net>
Date:   Fri Mar 30 17:49:18 2012 -0700

    crush pngs

commit d77215096a26f9f8e8cd0a08e756b85f5becff78
Author: sarken <sarken@gmail.com>
Date:   Fri Mar 30 00:28:18 2012 +0000

    Fix issue 2983 with links opening in new window

commit 539aac3fc6f793bac4b5098aa5a558126b3f04a9
Author: sarken <sarken@gmail.com>
Date:   Fri Mar 30 00:16:01 2012 +0000

    Fix Issue 2984 changing cursor on filter headings

commit 00a5978be96caa556e47dd07d858e420431388cd
Author: sarken <sarken@gmail.com>
Date:   Fri Mar 30 00:05:50 2012 +0000

    Fix issue 2985 with invalid cursor value

commit 4110c79f8d4de55e3f5ba78bbd7ed90549b3bbae
Merge: 3314051 30fc806
Author: Elz <elzj78@gmail.com>
Date:   Tue Mar 27 19:11:55 2012 -0700

    Merge pull request #550 from CristinaRO/issue-2945-empty-feed-2944-gifts-redirect

    Issues 2944 and 2845 enhancements

commit 33140518fc9b8a273829b72903cdaf1c7417f875
Merge: 109a4bb bf48565
Author: Elz <elzj78@gmail.com>
Date:   Tue Mar 27 19:08:20 2012 -0700

    Merge pull request #454 from cesy/cukes

    Cuke failures in challenge_promptmeme

commit 3bf215a2716303db50aa2ca2c8ec9e7a983802d0
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 07:22:45 2012 +0000

    Fix Issue 2532 adding main ARIA landmark to home page

commit 305dfcedc812a6a1f68c604aa529f6789f2a3dd0
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 06:43:47 2012 +0000

    Issue 2889 stylesheet links do not meet XHTML standards

commit 9e1b03421b52843280d29c35f1f3fde77f4a631d
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 06:04:30 2012 +0000

    Fix Issue 1205 with create user error styling

commit 0c7a6ad9dee84edcf903ec7c185a116199fe19b4
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 05:52:01 2012 +0000

    Apply fix to all span.error

commit 368542f32afd2da4a54c160265434d6d542f6dec
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 03:25:41 2012 +0000

    Fix issue with missing paragraph tags on canonical field's text on tags edit

commit fbf604c231687641f0231ede4f56dd6da5820fb3
Merge: 73fd4ff a05dd0b
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 01:37:20 2012 +0000

    Take the draft notice banner out in preview mode

commit 73fd4ffc82694be21128bafd309e62e19ea1c606
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 01:35:26 2012 +0000

    Remove draft notice from preview mode

commit d7b682c57cdd21e92c3fca9d3dbb69c3a06a7ac6
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 00:22:30 2012 +0000

    Trying a banner for a draft notice

commit a05dd0b03188b1438efa0cc86d04ba945e1c96f8
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 26 00:22:30 2012 +0000

    Trying a banner for a draft notice

commit 30fc806e70fcacde684b043fc2910714aacc320f
Author: Cristina <cristinar@gmail.com>
Date:   Mon Mar 26 01:06:28 2012 +0100

    Issue 2945: fixing a double render error, rescuing RecordNotFound errors; Issue 2944 enhancement: redirect to collection if available

commit a397503e8199f28654160ee0a850a9c78b676009
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 25 23:56:38 2012 +0000

    Fix Issue 2597 with missing hidden-by-admin icon on bookmarks

commit ecbf309bc893ab4abe9ce33b139ee4d6200888dc
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 25 03:26:57 2012 +0000

    Fix Issue 2695 with comment textarea resizing on edit with error

commit 109a4bb379af813c1156ec8bcee1b66ca95aca5e
Merge: 6f21b7f 0391341
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 24 17:33:32 2012 -0700

    Merge pull request #544 from shalott/tag_set_fix

    Tag set fix

commit 6f21b7fd134f2f291c5a5a7e07d5062a5e6abfab
Merge: 63ecab9 52cb106
Author: shalott <shalott@gmail.com>
Date:   Sat Mar 24 16:41:24 2012 -0700

    Merge pull request #546 from sarken/issue_2689

    Fix Issue 2689 with commas after all items in a comma list

commit 63ecab969ba12709fe2f774538f92660a9ff374f
Merge: b9824f6 a99e204
Author: shalott <shalott@gmail.com>
Date:   Sat Mar 24 16:40:25 2012 -0700

    Merge pull request #545 from sarken/issue_2879

    Fix issue 2879 with two New Pseud buttons

commit b9824f6de4505c56395fa4fefdfff372e68c8435
Merge: b3b69f8 111944e
Author: shalott <shalott@gmail.com>
Date:   Sat Mar 24 16:39:25 2012 -0700

    Merge pull request #547 from sarken/issue_2673

    Fix issue 2673 so clicking the filter name expands the filter list

commit b3b69f82bf17c98db5cb69673ef75d75b8806e24
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Mar 24 01:28:48 2012 +0000

    rdoc update

commit 111944ea3bd61b4db5f9afb0ce60545d082abb01
Author: sarken <sarken@gmail.com>
Date:   Thu Mar 22 08:44:33 2012 +0000

    Fix issue 2673 so header text expands filters

commit 52cb106ca3b1a9d912b2480bb070dc01151fe882
Author: sarken <sarken@gmail.com>
Date:   Thu Mar 22 06:31:18 2012 +0000

    Fix Issue 2689 with commas after all items in a comma list

commit a99e2040e626b04a8395da98629491c08fbef700
Author: sarken <sarken@gmail.com>
Date:   Thu Mar 22 04:08:11 2012 +0000

    Fix issue 2879 with two New Pseud buttons

commit 039134132f1aaba7225b256e73f7cc57ebb53e2d
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 22:55:05 2012 -0400

    fix for issue 2729

    http://code.google.com/p/otwarchive/issues/detail?id=2729

    typo in autocomplete for optional tags

    Signed-off-by: shalott <shalott@gmail.com>

commit fcd43da6656b02ffa51de5bf35ef2ecaa9d7bb40
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 22:54:21 2012 -0400

    fix for issue with optional tag sets in challenge matching

    http://code.google.com/p/otwarchive/issues/detail?id=2980
    Signed-off-by: shalott <shalott@gmail.com>

commit b05f8f08d2ef9fa50ac92179fa26908d6757158c
Merge: d67b692 a3ef914
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:44:16 2012 -0700

    Merge pull request #538 from sarken/issue_2807

    Modify Issue 2807 fix with meta style that works in IE6 and 7

commit d67b692478ee3293a6bce4dca307911d82a47a9b
Merge: 0ae0b95 912188b
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:43:35 2012 -0700

    Merge pull request #539 from sarken/issue_2971

    Consolidate fix for issue 2971 with existing code

commit 0ae0b9533d83b33a334f670f3baff5e283bddc5b
Merge: 9d5e8e4 8422c81
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:42:38 2012 -0700

    Merge pull request #540 from teganm/master

    Issue 2773

commit 9d5e8e4abe342127e06942a6822dd09d0391dae9
Merge: a3efce1 17ed9f2
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:41:16 2012 -0700

    Merge pull request #541 from elzj/comment-index-error

    Fixing 500 error on comments index pages for works

commit a3efce17c5d1a99ac73019ce3c5fd1f55fa3fa44
Merge: 9f204d7 39aa33d
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:40:02 2012 -0700

    Merge pull request #542 from sarken/issue_2978

    Fix issue 2978 with wrong text on edit multiple button

commit 9f204d75d95d79a352c604041066e1c393c12b1d
Merge: ce650bf c38a9fd
Author: shalott <shalott@gmail.com>
Date:   Wed Mar 21 19:39:24 2012 -0700

    Merge pull request #543 from sarken/issue_2957

    Issue 2957

commit c38a9fd82b3fddc51ca80f28b9bc95f9a465da1b
Merge: 5e3c414 6ab7890
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 21 23:03:48 2012 +0000

    Merge conflicts

commit 5e3c414d5cec46c6f83962c52c03694fb3e36ce5
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 21 22:44:36 2012 +0000

    Add faq class

commit ca3524eb3f5aea8f789bf254690c146c80d97e0f
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 04:58:29 2012 +0000

    Add faq class and styling

commit 39aa33d260bbe63f11dad7d88ee69fcfccb0ec6d
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 21 21:47:15 2012 +0000

    Fix issue 2978 with wrong text on edit multiple button

commit 17ed9f25f81264776b61480b1ab58314a77e831d
Author: elz <elzj78@gmail.com>
Date:   Wed Mar 21 21:36:59 2012 +0000

    Fixing 500 error on comments index pages for works

commit 8422c811ec0aeafe1f1a7af40b200db4c6c84fb3
Author: Tegan Mulholland <teganmulholland@gmail.com>
Date:   Tue Mar 20 03:25:30 2012 +0000

    Change to skins help text, bug 2773

commit 912188bf9dae546cf32716665ce444e5a13ad4f7
Author: sarken <sarken@gmail.com>
Date:   Tue Mar 20 00:05:09 2012 +0000

    Consolidate fix for issue 2971

commit fc4143583cc5460b9e9f8f8e6035b304f62fd2ae
Author: mumble <mumble@gmail.com>
Date:   Mon Mar 19 23:34:21 2012 +0000

    Fixes display of giftee in case of gift search within collection, and moves subtitle for user display below nil check on home and series page

commit a3ef9140eb3149bdbe4f725a999e312ed1323777
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 19 23:03:29 2012 +0000

    Modify fix for issue 2807 to work in IE6 and 7

commit ce650bf011cd92f600c39292f3070921348d9d4e
Merge: 5f0b05b 62e296e
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:46:23 2012 -0700

    Merge pull request #537 from sarken/issue_2807

    Fix issue 2807 with work meta on static pages

commit 5f0b05b9d55309f170554201632e844f692787d9
Merge: 6fff4fc a8bcbd8
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:46:01 2012 -0700

    Merge pull request #536 from sarken/issue_2833

    Fix issue 2833 with Bookmarked? search help causing 404

commit 6fff4fc302b0a2633742f39cae0268d148515561
Merge: 82be675 1ac92b3
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:45:41 2012 -0700

    Merge pull request #535 from sarken/issue_2919

    Issues 2919 and 2952 with Condition on skins show page

commit 82be6758d5cc5871eba5a8e7be16a15c8f9bc0cb
Merge: 0314f08 3693040
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:43:54 2012 -0700

    Merge pull request #534 from sarken/issue_2971

    Issue 2971 repeated styling on chapter form in secondary navigation

commit 0314f08ee451c6dd96eba9a139253cb16dde3c73
Merge: b67044f e9ed05a
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:42:26 2012 -0700

    Merge pull request #533 from sarken/issue_2932

    Fix issue 2932 with download menu in Opera with JS off

commit b67044ff9d5d500944f3c703e15544fe56a9e270
Merge: 5872331 d57379f
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:41:42 2012 -0700

    Merge pull request #532 from sarken/issue_2970

    Fix issue 2970 adding navigation to search pages

commit 5872331358e1ee0021babbd5bf46d1c191f5d32d
Merge: 03968f1 b257283
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:38:17 2012 -0700

    Merge pull request #531 from sarken/issue_2956

    Fix issue 2956 by adding podfic to front page and invite emails

commit 03968f119c56cbb3d01e68289ba18118198ecbb6
Merge: 9bc471b 00c13fd
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:37:44 2012 -0700

    Merge pull request #530 from sarken/issue_2963

    Fix issue 2963 with unclickable navigation on mobile dashboard pages

commit 9bc471b3addc132f9d418e2364c3009e6b0ffb2a
Merge: 81498e8 623991f
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 19 09:37:12 2012 -0700

    Merge pull request #529 from sarken/issue_2962

    Fix issue 2962 with extra Custom Stylesheet on chaptered works form

commit 62e296eebd1576752fe3bfac9179b0d8d7c5f5b7
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 19 06:20:53 2012 +0000

    Fix issue 2807 with work meta in static view

commit a8bcbd89228e324f8fe7f08aaf957c37ba4e83c0
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 19 05:52:35 2012 +0000

    Fix issue 2833 with Bookmarked? search help causing 404

commit 1ac92b3521eef35bbb62995f810a6985a94b3b98
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 22:28:55 2012 +0000

    Issues 2919 and 2952 with Condition on skins show page

commit 36930405bd2605236697c3e796f6c975597cdf50
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 08:31:40 2012 +0000

    Fix issue with extra styling on chapter form in secondary navigation

commit e9ed05a8c1e04e3bbdffe13307b698cfd9eb1e0c
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 07:25:00 2012 +0000

    Fix issue 2932 with download menu in Opera with JS off

commit d57379f4d21173d3c0daca969553f4593aff3879
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 18 04:14:31 2012 +0000

    Fix issue 2970 adding navigation to search pages

commit 81498e839c297ad98f7c8ecb6e3ef656302391b0
Author: Sidra <alice@alum.mit.edu>
Date:   Sat Mar 17 01:28:45 2012 +0000

    rdoc update

commit b25728363c7778fe37002b50309bbc88bafc949a
Author: sarken <sarken@gmail.com>
Date:   Wed Mar 14 01:29:52 2012 +0000

    Fix issue 2956 by adding podfic to front page and invite emails

commit 00c13fd9c6d5c3db67a03327173e874cb22959b9
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 20:34:26 2012 +0000

    Fix issue 2963 with unclickable navigation on mobile dashboard pages

commit 623991fa8f8ade92d99985dca7679db46fe5dd14
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 20:20:48 2012 +0000

    Fix issue 2962 with extra Custom Stylesheet on chaptered works form

commit fc39b538cf83fe8ac95fba4ce9f1cea7999890f2
Author: mumble <mumble@gmail.com>
Date:   Mon Mar 12 17:31:23 2012 +0000

    removes underscoresin page titles, if somewhat awkwardly so

commit 67f9da5ab8173c3273ee585647a6b5f11f40d981
Merge: 8db4de2 2054236
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:50:40 2012 -0700

    Merge pull request #527 from sarken/issue_2905

    Fix issue 2905 with chapter text escaping draft box

commit 8db4de2ce48583486ef6b6c0bb32e668fe3be919
Merge: 71d41f9 b02a12d
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:47:50 2012 -0700

    Merge pull request #526 from sarken/issue_2960

    Issue 2960 restructuring series edit form

commit 71d41f9c5bfecb437d11e4596e0e7b7360aee443
Merge: 56e91f0 c3d85d6
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:46:28 2012 -0700

    Merge pull request #525 from CristinaRO/Issue_2310_nil_reading_major_version

    Issue 2310 - reading major_version_read can be nil, which causes error 500

commit 56e91f01dbc7c28e608c97b9d231588b07605e63
Merge: e4c63c5 804fbcf
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:44:20 2012 -0700

    Merge pull request #524 from sarken/issue_2940

    Issue 2940 changing Mark as Read button position

commit e4c63c5ce1ee1087ddedcfb58302d6ab0f9a3d86
Merge: b6f1b65 b2e82d4
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:42:50 2012 -0700

    Merge pull request #523 from CristinaRO/Issues_1883_2847_robots

    Issues 1883 and 2847: robots.txt: disallow indexing downloads and search results

commit b6f1b658424bb13dc8667a2a8c1fdfb57372a572
Merge: 900ff40 9cb561d
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:41:33 2012 -0700

    Merge pull request #522 from CristinaRO/Issue_2948_static_error500

    Issue 2948: static error 500 page should have look and feel of the Archive

commit 900ff40cf01769d3532844df8f6c37e1a9eeab0c
Merge: fb4af7e 410a751
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:41:06 2012 -0700

    Merge pull request #521 from CristinaRO/Issue_2947_show_fandom

    Issue 2947: show fandom when fandom doesn't exist

commit fb4af7e26e9200f6fd05845dd262517bd76d004c
Merge: 0391019 e3e3cbe
Author: Elz <elzj78@gmail.com>
Date:   Mon Mar 12 09:40:27 2012 -0700

    Merge pull request #520 from CristinaRO/Issue_2946_profile_no_user

    Issue 2946: loading profile of a non-existent user

commit 20542365f4dfcdc4a96fb6b2cd26e22fe717e4ec
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 06:09:23 2012 +0000

    Fix issue 2905 with chapter text escaping draft box

commit 6ab7890a295fafe5868868991ca095c10105cf62
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 04:58:29 2012 +0000

    Add faq class and styling

commit b02a12d4244752ca7877cc5cde5c5f082f010e02
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 12 01:23:34 2012 +0000

    Issue 2960 restructuring series edit form

commit a5d25e59cd12b33df0145f828dd888f24a4fa5b4
Merge: aed9380 0391019
Author: mumble <mumble@gmail.com>
Date:   Sat Mar 10 12:31:40 2012 +0000

    fixed conflicts with latest master

commit 804fbcff9efa6f6a9ec0a32b889bf981b44624b0
Merge: c0163f4 9ccb6ed
Author: sarken <sarken@gmail.com>
Date:   Sat Mar 10 01:27:36 2012 +0000

    Fix merge conflicts

commit c0163f40c76e340e41260634167bb27bd41521e3
Author: sarken <sarken@gmail.com>
Date:   Sat Mar 10 01:24:09 2012 +0000

    Shorten fix for issue 2940 and make strings translatable

commit 039101977937216626071c1d3b2b4897c34253ce
Merge: 5af6217 c1ffe14
Author: Cristina <enigel@gmail.com>
Date:   Fri Mar 9 15:44:34 2012 -0800

    Merge pull request #477 from elzj/issue-1404-edit-drafts

    Issue 1404: Allow users to save changes to work and chapter drafts

commit c3d85d6a93aed969c6a08624face06cdad897e9d
Author: Cristina <cristinar@gmail.com>
Date:   Thu Mar 8 23:28:59 2012 +0000

    Issue 2310 - reading major_version_read can be nil, which causes error 500 on the user's reading page

    This is a bit of a hot fix, but reading the code, major_version_read
    should never be nil, so it doesn't seem to make sense to add a special
    if case for nil. Only checking if it's different than the work's major
    version seems sufficient - the work's major_version will only go up,
    not down, so the reading's major version can either be the same, or
    lower. Or nil.

commit fa5031adcdf9e1d7342dd53f77ae5f93348e98eb
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 5 05:24:42 2012 +0000

    Mark for Later only appears when work is not already marked for later

commit f60c00c2e5a744dd3ea31882ed0692ec778125e8
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 4 05:22:13 2012 +0000

    Split Mark for Later and Mark as Read buttons

commit 9ccb6ed261c2df81283f856859f1384e3bec1a66
Author: sarken <sarken@gmail.com>
Date:   Mon Mar 5 05:24:42 2012 +0000

    Mark for Later only appears when work is not already marked for later

commit b2e82d457303cfe525baae667e996388e791484c
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 23:33:34 2012 +0000

    Issue 2949: disallow indexing of external works

commit d3bef13be1d6336029059351cef628c82e4470e6
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 23:11:43 2012 +0000

    Issues 1883 and 2847: robots.txt: disallow indexing downloads and search results

commit 9cb561ddead91105bab3b73d4077341c25c6a777
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 22:32:59 2012 +0000

    Issue 2948: static error 500 page should have look and feel of the Archive

    Have copied the layout from the static 502 and the error message from
    the dynamic 500.

commit 5af6217c4aaacadec0c522dc3d27522c7696a911
Merge: 48a9cfb cc56e9e
Author: Enigel <enigel@gmail.com>
Date:   Sun Mar 4 21:29:14 2012 +0000

    Merge pull request #515 from elzj/otwarchive

    ---

    Cleaning up some code in the admin users controller in preparation for doing more work on roles

commit 410a751edb4bf3c454f6ae3269e72739409d7f23
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 17:14:15 2012 +0000

    Issue 2947: show fandom when fandom doesn't exist

commit e3e3cbe279d89a8fc888515b74ef18e6ca35279c
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 16:49:56 2012 +0000

    Issue 2946: loading profile of a non-existent user

commit 48a9cfbfecaa9ce16ddc95f45c846c9ba2fc652f
Merge: 9406fab 2031f50
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:59:05 2012 -0800

    Merge pull request #518 from CristinaRO/Issue_2944_gifts

    Issue 2944: error 500 when loading gifts without a user or recipient name

commit 9406fab16828595f695031dc8cea9ac6e64dc8fa
Merge: f66a59f 483aab3
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:34:14 2012 -0800

    Merge pull request #509 from sarken/issue_2931

    Fix issue 2931 with empty approved children info appearing on preview

commit f66a59f572450b1f8f0cb001a582b0644030be88
Merge: c7af15e 731a72d
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:33:30 2012 -0800

    Merge pull request #517 from CristinaRO/Issue_2942_set_revised_at

    Fix for the not-reproducible cases when recent_date is nil in set_revise...

commit c7af15e02918c9117cb73d6e13bcc184a1c5ffbd
Merge: 702b04b e537efa
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:32:40 2012 -0800

    Merge pull request #516 from CristinaRO/subscriptions_404

    Subscriptions 404

commit 702b04b36ce56df36ea5181d049d707ff52f4168
Merge: 5b3e4ba 79baa56
Author: Elz <elzj78@gmail.com>
Date:   Sun Mar 4 06:29:40 2012 -0800

    Merge pull request #519 from CristinaRO/Issue_2945_empty_feed

    Issue 2945: empty feed causes error in our error pages

commit 79baa56bc9b588a798d0f3686a0b15378c81c9b5
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 12:58:02 2012 +0000

    Issue 2945: empty feed causes error in our error pages

commit 2031f50af8236e458f9648559b9b6580eca66770
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 12:34:37 2012 +0000

    Issue 2944: error 500 when loading gifts without a user or recipient name

    Having @collection is not a necessary *or* sufficient condition, we
    need either a user or a recipient name for which to load gifts.

commit 00a581290f0f8aa84348022f5c53c1eae4e2235a
Author: sarken <sarken@gmail.com>
Date:   Sun Mar 4 05:22:13 2012 +0000

    Split Mark for Later and Mark as Read buttons

commit 5b3e4ba842bc1f0b7c0d2c02ee1d6a518f277d60
Merge: 3068169 0fc54ed
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 3 19:57:49 2012 -0800

    Merge pull request #513 from elzj/issue-2936-more-feeds

    Issue 2936: Expanding tag feeds to include characters and relationships

commit 306816945ac76173bea4473a361aa419d669938f
Merge: c12b1f0 91c601e
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 3 18:58:20 2012 -0800

    Merge pull request #510 from shalott/tag_works_fix

    fix for issue 2935

commit c12b1f037bd735c83a7486ffc10d0656052cb621
Merge: d54b6d0 1a5307d
Author: Enigel <enigel@gmail.com>
Date:   Sun Mar 4 02:37:33 2012 +0000

    Merge pull request #514 from elzj/otwarchive

    ---

    Issue 2937: Allow searching in a time period thats not a range

    http://code.google.com/p/otwarchive/issues/detail?id=2937

commit d54b6d0d5f2a08347f1b6924d7351e3be4dd78c1
Merge: 4e71a7e 34c71c1
Author: Cristina <enigel@gmail.com>
Date:   Sat Mar 3 18:33:18 2012 -0800

    Merge pull request #512 from elzj/issue-2930-feed-errors

    Issue 2930: fixing tag feed errors

commit 4e71a7e02a1c051e85114503d54a471067675edf
Merge: 2107429 3838ea6
Author: Enigel <enigel@gmail.com>
Date:   Sun Mar 4 02:25:18 2012 +0000

    Merge pull request #511 from elzj/otwarchive

    ---

    Updating series and icon features to match front-end changes

commit 731a72d7ee5057e18aae0c97de5e53e896227898
Author: Cristina <cristinar@gmail.com>
Date:   Sun Mar 4 01:01:50 2012 +0000

    Fix for the not-reproducible cases when recent_date is nil in set_revised_at, which causes errors 500

    http://code.google.com/p/otwarchive/issues/detail?id=2942

commit e537efa913502dcbb42dc56fb77789e4f68aaee7
Author: Cristina <cristinar@gmail.com>
Date:   Sat Mar 3 21:34:47 2012 +0000

    Adding unsubscribing tests for what page one is returned to after unsubscribing

    Also cleaning up the cuke a bit

commit 33e8136eece85fba1ea88c62a06e28e5f100ace6
Author: Cristina <cristinar@gmail.com>
Date:   Sat Mar 3 20:23:45 2012 +0000

    Updating cuke to match the code

commit cc56e9e60b32fe6c6820a4df77f37a4bed01e799
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 15:16:28 2012 -0500

    Cleaning up some code in the admin users controller in preparation for doing more work on roles

commit 1a5307d6b196b58baa2aa772432ba0973d2cc7cb
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 14:57:00 2012 +0000

    Allow searching in a time period that's not a range

commit 0fc54edc289db08c56ac6b6b1845fa7a4fa21aeb
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 09:44:04 2012 -0500

    Issue 2936: Expanding tag feeds to include characters and relationships

commit 34c71c181f3e419e8fa81cae0f7c3688184a6b70
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 09:33:32 2012 -0500

    Issue 2930: fixing helper method so works without summaries don't cause feed generation to fail

commit 3838ea6d0f6bd110f004bcbce0e56e77dc413f58
Author: elz <elzj78@gmail.com>
Date:   Sat Mar 3 14:25:03 2012 +0000

    Updating series and icon features to match front-end changes

commit 91c601ed7b8b6465e85c4a3af361386717b41569
Author: shalott <shalott@gmail.com>
Date:   Fri Mar 2 22:22:39 2012 -0500

    fix for issue 2935

    http://code.google.com/p/otwarchive/issues/detail?id=2935
    Signed-off-by: shalott <shalott@gmail.com>

commit 483aab3b57d5c616777fc2a36ecddd99db3908c4
Author: sarken <sarken@gmail.com>
Date:   Sat Mar 3 00:24:59 2012 +0000

    Fix issue 2931 with empty approve children info appearing on preview

commit 3124e9b7e14e452579e5981f8c2ca505c8fb7015
Author: Cristina <cristinar@gmail.com>
Date:   Fri Mar 2 23:39:11 2012 +0000

    Fixing subscriptions controller to have a fallback in case the browser didn't send referrer information

    Also fixing it for non-Javascript users, so it wouldn't result in a
    "page not found" error.

    Flip side is that this removes the confirmation dialogue for JS users,
    too, but this looked like a minor downside, considering how easy it is
    to subscribe again.

commit 87356d8ef70f17786e7e94dbe5b21b12fe0b4af2
Author: Cesy <cesy.avon@gmail.com>
Date:   Fri Feb 17 11:08:14 2012 +0000

    Fixing based on review comments as Firewolf is busy

commit 9cd1ecd41404990e81387f7f6d0c80c3e585cd20
Merge: 856468d e449316
Author: Cesy <cesy.avon@gmail.com>
Date:   Fri Feb 17 11:05:01 2012 +0000

    Merge branch 'issue2541' of git://github.com/Firewolf13/otwarchive into issue2541

commit 3cb81bdfb7629b1785a6690fb7a0ae6bb82fcad1
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 14:38:11 2012 +0000

    Issue 2876 view fulfilled claims on user page

commit bf48565994dcfebf9ea43e4e4eaaa3546c9e0a59
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 11:26:09 2012 +0000

    Cukes for challenge_promptmeme including bug-fixes

commit c1ffe141077d5b4c2a7498b577e51895c1787d79
Author: elz <elzj78@gmail.com>
Date:   Wed Feb 15 22:48:43 2012 -0500

    Issue 1404: Allow users to save changes to work and chapter drafts without posting them.

commit f3d84ef35b3a706f468780b02f4374cf805ed207
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 09:46:01 2012 +0000

    Cuke failures for challenge_promptmeme

commit 658c35b3bf1aabd788d26a0d331cc10d064c5a2f
Author: Cesy <cesy.avon@gmail.com>
Date:   Sun Jan 29 08:50:46 2012 +0000

    Cuke failures in challenge_promptmeme

commit e4493167fa488dc9dce73fc21d75476f0f18debf
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 13 17:47:44 2011 +0000

    Validations for comment&alt text

commit 8c9e23f067efce569887018fdd64c5357c327e13
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 6 22:00:24 2011 +0000

    Know it's the wrong branch, start on issue 2508

commit 52b1baeb07ae541c2e0b469e95639ad1f90f3fc7
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 6 20:33:02 2011 +0000

    Adding Alt and Comment boxes for collection/challenge icons

commit ca41a16a9a4db114475574a0d0b2005ea5ad2be2
Author: Phoenix Wolfe <Phoenix.wolfe@gmail.com>
Date:   Tue Dec 6 17:05:04 2011 +0000

    Working on alt text for collections

commit aed938026bdc747b0eff0b267bbede2974c77334
Author: mumble <mumble@gmail.com>
Date:   Wed Jun 22 20:25:30 2011 +0000

    Added import subtitle, added subtitles to fandoms and bookmarks in a collection, added subtitle to fandom indexes by media, removed page_title definition from feedback page

commit 8cdcd6dfc6caf7849238d17a318b4bacd3eb3245
Author: mumble <mumble@gmail.com>
Date:   Sat Feb 12 22:05:39 2011 +0000

    Added page subtitles to collection index, collection home and profile pages, pseuds and series lists by user

commit 915241c768eef90d6bf5ebe73c106b67a34664cf
Author: mumble <mumble@gmail.com>
Date:   Wed Feb 9 23:39:43 2011 +0000

    Added subtitles to user's bookmarks and gifts

commit f45736367a543ef3acd2ffbe01a678422ae3fe6a
Author: mumble <mumble@gmail.com>
Date:   Wed Feb 9 22:08:11 2011 +0000

    Added page subtitles for user and pseud pages and the works index by tag; modified the way page titles are put together in the layout

Signed-off-by: shalott <shalott@gmail.com>