eric
|
1ab9304475
|
[finish #28949611] rights holders are now the default campaign manager; they can remove themselves after they add another manager
|
2012-05-07 17:32:58 -04:00 |
Raymond Yee
|
a1e5e3ff12
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-07 13:15:33 -07:00 |
Raymond Yee
|
09a8f90740
|
Added a site definition for just.unglueit.com
|
2012-05-07 13:14:31 -07:00 |
Ed Summers
|
67645f26a1
|
A shell script for generating SSL certificates and CSRs for a hostname
|
2012-05-07 19:51:47 +00:00 |
Raymond Yee
|
11c79b1f89
|
Add site number for just.unglueit.com
|
2012-05-07 12:06:59 -07:00 |
Ed Summers
|
04c9a46ede
|
Forgot to add settings/just.py
|
2012-05-07 19:05:58 +00:00 |
Ed Summers
|
509bff4d52
|
Configuration files for just.unglueit.com
|
2012-05-07 18:44:01 +00:00 |
eric
|
57cebd126d
|
[accept #28451269] added 2 headings and a preview link. Nice job.
|
2012-05-07 12:19:19 -04:00 |
eric
|
1d005fae95
|
[finish #29170153] Improved display of no-google works
|
2012-05-07 11:36:34 -04:00 |
eric
|
a32b09a4cb
|
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:18:11 -04:00 |
eric
|
c0cb99e040
|
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:18:11 -04:00 |
eric
|
d334fa58b0
|
Revert "Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration""""
This reverts commit b21787a590 .
|
2012-05-07 01:18:11 -04:00 |
eric
|
e10136f1b2
|
Revert "Revert "Revert "[#28945859] removed description from edition. Be sure to do data migration before applying this schema migration"""
This reverts commit 1bbac102a2 .
|
2012-05-07 01:18:11 -04:00 |
eric
|
1bbac102a2
|
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:47 -04:00 |
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 |
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 |