126 Commits

Author SHA1 Message Date
Jarred Sumner
740075f4d3 Update README.md 2014-05-16 16:10:13 -04:00
Jarred Sumner
2ffaad915d Merge pull request #76 from justinsb/heroku
Add rails_12factor gem, to support heroku deploys
2014-03-11 21:10:53 -04:00
Justin Santa Barbara
d9bfb69008 Add rails_12factor gem, to support heroku deploys 2013-12-13 10:58:11 -05:00
Jarred Sumner
7a0d965541 Merge pull request #63 from paterson/master
Updated for Ruby 2 and Rails 4
2013-11-17 14:40:48 -08:00
Niall Paterson
8987286b84 Merge branch 'rails4' 2013-11-17 21:30:38 +00:00
Niall Paterson
6c1c3bfd2e updated for rails 4 and ruby 2 2013-11-17 21:29:06 +00:00
ccamrobertson
4dacca5485 Merge pull request #59 from lemonkoala/master
Grammar
2013-11-15 20:01:29 -08:00
Lem Lordje Ko
d143af9005 change "let's us" to "lets us" 2013-06-30 01:17:18 +08:00
Jarred Sumner
0d52a56b97 Merge pull request #50 from gmaliar/master
Removed code from User model that doesn't belong there
2013-04-26 14:11:50 -07:00
Guy Maliar
ef05e3c6db Update user.rb
Doesn't belong to User model
2013-04-21 01:14:41 +03:00
Jarred Sumner
b7475b746c Merge pull request #48 from gmaliar/master
Fixed before_validate into before_validation
2013-04-12 16:03:25 -07:00
Guy Maliar
e23d0193cf Fixed an error in the before_validation
before_validate should be before_validation
2013-04-12 11:31:20 +03:00
Jarred Sumner
8e97638f63 Explicitly set primary key, and validate UUID 2013-04-10 12:16:21 -07:00
Jarred Sumner
aea5b165da Update user.rb 2013-04-10 12:15:28 -07:00
Jarred Sumner
cbdbc4959c Generate UUID on create 2013-04-10 12:14:24 -07:00
Jarred Sumner
d91b20950a Merge pull request #45 from alanjcfs/master
Fix for #44
2013-04-01 00:37:39 -07:00
Alan Fung-Schwarz
d3c8cb34c8 Updated amazon_flex_pay, fixing #44 2013-04-01 05:30:36 +00:00
Jarred Sumner
a730c5784f Merge pull request #37 from steakknife/develop
[security] rails 3.2.12 -> 3.2.13
2013-03-27 11:48:03 -07:00
Jarred Sumner
5936a23cb9 Merge pull request #39 from kstrand/edit_setting_yml_documentation
add one line of detailed comment for video file embed
2013-03-27 11:43:55 -07:00
Barry Allard
302cf7eb4d [security] multi_xml, rack mandatory updates 2013-03-19 22:32:24 -07:00
Barry Allard
961fd9c3fc Gemfile.lock updated 2013-03-19 21:52:29 -07:00
Barry Allard
6bf4e706a6 Merge branch 'master' of https://bitbucket.org/topleopard/selfstarter into develop 2013-03-19 21:38:27 -07:00
Barry Allard
ac289d2def updated Gemfile.lock 2013-03-19 21:36:36 -07:00
barry_allard
24585aeea4 Merged in develop (pull request #1)
[security fix] rails 3.2.12
2013-03-19 21:32:49 -07:00
Keith
69768fc108 add one line of detailed comment for video file embed 2013-03-19 21:30:24 -07:00
Barry Allard
7827beb183 [security] optionally specify a new secret token using RAILS_SECRET_TOKEN 2013-03-19 18:56:54 -07:00
Barry Allard
dfc18affad [security - heroku] ruby 1.9.2 -> 1.9.3 2013-03-19 18:51:16 -07:00
Barry Allard
beae31162c [security] require json ~> 1.7.7 2013-03-19 18:50:31 -07:00
Barry Allard
aff6bde08e [security] rails 3.2.12 -> 3.2.13 2013-03-19 18:30:48 -07:00
Jarred Sumner
52097546db Merge pull request #36 from steakknife/develop
[security fix] rails 3.2.12
2013-03-19 17:57:30 -07:00
Barry Allard
1fc66835ac [security fix] rails 3.2.12 2013-03-19 17:41:17 -07:00
Jarred Sumner
f5cee3cfce Merge pull request #32 from brendte/master
AmazonFlexPay usage broke, so I fixed it
2013-03-06 21:18:11 -08:00
Brendten Eickstaedt
294537f084 Changed AmazonFlexPay call to fix method_not_found 2013-03-06 11:20:31 -05:00
Jarred Sumner
da2d021c9e Fixed bug in progress bar when not using PaymentOptions 2013-01-30 10:10:11 -08:00
Jarred Sumner
cc4adb2f17 Merge pull request #27 from jboehmig/patch-1
fixed formatting
2013-01-24 17:26:37 -08:00
Jason Boehmig
a5d340d0f7 fixed formatting
"getting started" wasn't showing up as a section header
2013-01-23 14:45:57 -08:00
Jarred Sumner
60b8b148e3 Merge pull request #26 from cushman/patch-1
Fix typo in _key_points.html.erb
2013-01-17 15:13:39 -08:00
cushman
3498db7060 Fix typo in _key_points.html.erb 2013-01-17 15:10:25 -08:00
Jarred Sumner
c317edd61f use_payment_options defaults to false 2013-01-16 16:49:11 -08:00
Jarred Sumner
8265df0a88 Merge pull request #25 from jes5e/master
Added payment options component, a few small features, and several fixes
2013-01-16 16:47:49 -08:00
Jesse Grant
d7ca496a95 documentation of the payment optoins component 2013-01-14 17:20:22 -05:00
Jesse Grant
46cc33fd5b updated to latest rails 3.2.11 because of recently exposed security vulnerability in earlier versions 2013-01-14 16:59:13 -05:00
Jesse Grant
da3478168a Fixed a bug where a string was being compared with a number 2013-01-14 16:58:29 -05:00
Jesse Grant
ba3addecce fixed a bug where backers count could be off in the tweet text on the order confirmation page 2013-01-14 16:57:46 -05:00
Jesse Grant
3fb45440d9 fixed a bug where backers count could be off on order confirmation page 2013-01-14 16:55:52 -05:00
Jesse Grant
47ce7ac843 a comment in the settings file was bad 2013-01-14 16:55:24 -05:00
Jesse Grant
b46f0d64c2 Made a small change to make some wording configuration more flexible 2013-01-14 16:54:43 -05:00
Jesse Grant
c49524edd0 added code so that port will be used if you are not in production mode so that you can test amazon flexible payments end to end in development 2013-01-14 16:53:44 -05:00
Jesse Grant
7fdb605e8e fixed a bug where the wrong price could get sent to amazon payments 2013-01-14 16:52:16 -05:00
Jesse Grant
45fd64e7c5 fixed a query 2013-01-14 16:51:48 -05:00