eric
|
9ed4186124
|
Merge branch 'master' of https://github.com/Gluejar/regluit
|
2012-05-13 15:37:28 -04:00 |
|
eric
|
aad5593c1d
|
resolve conflicts
|
2012-05-13 15:37:20 -04:00 |
Andromeda Yelton
|
193e4ef324
|
methods are not properties, whoops
|
2012-05-13 15:33:54 -04:00 |
|
Andromeda Yelton
|
c38a3a320f
|
fixing some URLs
|
2012-05-13 15:33:19 -04:00 |
|
eric
|
0cdac29c22
|
apply intcomma to currency display everywhere and add humanize
|
2012-05-13 15:32:32 -04:00 |
|
Andromeda Yelton
|
9a6ea26266
|
check to see if people have pledged and if so direct them to pledge_modify from sidebar rather than spawning new pledge
|
2012-05-13 15:23:04 -04:00 |
|
Andromeda Yelton
|
ea5664b08c
|
that ampersand should not be URLencoded since it's actually a parameter
|
2012-05-13 15:22:38 -04:00 |
|
Andromeda Yelton
|
d2cf8a773b
|
improvifying pledge front end around modify and cancel
|
2012-05-13 10:49:23 -04:00 |
|
Andromeda Yelton
|
ae76f89034
|
fixing problems with context for you_have_pledged notification
|
2012-05-12 22:42:09 -04:00 |
|
Andromeda Yelton
|
737c90a62a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-12 21:53:54 -04:00 |
|
Andromeda Yelton
|
e6467e4e85
|
even moar wordsmithing of notifications
|
2012-05-12 21:49:31 -04:00 |
|
Andromeda Yelton
|
33f7c99a5b
|
added a campaign.rightsholder property to make it not annoying to put rh names into templates
|
2012-05-12 21:49:18 -04:00 |
Raymond Yee
|
1c9fe4ff8f
|
Merge branch 'ry'
|
2012-05-12 18:47:27 -07:00 |
|
Andromeda Yelton
|
6fe7aeeabb
|
even more notification wordsmithing
|
2012-05-12 21:28:27 -04:00 |
|
Raymond Yee
|
7387350427
|
the fingerprint of the rsa key for a host is in /etc/ssh
|
2012-05-12 18:23:09 -07:00 |
|
Andromeda Yelton
|
54e1e3e98b
|
merge all the things
|
2012-05-12 12:25:17 -04:00 |
|
Andromeda Yelton
|
83730badbb
|
more wordsmithing
|
2012-05-12 11:58:33 -04:00 |
|
Raymond Yee
|
2dee8c3895
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-05-12 08:28:58 -07:00 |
|
Raymond Yee
|
5cf4c17c33
|
Put in the right BASE_URL for production
|
2012-05-12 08:28:17 -07:00 |
|
eric
|
77a66e5420
|
[#29498563] fixed urls by moving email share messages to django templates; eliminated sender from form
|
2012-05-12 11:12:43 -04:00 |
|
Raymond Yee
|
43162c0406
|
On second thoughts, let's just try the sandbox first on unglue.it, then clear the transactions and the turn on the real money....
|
2012-05-12 08:10:31 -07:00 |
|
Raymond Yee
|
50d6998a92
|
TURNING THE REAL AMAZON PAYMENT SYSTEM ON!!!
|
2012-05-12 08:06:51 -07:00 |
|
Raymond Yee
|
9378f91777
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-12 07:37:26 -07:00 |
|
eric
|
76b8b9f33d
|
[#29488053] no use linking to google books if no google books id
|
2012-05-11 22:46:41 -04:00 |
|
eric
|
a30976373f
|
better default cover for works with no google id [#29488053]
|
2012-05-11 22:46:03 -04:00 |
|
Raymond Yee
|
10db4d0e60
|
a fab command for pushing keys to ry-dev
corrected a typo in payment/manager.py
|
2012-05-11 18:54:21 -07:00 |
|
Andromeda Yelton
|
8e3baba673
|
wordsmithing
|
2012-05-11 21:36:20 -04:00 |
|
Andromeda Yelton
|
70a1da6713
|
note comments at end about context needed for notification templates
|
2012-05-11 21:36:08 -04:00 |
|
Andromeda Yelton
|
4c7fef1ce5
|
typo was bugging me
|
2012-05-11 21:35:52 -04:00 |
|
eric
|
feb8650c10
|
[#29488053] add to wishlist now works for works without googlebooks_id
|
2012-05-11 21:29:03 -04:00 |
|
eric
|
5bd3f06903
|
[#28851641] removed some debug code
|
2012-05-11 21:29:03 -04:00 |
|
eric
|
ca2bfedafd
|
[#28851641] fillied in you_have_pledged templates
|
2012-05-11 21:29:03 -04:00 |
|
Raymond Yee
|
4ca6a91d7a
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-11 15:15:19 -07:00 |
|
Raymond Yee
|
2590c5d58d
|
Trying to get production to line up with master
|
2012-05-11 15:05:40 -07:00 |
|
Raymond Yee
|
1b16603056
|
Merge branch 'production' of github.com:Gluejar/regluit into production
|
2012-05-11 15:05:18 -07:00 |
|
Raymond Yee
|
fe34207328
|
Merge branch 'master' of github.com:Gluejar/regluit into ry
|
2012-05-11 14:15:39 -07:00 |
|
Raymond Yee
|
fbd58d5e4e
|
Add import of notification
|
2012-05-11 14:14:49 -07:00 |
|
Raymond Yee
|
ba36838dfa
|
must import notification
|
2012-05-11 14:03:28 -07:00 |
|
Raymond Yee
|
7c49427e2c
|
Revert "wired pledge_you_have_pledged [#27785469]"
This reverts commit 17d641cf65.
|
2012-05-11 14:00:17 -07:00 |
Jason
|
7d4ec00382
|
Adding public key for jason kace to repository
|
2012-05-11 16:38:49 -04:00 |
|
eric
|
17d641cf65
|
wired pledge_you_have_pledged [#27785469]
|
2012-05-11 15:53:46 -04:00 |
|
Raymond Yee
|
100ed72e0e
|
starter for a method to update local keys
|
2012-05-11 12:40:57 -07:00 |
|
eric
|
36edf0a261
|
[#28851641] // was getting rewritten by apache, I think
|
2012-05-11 15:39:26 -04:00 |
|
Raymond Yee
|
888fa093dd
|
Merge branch 'ry'
|
2012-05-11 12:15:08 -07:00 |
|
thatandromeda
|
328cea6cf3
|
Update frontend/templates/notification/wishlist_active/full.txt
|
2012-05-11 16:05:47 -03:00 |
|
Raymond Yee
|
7b5c2feb35
|
Added logging on whether loading of FPS keys successful
|
2012-05-11 11:14:43 -07:00 |
|
eric
|
81d158f505
|
[#28851641] Edition creation and editing !!! Needs a schema migration.
|
2012-05-11 14:13:09 -04:00 |
|
eric
|
0f1bfaebc4
|
[finish #29411521] added site to url
|
2012-05-10 17:13:09 -04:00 |
|
eric
|
0ffd89e072
|
eric's public key
|
2012-05-10 16:36:16 -04:00 |
|
Raymond Yee
|
ccf753794c
|
Renaming AY's key to have her name
|
2012-05-10 13:23:10 -07:00 |