f701cda168
need a jenkins settings file with a googlebooks api key for the tests to pass
2011-10-10 13:26:00 -04:00
c0f4ad11c3
merged upstream changes
2011-10-10 13:09:00 -04:00
70a620b27f
moved to using googlebooks api for data. required moving authors and subjects to be associated to editions, since we google books does not have a notion of a work
2011-10-10 12:57:10 -04:00
84409507da
Merge branch 'campaign_model' of github.com:Gluejar/regluit
2011-10-10 08:07:25 -07:00
4e65134ab1
no need for commented out imports, eh
2011-10-09 15:17:43 -04:00
a905d6c820
added test of required fields for Campaign
2011-10-09 14:48:03 -04:00
90859811a9
simplified some things since the database schema does not allow for campaigns that lack a name, description or work
2011-10-09 14:27:27 -04:00
711546f414
First pass at incorporating status into Campaign
2011-10-07 20:11:57 -07:00
c7ac36b9fc
query_campaign repeated twice -- second one is query_list
2011-10-07 14:19:43 -07:00
68b94f768f
Changes in progress to the model
2011-10-07 14:17:54 -07:00
ac7deebf9a
I had missed some settings that needed to be obtained from django.conf.settings
2011-10-07 09:53:30 -07:00
0ffa43b870
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-10-07 09:15:15 -07:00
f9375dcea1
doc changes
2011-10-07 10:06:16 -03:00
94b5217f88
Edited README.md via GitHub
2011-10-07 10:03:54 -03:00
d7f2101166
production apache and mod_wsgi configs
2011-10-07 03:14:29 +00:00
fa855e81bf
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-07 03:13:46 +00:00
939b76b355
added production notes
2011-10-06 23:13:31 -04:00
30a51f9f68
need msyql client
2011-10-07 02:35:36 +00:00
002d9c807d
ignore virtualenv
2011-10-07 02:35:10 +00:00
e130cb10ae
needed this default value for the migration to work properly on a clean database
2011-10-07 02:34:46 +00:00
1a12a18196
added git to dependencies
2011-10-06 22:20:21 -03:00
cdc02e8c6e
Some parameters defined in django.conf.settings had to set accordingly
2011-10-06 16:10:20 -07:00
bec7ca3645
Merge branch 'master', remote branch 'origin'
2011-10-06 09:05:59 -07:00
5488052b54
Edited README.md via GitHub
2011-10-06 12:08:42 -03:00
6e53fd409f
wrote a script to look for what main settings variables are used in payment app, and couldn't find any.
2011-10-05 23:53:06 -04:00
8f9a03c94f
django.conf.settings should be used to get at the settings, not regluit.settings.me which could very well change depending on what environment regluit is configured to run in
2011-10-05 22:53:51 -04:00
bfd1d85264
need an empty models module for api to be treated like a legit django app that can be tested
2011-10-05 22:30:49 -04:00
d7630605e5
django-profiles is actually needed, currently
2011-10-05 22:30:04 -04:00
d67d77a9a0
Changed currency amounts to DecimalField in core and payment
...
Added south migrations to payment
Changed print statements to logger.info in payment
Added primitive paymentcomplete page in payment
2011-10-05 17:56:20 -07:00
82fb8c2c72
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
...
Conflicts:
payment/views.py
requirements.pip
2011-10-04 15:19:08 -07:00
88f9fc6a1d
This commit is not complete but I want to do so as a stepping stone.
2011-10-04 15:12:59 -07:00
6a8c68f1c8
missing selenium requirements
2011-10-04 20:43:36 +00:00
e80e19e47b
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-04 16:19:11 -04:00
5f411e49e0
converting css to a less system to improve maintainability. see http://lesscss.org/
2011-10-04 16:18:59 -04:00
59ba9db4f6
Adding basic selenium powered unit tests for payments
2011-10-04 07:55:39 -04:00
8175ea14f8
django-jenkins seems to use a whole lot of cpu and memory on ec2, to the point where it gets killed sometimes :-(
2011-10-04 01:03:12 -04:00
bc67cf937b
try running regluit tests only w/ django-jenkins
2011-10-03 23:57:57 -04:00
87d93ad915
going to try out django-jenkins management command
2011-10-03 23:33:12 -04:00
a4344e0afa
didn't need django-profiles at all, Sorry!
2011-10-03 17:39:54 -04:00
021fb51b24
Added payment/local_parameters.* to .gitignore
2011-10-03 13:56:56 -07:00
2423051df6
Merge branch 'tastypie2' of github.com:Gluejar/regluit into tastypie2
2011-10-03 13:50:37 -07:00
cca1f80ed7
Configuring payment to handle local_parameters
2011-10-03 20:45:34 +00:00
9c56c66455
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-10-03 20:37:59 +00:00
a8442da4f5
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-03 14:51:54 -04:00
406a15e8b6
minor fix to footer
2011-10-03 14:51:31 -04:00
52e3f50db0
forgot to put django-profiles in requirements
2011-10-03 14:50:27 -04:00
558ed5a8e5
merged changes to base.html
2011-10-03 12:52:52 -04:00
d652c2ac06
added rightsholder tools link
2011-10-03 12:51:30 -04:00
1acc2a6af8
adding rightsholder tools link to footer
2011-10-03 13:50:34 -03:00
73c4ebde29
allow username setting and tagline in profile
...
started work on user profiles, with "tagline" field
the first a user signs in this google, they are redirected to a page
where they can set their username
2011-10-03 12:36:22 -04:00
Ed Summers
Raymond Yee
thatandromeda
Andromeda Yelton
Jason
eric
Raymond Yee