eric
|
a81b40ba70
|
discard dead command
|
2016-04-28 15:28:09 -04:00 |
Raymond Yee
|
029991a249
|
Merge branch 'add-questionnaire' of github.com:Gluejar/regluit into add-questionnaire
|
2016-04-28 09:30:37 -07:00 |
|
eric
|
dbf7b1d6b0
|
clean up imports
|
2016-04-28 12:23:19 -04:00 |
|
Raymond Yee
|
e33eb385fd
|
fix where Landing comes from
|
2016-04-28 09:19:43 -07:00 |
|
eric
|
a1d2051ab7
|
fix imports
|
2016-04-28 11:54:08 -04:00 |
|
Raymond Yee
|
a29a3a21c9
|
mistaken about the ed-questionnaire dependency
|
2016-04-28 08:39:41 -07:00 |
|
Raymond Yee
|
28749645fd
|
add ed-questionnaire dependency
|
2016-04-27 13:15:19 -07:00 |
|
eric
|
730c46c02a
|
Merge branch 'master' into dj16
|
2016-04-27 12:03:41 -04:00 |
|
Raymond Yee
|
a7a884f06b
|
Merge pull request #564 from Gluejar/fix-unglued-ebook
remove assumption that successful campaign is last_campaign
|
2016-04-26 13:33:59 -07:00 |
|
eric
|
132b7deb79
|
add requirements
|
2016-04-26 15:00:23 -04:00 |
|
eric
|
cf64d43811
|
add the questionnaire module
|
2016-04-26 14:38:32 -04:00 |
|
Raymond Yee
|
3c795dfb58
|
add a clarifying comment and restore raise Http404 for the case for ebfs.count() is 0
|
2016-04-26 11:24:46 -07:00 |
|
Raymond Yee
|
c67f676a24
|
try to make looking for the at most one SUCCESSFUL buy-to-unglue campaign for the work a bit clearer
|
2016-04-26 10:54:55 -07:00 |
|
eric
|
20102ffc12
|
remove assumption that successful campaign is last
|
2016-04-25 14:56:17 -04:00 |
|
Raymond Yee
|
f36212c869
|
have to use version of Python < 2.7.11 to work for these set of libraries
|
2016-04-24 11:07:05 -07:00 |
|
Raymond Yee
|
c74500e9d7
|
Merge pull request #563 from Gluejar/2nd-campaign
allow thanks campaign after success
|
2016-04-24 08:12:19 -07:00 |
|
eric
|
9c6ff70e65
|
add comments
|
2016-04-24 10:34:13 -04:00 |
|
eric
|
c5886e5584
|
allow thanks campaign after success
|
2016-04-23 17:55:01 -04:00 |
|
Raymond Yee
|
fe5a6e122b
|
Merge branch 'master' into dj16ry
|
2016-04-21 13:43:23 -07:00 |
|
Raymond Yee
|
edf6a33ecc
|
Merge pull request #562 from Gluejar/fix-feed
Fix feed: missing comma
|
2016-04-21 13:40:16 -07:00 |
|
Raymond Yee
|
db0ab1ac39
|
accidental extra characters
|
2016-04-21 13:39:28 -07:00 |
|
Raymond Yee
|
0f31a617c5
|
fix missing comma
|
2016-04-21 13:37:59 -07:00 |
|
Raymond Yee
|
aaf03e193f
|
Merge pull request #561 from Gluejar/fix-feed
no, don't deactivate other ebooks
|
2016-04-21 12:08:25 -07:00 |
|
eric
|
a4d0b2d172
|
no, don't deactivate other ebooks
|
2016-04-21 14:44:50 -04:00 |
|
Raymond Yee
|
24944adac5
|
Load campaign_starter_2.sql "fixture", which contains a B2U campaign...will let one test campaign and payment functionality in please
|
2016-04-21 11:12:06 -07:00 |
|
Raymond Yee
|
f806071366
|
need a newer version of paramiko for fab get_dump to work
try upgrading pip before running pip install -r requirements for please.yml
|
2016-04-20 10:24:44 -07:00 |
|
Raymond Yee
|
00d3649b57
|
need to update redis because of https://github.com/celery/celery/issues/2903
|
2016-04-19 10:52:44 -07:00 |
|
Raymond Yee
|
dfcde1f46b
|
skipping certain tests explicitly, ones that I had been able to skip in Django 1.4 with suites() but, for some reason, are being run in Django 1.6.
|
2016-04-19 07:49:20 -07:00 |
|
Raymond Yee
|
1c0b7d256d
|
Merge branch 'master' into sysadmin
|
2016-04-18 10:18:43 -07:00 |
|
Raymond Yee
|
d4f8e486cc
|
update selenium dependency
|
2016-04-18 10:17:21 -07:00 |
|
Raymond Yee
|
2131f40261
|
Merge branch 'master' into dj16ry
|
2016-04-13 13:59:50 -07:00 |
|
Raymond Yee
|
c01de2bae3
|
Merge pull request #560 from Gluejar/blog2https
Wordpress is magically HTTPS
|
2016-04-13 07:42:27 -07:00 |
|
eshellman
|
c07f279be8
|
Merge pull request #559 from Gluejar/dj16ry
some changes I'm considering for dj16
|
2016-04-12 14:44:31 -04:00 |
|
eric
|
616e8b3c9d
|
Wordpress is magically HTTPS
|
2016-04-12 14:32:22 -04:00 |
|
Raymond Yee
|
877b296128
|
commenting out payment.tests.BasicGuiTest because for some reason
the suite() is not being honored and BasicGuiTest is being run when
I run django-admin.py test payment
have to explore further: http://stackoverflow.com/questions/21572921/django-celery-test-runner-doing-very-strange-things
|
2016-04-12 10:48:04 -07:00 |
|
Raymond Yee
|
2c8d7fd287
|
add SOUTH_MIGRATION_MODULES = {
'djcelery': 'djcelery.south_migrations',
}
|
2016-04-12 09:35:39 -07:00 |
|
eric
|
e4a2ce084e
|
add ALLOWED_HOSTS
|
2016-04-11 22:08:03 -04:00 |
|
Raymond Yee
|
6df2db650a
|
use dj16ry branch
|
2016-04-11 16:03:27 -07:00 |
|
Raymond Yee
|
b35e09a263
|
upgrades in celery related modules to deal with upgrade to Python 2.7.11, etc
ALLOWED_HOSTS settign needed now
upgrade wsgi file (just in case)
|
2016-04-11 15:38:49 -07:00 |
|
Raymond Yee
|
0f3e183fbb
|
use dj16ry branch for now
|
2016-04-11 14:13:54 -07:00 |
|
Raymond Yee
|
561347d7eb
|
try to jump to newest version of kombu to work with Python 2.7.11
|
2016-04-11 13:44:07 -07:00 |
|
Raymond Yee
|
f37b04320c
|
try to use Python 2.7.11 again
|
2016-04-11 13:40:12 -07:00 |
|
Raymond Yee
|
aec5bdb564
|
update manage.py for Django 1.6
|
2016-04-11 13:17:16 -07:00 |
|
Raymond Yee
|
a3a39ec8f5
|
dj16
|
2016-04-11 13:13:52 -07:00 |
|
Raymond Yee
|
521c85564d
|
Merge branch 'master' into sysadmin
|
2016-04-11 10:15:30 -07:00 |
|
Raymond Yee
|
560b348b9f
|
Merge pull request #558 from Gluejar/fix-vertical-text
fix doubly rotated "feedback" text in chrome
|
2016-04-11 09:17:02 -07:00 |
|
eric
|
e7c1eea932
|
fix doubly rotated "feedback" text in chrome
|
2016-04-09 19:59:05 -04:00 |
|
eric
|
3140b05b62
|
postpose TZ cleanup
|
2016-04-09 13:27:04 -04:00 |
|
eric
|
7e3e1655e1
|
one more null boolean
|
2016-04-09 13:26:42 -04:00 |
|
eric
|
ef62d59dd0
|
bugfix unrelated to 1.6
|
2016-04-09 13:26:05 -04:00 |