Miles Gould
0040ee8727
Rake task to give everyone free accounts; fix descriptions.
2013-06-26 10:55:19 +01:00
Miles Gould
5bcd4c2edd
Use ActiveRecord methods for not_staff join code.
...
- set member.account_type directly in tests, because changes to
member.account.account_type weren't being persisted.
2013-06-26 10:55:19 +01:00
Miles Gould
f6073ab01c
Remove "if account_type" checks in Account.
...
- remove account_type_string method
- simplify paid_until_string.
2013-06-26 10:55:19 +01:00
Miles Gould
0a8aaf0ee6
Create free account type if it doesn't exist; fix tests.
2013-06-26 10:55:19 +01:00
Lucy
0412fe0bc5
Updated .gitignore to include coverage files anywhere in the directory tree.
2013-06-26 10:55:18 +01:00
Lucy
6ccf8f397f
Give new users a free account.
2013-06-26 10:55:18 +01:00
Miles Gould
c6eb835771
Tests and sketch implementation of not_staff scope.
...
It doesn't work and we don't yet know why :-(
2013-06-26 10:55:18 +01:00
Lucy
3ce246ef5a
Allowing Miles to drive.
2013-06-26 10:55:18 +01:00
Miles Gould
1ad3828a3b
Don't load the "development" gem group on Travis CI.
2013-06-26 10:50:28 +01:00
Miles Gould
0368f52ca8
Only use the 'debugger' gem in development.
...
Installation was failing on Travis CI causing spurious failed builds, so
we don't want it under the test environment. I reckon we don't want it
in the production environment anyway.
2013-06-26 10:50:28 +01:00
pozorvlak
5748c0989e
Merge pull request #233 from Skud/planted-at-bug
...
Planted at bug
2013-06-23 07:43:52 -07:00
Skud
dfc561ecc0
Merge pull request #237 from pozorvlak/coveralls
...
Coveralls
2013-06-22 00:31:00 -07:00
pozorvlak
7257a786fe
Merge pull request #234 from Skud/bootstrap-middleclick
...
Use github version of twitter-bootstrap-rails to fix firefox new tab pro...
2013-06-16 06:24:40 -07:00
Miles Gould
1f5c81fdca
Filter spec files out of coverage reports.
2013-06-13 20:38:26 +01:00
Miles Gould
033703e9b9
Set up Rails coverage groups.
2013-06-13 20:29:02 +01:00
Skud
4b9bd4b5de
added specific commit to twitter-bootstrap-rails in Gemfile
2013-06-13 07:58:54 +10:00
Skud
40d6a4a128
Merge pull request #235 from pozorvlak/coveralls
...
Set up Coveralls integration for test coverage.
2013-06-12 14:45:34 -07:00
Miles Gould
66a6f53ae7
Set up Coveralls integration for test coverage.
2013-06-12 13:03:05 +01:00
Skud
a70a19871a
Use github version of twitter-bootstrap-rails to fix firefox new tab problem
2013-06-12 09:07:41 +10:00
Skud
2ecbd8315d
bugfix: don't say 'not yet set' in planting form
...
PT: https://www.pivotaltracker.com/story/show/51457917
Maco found this. The problem was that if you had a blank planting date,
and then re-edited the planting, it would say "not yet set" in the form
field, then die when it later tried to convert that to a date.
I replaced Miles's planted_at_string stuff in the model with a simpler
parse_date method in the application helper.
2013-06-11 16:08:02 +10:00
Skud
c8cd46ba98
Merge pull request #232 from Growstuff/dev
...
Caching for homepage
2013-06-07 02:16:43 -07:00
Skud
cd70edd3c5
Merge pull request #231 from Skud/cache-partials
...
Cache partials
2013-06-07 02:06:43 -07:00
Skud
e3ef27e401
turn caching off again in dev
2013-06-07 18:20:45 +10:00
Skud
dc0b6fa9cb
added memcachier gem
2013-06-07 18:11:50 +10:00
Skud
903f0c808c
cache recent_posts and recent_plantings partials
2013-06-07 17:52:31 +10:00
Skud
9f8919e180
Merge pull request #230 from Skud/recommended-price
...
Production push: longer product description, recommended price
2013-06-06 18:45:07 -07:00
Skud
20d58f1365
Merge pull request #229 from Skud/recommended-price
...
display recommended price on product admin pages
2013-06-06 18:37:29 -07:00
Skud
df60a7c4dc
display recommended price on product admin pages
2013-06-07 11:36:03 +10:00
Skud
11b17b7a17
Merge pull request #228 from Skud/recommended-price
...
added optional recommended price to products
2013-06-06 18:06:40 -07:00
Skud
cb3e0fb526
added optional recommended price to products
2013-06-07 09:53:40 +10:00
Skud
747c8e4e33
Merge pull request #227 from Skud/product-desc
...
converted product description to text (not string)
2013-06-06 16:27:24 -07:00
Skud
8046790bc7
converted product description to text (not string)
2013-06-07 09:16:18 +10:00
Skud
8383e9b691
Merge pull request #226 from Growstuff/dev
...
Production push: crop photos, payments, homepage improvements, rss bugfix
2013-06-06 05:43:57 -07:00
pozorvlak
d1ddf9a8d2
Merge pull request #225 from Skud/paypal-purchase
...
We have to actually complete the purchase!
2013-06-06 05:35:13 -07:00
Skud
786bf1547f
We have to actually complete the purchase!
2013-06-06 22:21:07 +10:00
pozorvlak
8da2000f36
Merge pull request #224 from Skud/launch-tweaks
...
Launch tweaks
2013-06-06 04:33:52 -07:00
Skud
4c2971f670
oops, fixed broken test for checkout button
2013-06-06 21:19:24 +10:00
Skud
b85b533afa
updated wording in support/faq
2013-06-06 21:16:46 +10:00
Skud
6cf64694f4
added account status info in various places
2013-06-06 21:07:54 +10:00
Skud
4332628d6f
improved wording on shop homepage
2013-06-06 20:36:35 +10:00
Skud
170315e4bd
added test for default_photo ordering
2013-06-06 20:28:33 +10:00
Skud
2901e0cb11
tweaked wording on photos/index
2013-06-06 20:17:32 +10:00
Skud
dd51cf669b
Merge pull request #221 from pozorvlak/logged-out
...
Show community features on logged-in homepage.
2013-06-04 05:56:03 -07:00
Miles Gould
cebd6e05ac
Merge branch 'dev' into logged-out
...
Conflicts:
spec/views/home/index_spec.rb
2013-06-04 13:54:49 +01:00
pozorvlak
8fadbf11d1
Merge pull request #223 from pozorvlak/fixup_deploy
...
Fix to deploy-tasks bash script.
2013-06-04 05:39:32 -07:00
Miles Gould
5e271e6279
Fix to deploy-tasks bash script.
2013-06-04 13:37:54 +01:00
pozorvlak
a19596cf2f
Merge pull request #222 from pozorvlak/fixup_migration
...
Fix string/integer conversions in migrations.
2013-06-04 05:27:04 -07:00
Miles Gould
9d624902e8
Fix string/integer conversions in migrations.
2013-06-04 13:25:23 +01:00
pozorvlak
7d2bf2e454
Merge pull request #220 from Skud/payments-new
...
Payments
2013-06-04 05:02:39 -07:00
Miles Gould
a0c91ee884
Changes to homepage
...
- only show interesting members if logged out
- don't show your recent posts/plantings
- change limits on posts/plantings for better visual balance.
2013-06-04 12:59:37 +01:00
