Commit Graph

2099 Commits (b9de19bb0985a27c8e1a8f21a3fe50cb9372556b)

Author SHA1 Message Date
eric b21787a590 Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit c8be251ffa.
2012-05-07 01:14:47 -04:00
eric c8be251ffa Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""
This reverts commit 2d344a09c6.
2012-05-07 01:14:01 -04:00
eric 2d344a09c6 Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"
This reverts commit 7043e71c39.
2012-05-07 01:11:26 -04:00
eric 7043e71c39 [#28945859] removed description from edition. Be sure to do data migration before applying this schema migration
also fixed issues with tests failing in add_openlibrary
2012-05-07 00:42:11 -04:00
eric 900bb88eaf [#28945859] create description on work, migrate data 2012-05-06 23:01:56 -04:00
eric d489fc0730 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-05-06 22:31:52 -04:00
eric e93a6d7523 [#28945859] now pulling description from OL, looking for all editions 2012-05-06 22:31:38 -04:00
Raymond Yee 70210dca95 add looking for settings.local to the settings files
fabfile.list_backups
first cut at aws.create_dbinstance and aws.db_info
2012-05-05 13:45:50 -07:00
Ed Summers 9ea3d62ead added my pubkey 2012-05-04 17:01:51 -04:00
Jason e09418a7a2 Updating paypal code to use common global transaciton status, fixing bugs in paypal interface with abstract payment manager class 2012-05-04 10:30:05 -04:00
Andromeda Yelton 4be0cab5a0 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-04 10:05:54 -04:00
Andromeda Yelton 8902ec84b3 made manage_campaign workflow suck less 2012-05-04 09:56:41 -04:00
Raymond Yee e94e0352e9 Raymond's public key:
ssh-keygen -l -f deploy/public_keys/raymond_yee.pub ->
2048 89:33:28:02:e4:ef:c0:5e:f5:30:e1:4a:2c:1f:a3:b7 deploy/public_keys/raymond_yee.pub (RSA)
2012-05-03 18:44:42 -07:00
Raymond Yee 30c72f07e3 Have settings/common.py attempt to import a settings/aws.py to allow keys to be stored outside of github 2012-05-03 16:48:51 -07:00
Raymond Yee a62d988249 Merge branch 'ry' of github.com:Gluejar/regluit 2012-05-03 18:41:21 +00:00
Raymond Yee 3725094aea A few more steps needed to get rid of billing (aka django-merchant) 2012-05-03 11:17:27 -07:00
Raymond Yee c83aa8615a Removing django-merchant dependency 2012-05-03 10:58:08 -07:00
Raymond Yee d2dccbd1c3 add a PAYMENT_PROCESSOR setting to common.py 2012-05-02 18:34:13 -07:00
Raymond Yee 9887de6e9a Updated the campaign_starter.sql to match the latest db migrations 2012-05-03 01:26:44 +00:00
Raymond Yee 99332f238b Merge branch 'ry' of github.com:Gluejar/regluit into fps
Conflicts:
	requirements.pip
2012-05-02 18:11:22 -07:00
Raymond Yee b15a3bc6eb Somehow these files didn't get into fps 2012-05-02 18:07:27 -07:00
Raymond Yee b9bbecb351 Merge branch 'master' of github.com:Gluejar/regluit into fps
Conflicts:
	settings/common.py
	settings/dev.py
	settings/prod.py
2012-05-02 18:01:20 -07:00
Raymond Yee 910ad607ba Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-05-02 17:20:57 -07:00
Raymond Yee 3f1c2d6c5c Making explicit that a Campaign needs to have an active claim in order to be activated. 2012-05-03 00:19:40 +00:00
Raymond Yee a71d50458c Added a few more modules to help with RSA/ssh munging 2012-05-02 16:59:33 -07:00
Raymond Yee 4b7c11b13b Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-05-02 16:53:32 -07:00
Raymond Yee b289a8cfd3 Fixing how now() is being called in random_campaigns command 2012-05-02 23:49:55 +00:00
Raymond Yee 51804b3c58 Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-05-02 13:59:34 -07:00
Andromeda Yelton a3ce812467 small formatting changes 2012-05-02 14:10:58 -04:00
Ed Summers b8b007c427 last_campaign_status is a string not function 2012-05-02 17:53:45 +00:00
eric bbb5da7186 fixed lower case format values 2012-05-02 12:32:11 -04:00
eric 8b54e66610 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-05-02 09:07:50 -04:00
Raymond Yee 11b4ab8623 Renamed other ebook format icons to lowercase 2012-05-01 22:56:00 -07:00
Raymond Yee b4e6d7dcff Merge branch 'master' of github.com:Gluejar/regluit 2012-05-01 22:49:44 -07:00
Raymond Yee c5da22f6e9 Renaming PDF32.png -> pdf32.png 2012-05-01 22:49:00 -07:00
Raymond Yee 4ade279643 Merge branch 'master' of github.com:Gluejar/regluit into ry 2012-05-01 22:39:50 -07:00
Raymond Yee 240568ce29 Building out more RDS functionality 2012-05-01 22:39:19 -07:00
eric 4d13953e41 We're not allowed to store descriptions from google 2012-05-01 16:25:38 -04:00
Andromeda Yelton 122454b949 Merge branch 'master' of github.com:Gluejar/regluit 2012-05-01 13:56:12 -04:00
Andromeda Yelton 3deb660ce3 more css tweaks per stefan 2012-05-01 13:49:23 -04:00
eric 1c2e48bc87 added edition to campaign model to allow selection of a preferred edition [finish #28736373] 2012-05-01 10:56:19 -04:00
eric c0625d78b8 banish isbn 10 display because it might not exist and prefer not to address the issue 2012-05-01 10:54:29 -04:00
eric fb5333be2e only use role account email addresses in documentation pages 2012-05-01 10:02:07 -04:00
Andromeda Yelton ce36f6771d css changes per Stefan, part 1 2012-05-01 09:56:19 -04:00
Raymond Yee 737065cf2d Added functionality to lay foundation for creating EC2 instances on the fly 2012-04-30 17:38:09 -07:00
Andromeda Yelton 8999afb7f1 Merge branch 'master' of github.com:Gluejar/regluit 2012-04-30 11:28:52 -04:00
Andromeda Yelton 5421793f02 minor styling tweaks 2012-04-30 11:03:15 -04:00
eric 4f524a792f [#24088823] ebook downloads now drop down if more than 1 2012-04-28 21:05:41 -04:00
eric 61a4878b54 [finish #24030945] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems. 2012-04-28 13:02:38 -04:00
eric 6cd6064387 [start #24030945] notification that ebooks have been added to database 2012-04-27 17:29:57 -04:00