Commit Graph

3919 Commits (8317356cc22023c0fafda3aa0c9b6772794d663f)

Author SHA1 Message Date
Raymond Yee 94a23b3adf delete AccountTest.get_transaction_level() 2013-05-08 19:03:32 -07:00
Raymond Yee b1a23c9183 Add sending of account_active notices -- though they are turned off by default 2013-05-08 18:15:33 -07:00
Raymond Yee 73290fdfc1 fixed up text for account_active notice -- even though at this point, it's not being fired 2013-05-08 16:49:43 -07:00
Raymond Yee b224e99346 Merge branch 'master' into expiring_cc 2013-05-08 14:05:57 -07:00
eshellman be78c11815 Merge pull request #174 from Gluejar/improve_admin
All the core admin bits are now useable, and display more human readable. Nice convergence.
2013-05-06 14:11:05 -07:00
thatandromeda 97bc857eab Merge pull request #168 from Gluejar/degruyter_stub_template
put status information in de gruyter initialized campaigns
2013-05-06 13:04:50 -07:00
Andromeda Yelton 53d23d9f18 grammar 2013-05-06 15:59:55 -04:00
Andromeda Yelton ca71b5b4de Merge branch 'useful_admin' into improve_admin
Conflicts:
	admin.py
2013-05-06 15:53:49 -04:00
Andromeda Yelton 59248bd07d improving admin page interfaces 2013-05-06 15:41:45 -04:00
eric d65704d675 RightsHolder, Subject, UserProfile admin useable 2013-05-03 19:21:10 -04:00
eric c4c9614a52 Campaign, Edition Admin Useable 2013-05-03 18:39:27 -04:00
eric d6a19d9754 Author Admin useable 2013-05-03 18:28:10 -04:00
eric 356cc67785 claim admin useable 2013-05-03 18:05:43 -04:00
Raymond Yee 5356fdb7c4 Merge pull request #173 from Gluejar/fix_about_x
fix bad links from stupid robots [#49219467] -- looks good on my laptop
2013-05-03 13:40:01 -07:00
eric 1788705bd7 fix bad links from stupid robots [#49219467] 2013-05-03 14:48:36 -04:00
eric 0578a40798 changed the html, need to change the management command 2013-05-03 11:50:41 -04:00
eric 5f6abec1d5 de-button the ungluers to go 2013-05-02 15:58:28 -04:00
eshellman fb5981635d Merge pull request #172 from Gluejar/full_title_onhover
expand author names and titles on hover in book list
2013-04-29 12:03:47 -07:00
Andromeda Yelton 311e15a948 should work in all campaign states 2013-04-29 14:50:49 -04:00
Raymond Yee a9347282e0 Merge pull request #171 from Gluejar/fix_readmill_button
fix ebook url in reverse method
2013-04-29 09:33:13 -07:00
Andromeda Yelton d8ebec9f67 expand author names and titles on hover in book list 2013-04-29 12:19:00 -04:00
eric 144599ac34 fix the download page tests 2013-04-27 16:58:11 -04:00
eric 6b7fb7fd00 fix ebook url in reverse method 2013-04-26 17:49:57 -04:00
Raymond Yee db1ee70647 fixed up notice texts for account_expired
also made sure that user is properly passed to sender of notices
2013-04-26 10:50:28 -07:00
Raymond Yee 7265488484 Merge branch 'master' into expiring_cc 2013-04-26 08:58:47 -07:00
eshellman c5517df1c9 Merge pull request #167 from Gluejar/less_officious_comments
Less officious comments
2013-04-25 15:26:47 -07:00
Raymond Yee a9f1c675be Merge pull request #169 from Gluejar/marc_skeleton
just stashing marc records somewhere commonly accessible. can build infr...
2013-04-25 08:31:23 -07:00
Raymond Yee a375112e72 Merge branch 'master' into expiring_cc 2013-04-24 13:50:33 -07:00
Raymond Yee 8ed605f586 Merge pull request #170 from Gluejar/fix_download_test
donwload page changed, test should change to agree -- Andromeda says tests run ok.
2013-04-24 12:51:05 -07:00
Andromeda Yelton 7c9973319d donwload page changed, test should change to agree 2013-04-24 15:41:35 -04:00
thatandromeda babeb9e4aa Merge pull request #164 from Gluejar/manage_book_data
Manage book data
2013-04-24 11:31:07 -07:00
Andromeda Yelton e7cea6c8f4 clarifying 2013-04-24 14:30:39 -04:00
thatandromeda 587931a712 Merge pull request #165 from Gluejar/download_counter
Download counter
2013-04-24 11:28:22 -07:00
Andromeda Yelton 3b44e643d5 put status information in de gruyter initialized campaigns 2013-04-24 14:26:23 -04:00
Andromeda Yelton aca759447d test for staffness in template 2013-04-24 11:28:05 -04:00
eric 08d4adf50b implement adromeda suggestions 2013-04-24 11:14:25 -04:00
Andromeda Yelton 51dddd9353 just stashing marc records somewhere commonly accessible. can build infrastructure later. 2013-04-24 10:38:07 -04:00
Andromeda Yelton 80ee477198 disambiguate staff and RH 2013-04-23 10:22:08 -04:00
Andromeda Yelton 516f867d87 removing word 'official' 2013-04-23 10:07:59 -04:00
Raymond Yee b029be4c5d Merge pull request #166 from Gluejar/fix_campaign_test
I think I had a Y2.0144K problem
2013-04-22 09:35:28 -07:00
Raymond Yee e34f2ce3a3 I think I had a Y2.0144 problem 2013-04-22 16:10:54 +00:00
eric fb77f5a372 fixed ebook admin to allow setting of counts, etc 2013-04-20 10:34:44 -04:00
eric a2606b2e08 move download count display to work infobox and rh_tools 2013-04-20 10:08:10 -04:00
eric de442c8f63 count downloads. migrate schemas! 2013-04-20 00:02:36 -04:00
eric aaaa9e0e56 need a link to repeat the proces 2013-04-18 11:29:34 -04:00
eric 0a65a84157 update selectable to get it working again 2013-04-18 11:29:19 -04:00
Raymond Yee aac69cf64c Fixed up account_expiring text...next step is to fix up account_expired and account_active 2013-04-17 15:43:44 -07:00
Raymond Yee 3b900e2328 Align names signals.py with those in the short.txt for notices 2013-04-17 13:24:43 -07:00
Raymond Yee 86dcdea1b7 updated text for cc notices 2013-04-17 11:42:49 -07:00
eric 11381a99c9 add edition management links 2013-04-16 16:46:45 -04:00