Commit Graph

6061 Commits (e161d28ee468f318187cd9291ae937760e08015a)

Author SHA1 Message Date
thatandromeda 5488052b54 Edited README.md via GitHub 2011-10-06 12:08:42 -03:00
Ed Summers 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
Ed Summers 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
Ed Summers 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
Ed Summers d7630605e5 django-profiles is actually needed, currently 2011-10-05 22:30:04 -04:00
Raymond Yee 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
Raymond Yee 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
Raymond Yee 88f9fc6a1d This commit is not complete but I want to do so as a stepping stone. 2011-10-04 15:12:59 -07:00
Ed Summers 6a8c68f1c8 missing selenium requirements 2011-10-04 20:43:36 +00:00
Andromeda Yelton e80e19e47b Merge branch 'master' of github.com:Gluejar/regluit 2011-10-04 16:19:11 -04:00
Andromeda Yelton 5f411e49e0 converting css to a less system to improve maintainability. see http://lesscss.org/ 2011-10-04 16:18:59 -04:00
Jason 59ba9db4f6 Adding basic selenium powered unit tests for payments 2011-10-04 07:55:39 -04:00
Ed Summers 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
Ed Summers bc67cf937b try running regluit tests only w/ django-jenkins 2011-10-03 23:57:57 -04:00
Ed Summers 87d93ad915 going to try out django-jenkins management command 2011-10-03 23:33:12 -04:00
eric a4344e0afa didn't need django-profiles at all, Sorry! 2011-10-03 17:39:54 -04:00
Raymond Yee 021fb51b24 Added payment/local_parameters.* to .gitignore 2011-10-03 13:56:56 -07:00
Raymond Yee 2423051df6 Merge branch 'tastypie2' of github.com:Gluejar/regluit into tastypie2 2011-10-03 13:50:37 -07:00
Raymond Yee cca1f80ed7 Configuring payment to handle local_parameters 2011-10-03 20:45:34 +00:00
Raymond Yee 9c56c66455 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-10-03 20:37:59 +00:00
Andromeda Yelton a8442da4f5 Merge branch 'master' of github.com:Gluejar/regluit 2011-10-03 14:51:54 -04:00
Andromeda Yelton 406a15e8b6 minor fix to footer 2011-10-03 14:51:31 -04:00
eric 52e3f50db0 forgot to put django-profiles in requirements 2011-10-03 14:50:27 -04:00
Andromeda Yelton 558ed5a8e5 merged changes to base.html 2011-10-03 12:52:52 -04:00
Andromeda Yelton d652c2ac06 added rightsholder tools link 2011-10-03 12:51:30 -04:00
thatandromeda 1acc2a6af8 adding rightsholder tools link to footer 2011-10-03 13:50:34 -03:00
eric 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
Raymond Yee f6bd35d623 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-10-03 14:16:53 +00:00
Jason 77eb1db0ce Merge branch 'master' of github.com:Gluejar/regluit 2011-10-01 08:01:48 -04:00
Jason ed1732b4ec Adding cancel,dispute,chargeback support, chained payments, user/list APIs, bug fixes 2011-10-01 08:01:40 -04:00
Raymond Yee 12e4362985 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-30 20:16:14 +00:00
Raymond Yee e41544722f Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-30 09:19:12 -07:00
Ed Summers 76e3b193d7 fixed failing tests related to interplay between django_extensions and south 2011-09-29 21:57:12 -04:00
Raymond Yee ea5dc77256 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-29 18:12:20 -07:00
Ed Summers ce080f893e Merge branch 'master' of github.com:Gluejar/regluit 2011-09-30 01:01:33 +00:00
Ed Summers dea578e019 bugfix for https://www.pivotaltracker.com/story/show/19054387 2011-09-30 01:01:28 +00:00
Raymond Yee 9c1c60e989 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-29 17:03:37 -07:00
eric 1fe7bf3dc9 Merge branch 'master' of https://github.com/Gluejar/regluit 2011-09-29 19:32:23 -04:00
eric 459ffbc549 Revert "quote style"
This reverts commit 88abca0b33.
2011-09-29 19:32:14 -04:00
eric 88abca0b33 quote style 2011-09-29 19:28:16 -04:00
eric 146bb5639f resolving errors raised by django registration tests 2011-09-29 19:27:31 -04:00
Raymond Yee 51f87eb824 Merge branch 'master' of github.com:Gluejar/regluit into tastypie2 2011-09-29 12:23:44 -07:00
Ed Summers 53ceeb800c adjusted test to expect the title and isbns in the new location 2011-09-29 19:07:16 +00:00
Raymond Yee 5c40c5c2a8 attempt to merge master into tastypie2 -- tests failed 2011-09-29 11:40:45 -07:00
Ed Summers d653277da6 no longer needed since this is inline in supporter.html and search.html 2011-09-29 16:44:38 +00:00
Ed Summers 3f1eae3105 remove from wishlist functionality 2011-09-29 16:42:19 +00:00
Ed Summers 9a44cfc436 added remove from wishlist 2011-09-29 11:44:03 +00:00
Jason b267e7f822 Merge branch 'master' of github.com:Gluejar/regluit 2011-09-29 03:50:27 -04:00
Jason 42cf499a6c Adding Pre-approved payments 2011-09-29 03:50:07 -04:00
Ed Summers dde1253dea removed print statements 2011-09-29 02:30:13 -04:00