Commit Graph

3940 Commits (5bb359fb1e40845f2edf35e9c9cbee46dd57fee4)

Author SHA1 Message Date
Andromeda Yelton e75a7b9642 skeleton of send-to-kindle support 2013-05-31 11:34:51 -04:00
Andromeda Yelton c797de93e6 download instruction buttons now work via ajax too 2013-05-31 10:46:26 -04:00
Andromeda Yelton 792d977a61 download page now prettifies via hijax links as well as download page 2013-05-30 09:17:34 -04:00
Raymond Yee ab371c0e64 turn the payment.Account.status into an enumeration (with choices) 2013-05-28 15:57:22 -07:00
eshellman 65d88d68b5 Merge pull request #179 from Gluejar/work_description_editable
make work description editable in admin
2013-05-28 07:33:22 -07:00
Andromeda Yelton ffc813d8ee blank descriptions now legit 2013-05-28 10:19:01 -04:00
Andromeda Yelton 25c6784943 language editable too 2013-05-28 10:06:21 -04:00
Andromeda Yelton 38183fd288 make work description editable in admin 2013-05-28 09:27:26 -04:00
Andromeda Yelton b5fd91006b jquery to hide/show downloading options 2013-05-28 09:23:57 -04:00
Andromeda Yelton 115eb776cb gonna need these 2013-05-24 16:04:45 -04:00
Andromeda Yelton b943e82012 CSS for streamlined downloads 2013-05-24 14:54:05 -04:00
Andromeda Yelton 177f60be0d preparing HTML for streamlined downloading experience 2013-05-24 14:16:13 -04:00
Raymond Yee a3cc502924 get rid of AccountTest0
renamed notice to Credit Card Number Updated
actually save account in update_account_status
2013-05-20 13:58:21 -07:00
Raymond Yee 31b978bb25 Merge branch 'master' into expiring_cc 2013-05-20 11:36:42 -07:00
eshellman a7a176ca3c Merge pull request #178 from Gluejar/pubs_default_to_active
work lists with active campaigns should highlight them
2013-05-17 09:25:53 -07:00
Andromeda Yelton 830e1248c3 probably more efficient 2013-05-17 11:30:22 -04:00
Andromeda Yelton 2ecf4d94e4 work lists with active campaigns should highlight them 2013-05-16 11:43:25 -04:00
thatandromeda d4ef3fc006 Merge pull request #177 from Gluejar/add_edition_fixes
allow new edition id oclc but no isbn; allow new publishernames
2013-05-16 08:22:57 -07:00
eshellman 8dbf20e143 added submit warning 2013-05-16 11:25:20 -03:00
eric f2e6d10469 allow new edition id oclc but no isbn; allow new publishernames 2013-05-13 17:32:30 -04:00
Raymond Yee ef8c27d6fa Fire off account_active notices only if Account is a new one 2013-05-09 08:54:00 -07:00
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