Raymond Yee
|
69df6e503d
|
Merge branch 'master2'
|
2012-04-05 14:18:12 -07:00 |
Raymond Yee
|
7b4ed8830e
|
Make modifications to please.py and prod.py to reflect fact that common.py has base definitions for celerybeat tasks
|
2012-04-05 14:07:55 -07:00 |
Raymond Yee
|
8a0ed638d3
|
Add import regluit and datetime to common.py
|
2012-04-05 13:56:42 -07:00 |
eric
|
71e6234075
|
Merge branch 'master' of https://github.com/Gluejar/regluit
|
2012-04-05 16:55:36 -04:00 |
eric
|
db736818fc
|
[finish #27524965] fixed issue where released claim prevents new claim
|
2012-04-05 16:55:10 -04:00 |
Raymond Yee
|
600f2e7075
|
Put definition of CELERYBEAT variables in common.py and definition of some common tasks but don't turn them on in common -- do that in the respective local setups
|
2012-04-05 13:54:46 -07:00 |
Raymond Yee
|
2aae2f64c1
|
Added necessary import to settings -- datetime and regluit
|
2012-04-05 13:44:47 -07:00 |
Raymond Yee
|
b23f354029
|
Add the same celerybeat jobs configuration to production
|
2012-04-05 13:41:58 -07:00 |
Raymond Yee
|
22a5b19b56
|
Configure some jobs for celerybeat on please
|
2012-04-05 13:40:53 -07:00 |
Raymond Yee
|
607a0d91b4
|
Merge branch 'master' of github.com:Gluejar/regluit into master2
|
2012-04-05 13:25:00 -07:00 |
Raymond Yee
|
2c2d1bb606
|
Adding first passes at celerybeat configuration files for please and unglue.it -- still need to be tested
|
2012-04-05 13:24:03 -07:00 |
Raymond Yee
|
d747ba3e87
|
This celerybeat conf works for ry-dev.dyndns.org
|
2012-04-05 20:21:31 +00:00 |
Raymond Yee
|
dfc4115143
|
Adding celerybeat
|
2012-04-05 11:09:46 -07:00 |
eric
|
6d8bc9d199
|
tried smaller cover image in notice [#27115511]
|
2012-04-05 13:11:42 -04:00 |
eric
|
5c7fb1ac8f
|
reinserted status pending improvement [#27470969]
|
2012-04-05 13:10:42 -04:00 |
eric
|
be909bba69
|
change language on claim status [accept #27384493]
|
2012-04-05 11:58:26 -04:00 |
eric
|
6adf21c380
|
put spaces in front of /> per xhtml recommendation
|
2012-04-05 11:53:58 -04:00 |
Raymond Yee
|
572d2ecd91
|
I committed the wrong file for celeryd_rydev.conf -- this is the right one
|
2012-04-05 15:34:57 +00:00 |
Raymond Yee
|
4bbef9e102
|
Add a celeryd.conf file for ry-dev...on the way to getting the celerybeat daemon to work
|
2012-04-04 22:56:00 +00:00 |
Raymond Yee
|
1031a80a5e
|
Merge branch 'master' of github.com:Gluejar/regluit into payment
Conflicts:
core/signals.py
|
2012-04-04 10:08:59 -07:00 |
Raymond Yee
|
58f6e3b010
|
Merge branch 'master2' of github.com:Gluejar/regluit into master2
|
2012-04-04 16:18:40 +00:00 |
Raymond Yee
|
8a6de4ef1d
|
A proxy for the mailchimp js
|
2012-04-04 09:15:18 -07:00 |
Raymond Yee
|
35633bd02f
|
Merge branch 'master' of github.com:Gluejar/regluit into master2
|
2012-04-04 15:29:59 +00:00 |
Raymond Yee
|
7c77c748ef
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-04-04 06:52:47 -07:00 |
Raymond Yee
|
91f8911337
|
Merge branch 'master2' of github.com:Gluejar/regluit into master2
|
2012-04-04 13:44:05 +00:00 |
Raymond Yee
|
43f4c85162
|
First pass at fixing ssl issues on press page --> fix youtube videos. Still leaves mailchimp js
|
2012-04-04 06:42:22 -07:00 |
Andromeda Yelton
|
903356cbd6
|
merge
|
2012-04-04 08:52:50 -04:00 |
Andromeda Yelton
|
e03309a88e
|
more user-friendly wording of campaign status. also seeing if i can get this to show up in pivotal [start #27470969]
|
2012-04-04 08:50:06 -04:00 |
Raymond Yee
|
23d7ae9c86
|
Getting rid of http://platform.twitter.com -> //platform.twitter.com
|
2012-04-03 15:43:27 -07:00 |
Raymond Yee
|
48834d490f
|
Merge branch 'master2' of github.com:Gluejar/regluit into master2
|
2012-04-03 22:42:28 +00:00 |
Raymond Yee
|
96b10a2776
|
Commenting out number of supporters in the tab right now on work.html until we figure out how to display without overflowing tab space
|
2012-04-03 15:14:52 -07:00 |
eric
|
40722074d1
|
Added work# and campaign# to distinguish works/campaigns with the same name
|
2012-04-03 15:54:41 -04:00 |
eric
|
5d5c60993e
|
added form to edit campaign managers [start #27468285]
|
2012-04-03 15:54:41 -04:00 |
eric
|
8cf4209b54
|
removed comments
|
2012-04-03 15:54:41 -04:00 |
Ed Summers
|
331d886a7c
|
need to rewrite cover image urls in googlebooks api search results too
|
2012-04-03 15:27:33 -04:00 |
Andromeda Yelton
|
e3573c3157
|
Merge github.com:Gluejar/regluit
|
2012-04-03 14:58:43 -04:00 |
Andromeda Yelton
|
49677c3a45
|
manage campaign links replaced with big green buttons
|
2012-04-03 14:58:32 -04:00 |
Raymond Yee
|
7cb3c038bd
|
Migrating existing twitter pic urls
MIGRATION required
Conflicts:
core/models.py
|
2012-04-03 11:54:20 -07:00 |
Ed Summers
|
df36d8bf65
|
save https url for twitter avatar
|
2012-04-03 14:46:31 -04:00 |
Raymond Yee
|
0f0ef412eb
|
Computing the twitter picture
|
2012-04-03 11:29:26 -07:00 |
Ed Summers
|
cd41708237
|
migration to convert facebook avatar urls to https
|
2012-04-03 14:10:56 -04:00 |
Ed Summers
|
5e25f2f90a
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-04-03 13:56:25 -04:00 |
Ed Summers
|
1187a346ee
|
use https urls for google books cover images
|
2012-04-03 13:55:45 -04:00 |
Andromeda Yelton
|
24674d8a2d
|
improving display of active campaign notice
|
2012-04-03 12:30:34 -04:00 |
eric
|
86834f5e99
|
remove dead import
|
2012-04-03 11:47:41 -04:00 |
eric
|
298bd5ad3c
|
Merge branch 'master' of https://github.com/Gluejar/regluit
|
2012-04-03 11:18:15 -04:00 |
eric
|
c90c42a2e8
|
linefeeds
|
2012-04-03 11:17:59 -04:00 |
eshellman
|
97c7a8edc8
|
Update core/models.py
|
2012-04-03 12:15:23 -03:00 |
eric
|
aab0c47eeb
|
reconcile linefeeds
|
2012-04-03 11:10:49 -04:00 |
eshellman
|
7769bbd8b3
|
really change the notice
|
2012-04-03 12:07:29 -03:00 |