888fa093dd
Merge branch 'ry'
2012-05-11 12:15:08 -07:00
328cea6cf3
Update frontend/templates/notification/wishlist_active/full.txt
2012-05-11 16:05:47 -03:00
7b5c2feb35
Added logging on whether loading of FPS keys successful
2012-05-11 11:14:43 -07:00
81d158f505
[ #28851641 ] Edition creation and editing !!! Needs a schema migration.
2012-05-11 14:13:09 -04:00
0f1bfaebc4
[finish #29411521 ] added site to url
2012-05-10 17:13:09 -04:00
0ffd89e072
eric's public key
2012-05-10 16:36:16 -04:00
ccf753794c
Renaming AY's key to have her name
2012-05-10 13:23:10 -07:00
bc3045161c
clarified wording
2012-05-10 15:40:37 -04:00
57b519c2d1
committing public key
2012-05-10 15:40:14 -04:00
718286be39
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-10 13:34:57 -04:00
71c174d012
need to expose paypal address field after all
2012-05-10 13:23:42 -04:00
4ba688dbad
minor fixes
2012-05-10 13:23:19 -04:00
1633b5a32d
Make it easier to flip the switch on whether to run the FPS sandbox or the real thing
2012-05-10 09:03:10 -07:00
33642190cb
Allows set_key command to set keys that already exists
2012-05-10 08:34:45 -07:00
9aa586181e
Wrapping the import of FPS keys in amazon.py so that things won't die if it gets imported before the database gets set up -- these changes don't break amazon functionality on ry's laptop and hopefully will be ok for jenkins.
2012-05-10 08:08:58 -07:00
069342276b
Merge branch 'ry'
2012-05-09 18:04:56 -07:00
fe1894c378
Add a fab command to set_key -- and also generalize fab destinations because I now have settings/me.py point to the correct local configuration file
2012-05-09 18:02:59 -07:00
16bb539931
Put please into paypay mode
2012-05-10 00:50:31 +00:00
40a660e9b6
Add a set_key django admin command to make it easier to load keys
2012-05-09 17:17:18 -07:00
090d36de66
[ #29272807 ] implemented storage of FPS_* keys in the db
2012-05-09 17:16:49 -07:00
c6186c7808
need to hardcode staff names and pics on recommended as is_staff doesn't produce behavior we want
2012-05-09 16:33:22 -04:00
fe84c09651
polishing for launch
2012-05-09 16:32:06 -04:00
4deae23fd4
Ooops -- I forgot one migration
2012-05-09 11:42:29 -07:00
71bd2a88c9
Had to fix campaign_starter.sql so that the migration to create core.models.Key doesn't fail
2012-05-09 11:36:13 -07:00
41f662c048
updating pledging contextual FAQs
2012-05-09 13:40:01 -04:00
d0bac11ec4
clarifing CC noncommercial
2012-05-09 13:26:12 -04:00
e1835a7cc7
updating, including amazon and paypal language
2012-05-09 13:01:17 -04:00
e4e66b2118
adding some more recent coverage
2012-05-09 12:45:00 -04:00
194298cdef
Adjusted selenium test for latest UI change
2012-05-09 09:42:59 -07:00
42d33794e3
sign up element in learn more section was misaligned
2012-05-09 12:20:41 -04:00
da8707b597
Setting up a campaign_starter that has a paypaltest account
2012-05-09 08:59:21 -07:00
0212136a43
Revert "unrequiring paypal address"
...
This reverts commit 32a4b29e33
2012-05-09 09:37:57 -04:00
4c20082d70
[ #29281959 ] add feedback from lawyer
2012-05-09 09:37:33 -04:00
8fa1f89eca
re-require Paypal address
2012-05-09 09:36:27 -04:00
8a8f82a9a9
[ #29272807 ] Forgot to make core.models.Key.name unique
2012-05-08 16:47:07 -07:00
9b2693ed8b
[ #29272807 ] Implementation of an encrypted keystore as core.models.Key
...
NOTE MIGRATION needed
* Immediate reason for this implementation is to make it harder for our AWS keys to be compromised -- this will allow us to store them in encrypted (AES 256) form in the db, which will require ability to run mysql on the EC2 instance
* depends on a Django settings.SECRET_KEY, which for now, we might store in settings/local.py -- we could get fancier about how to serve that up
2012-05-08 16:08:36 -07:00
beff46fd8c
standardizing on Unglue.it rather than Unglue.It
2012-05-08 16:15:23 -04:00
11c19b950d
preventing information leakage about campaign status changes during preview and preventing non-staff from launching campaigns
2012-05-08 15:51:17 -04:00
f232bc1048
we're not using this any more
2012-05-08 14:41:04 -04:00
aea47fff25
we weren't using that class any more
2012-05-08 14:38:44 -04:00
6e1aa4dfd0
changed work_list page to clearly communicate that it's staff picks when facet = recommended
2012-05-08 14:28:06 -04:00
ce468f2bbc
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-08 13:58:39 -04:00
32a4b29e33
unrequiring paypal address
2012-05-08 13:48:32 -04:00
9549b34d9e
parts of Description tab now conditional on campaign status, rather than offering RHs options they're not allowed to use
2012-05-08 13:48:24 -04:00
5004256f78
better wording
2012-05-08 13:47:58 -04:00
6c829a0556
Fix the BASE_URL for just
2012-05-08 16:21:13 +00:00
9fc2444f37
need to be explicit that premium_id is a list or it will try to iterate through a string and fail bafflingly
2012-05-08 10:51:04 -04:00
7dbb2e2276
Merge branch 'master' of github.com:Gluejar/regluit
2012-05-08 09:50:32 -04:00
73157c8720
clarified manage campaign workflow
2012-05-08 09:27:03 -04:00
8d74baef95
Merging fps and master together
2012-05-07 16:53:12 -07:00
Raymond Yee
thatandromeda
eric