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
f6bd35d623
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-10-03 14:16:53 +00:00
77eb1db0ce
Merge branch 'master' of github.com:Gluejar/regluit
2011-10-01 08:01:48 -04:00
ed1732b4ec
Adding cancel,dispute,chargeback support, chained payments, user/list APIs, bug fixes
2011-10-01 08:01:40 -04:00
12e4362985
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-09-30 20:16:14 +00:00
e41544722f
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-09-30 09:19:12 -07:00
76e3b193d7
fixed failing tests related to interplay between django_extensions and south
2011-09-29 21:57:12 -04:00
ea5dc77256
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-09-29 18:12:20 -07:00
ce080f893e
Merge branch 'master' of github.com:Gluejar/regluit
2011-09-30 01:01:33 +00:00
dea578e019
bugfix for https://www.pivotaltracker.com/story/show/19054387
2011-09-30 01:01:28 +00:00
9c1c60e989
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-09-29 17:03:37 -07:00
1fe7bf3dc9
Merge branch 'master' of https://github.com/Gluejar/regluit
2011-09-29 19:32:23 -04:00
459ffbc549
Revert "quote style"
...
This reverts commit 88abca0b33
2011-09-29 19:32:14 -04:00
88abca0b33
quote style
2011-09-29 19:28:16 -04:00
146bb5639f
resolving errors raised by django registration tests
2011-09-29 19:27:31 -04:00
51f87eb824
Merge branch 'master' of github.com:Gluejar/regluit into tastypie2
2011-09-29 12:23:44 -07:00
53ceeb800c
adjusted test to expect the title and isbns in the new location
2011-09-29 19:07:16 +00:00
5c40c5c2a8
attempt to merge master into tastypie2 -- tests failed
2011-09-29 11:40:45 -07:00
d653277da6
no longer needed since this is inline in supporter.html and search.html
2011-09-29 16:44:38 +00:00
3f1eae3105
remove from wishlist functionality
2011-09-29 16:42:19 +00:00
9a44cfc436
added remove from wishlist
2011-09-29 11:44:03 +00:00
b267e7f822
Merge branch 'master' of github.com:Gluejar/regluit
2011-09-29 03:50:27 -04:00
42cf499a6c
Adding Pre-approved payments
2011-09-29 03:50:07 -04:00
dde1253dea
removed print statements
2011-09-29 02:30:13 -04:00
5f43f87169
make on wishlist message the same
2011-09-29 02:28:10 -04:00
409df080ce
got search passably working and a somewhat functional ajax add to list
2011-09-29 02:23:50 -04:00
41746e6063
added login form on the activation complete page
...
moved login form code to a separate template (DRY), which required
changing the view for activation_complete
2011-09-28 23:26:08 -04:00
83f553dc36
removed tabs
2011-09-28 22:46:37 -04:00
32ec8bd119
removed tabs
2011-09-28 22:02:33 -04:00
23c4c48946
simplified privacy view to use direct_to_template generic view; now use render() from django 1.3 which is easier
2011-09-28 21:54:50 -04:00
65457dd921
merged
2011-09-29 01:42:08 +00:00
8a9f785c4e
started adding back some search functionality
2011-09-29 01:36:47 +00:00
46271f96c1
Edited README.md via GitHub
2011-09-28 16:51:53 -03:00
45aef0e947
privacy policy updated with paypal info
2011-09-28 13:28:12 -04:00
7e9517ead2
Adding missing README
2011-09-27 08:56:50 -04:00
ffa3feb92b
Merge branch 'master' of github.com:Gluejar/regluit
2011-09-27 08:48:18 -04:00
Ed Summers
eric
Raymond Yee
Raymond Yee
Andromeda Yelton
thatandromeda
Jason