mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-02 05:09:27 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 62 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lucy
e674a6572e Added conversion links for recommended prices. 
The paragraphs were getting a bit verbose so we shortened the link
text as well. Added an additional test to make sure the link is
working here too.
 2013-07-03 13:22:07 +01:00
Lucy
5c92bb04d3 Updated the foreign exchange link to use configured currency. 2013-07-03 13:04:43 +01:00
Lucy
67c457dfcd Modified the foreign exchange link to convert the right price. 
Changed the forex site to Wolfram Alpha from XE, which allow us
to convert the right number of AUD with one click. Upated tests to
reflect this change.
 2013-07-03 12:59:49 +01:00
Lucy
80ed2179e2 Proof of concept for adding a foreign exchange link to the shop. 
Added a function that returns a link for a foreign exchange site
and showed it on the Shop page. Also included a test to make sure
it works.
 2013-07-03 12:50:56 +01:00
Miles Gould
6469ed9418 Delete unused helpers and tests for same. 2013-07-03 11:34:08 +01:00
Lucy
e7b0165628 Updated script/deploy-tasks.sh to include nil_account_type task. 
We added a rake task to ensure all account have a Free account
type. This ensures the new nil_account_type rake task will be run
at deploy time.
 2013-07-03 11:22:47 +01:00
Lucy
9ce85e2f73 Updated tests to test for the default account type. 
Tests used to check that the default account type was always "Free".
Now that we have a default account type as a config variable, the
tests test to see the default account type matches the value of that
variable.
 2013-07-03 11:17:18 +01:00
Lucy
278db17108 Removed redundant logic for free account type in apps/views 
A couple of pages were testing for an account type and displaying
"Free" if account type was nil. Now that we've ensured every account
has an account type, this is no longer necessary.
 2013-07-03 11:15:31 +01:00
Lucy
650f24099d Added default account type of "Free" in config/applications.rb 2013-07-03 11:04:42 +01:00
Lucy
1b0a708b04 Documented reason for using south_pole_member in tests. 2013-07-03 10:51:55 +01:00
Joseph Caudle
ce0c7b1e2c Merge pull request #242 from Skud/cancan-messages 
prettified some of the error messages
 2013-07-02 21:12:21 -07:00
Skud
9f65aad5c6 prettified some of the error messages 2013-07-03 13:06:57 +10:00
Skud
5c7a0a1ff7 Merge pull request #240 from pozorvlak/gem_decruft 
Remove some cruft from our Gemfile
 2013-07-02 16:54:00 -07:00
Skud
69f8eec209 Merge pull request #241 from pozorvlak/fix-travis 
Fix travis
 2013-07-02 16:51:51 -07:00
Miles Gould
5b061877ff Upgrade debugger to 1.6.0 
This should now include the headers for Ruby 1.9.3-p429 whose absence
was causing our builds to fail. Better late than never...
 2013-06-26 12:09:39 +01:00
Miles Gould
3d42844d62 Document gems in test group 2013-06-26 12:00:56 +01:00
Miles Gould
2f93982ae6 Document the :assets group in Gemfile. 
I think we can probably delete some of it (in particular compass-rails),
but don't know how to test it. Halp plz?
 2013-06-26 11:50:09 +01:00
Miles Gould
4cdadfb385 Document what CanCan does in Gemfile. 2013-06-26 11:50:09 +01:00
Miles Gould
24af32970c Remove watchr continuous-testing gem. 
Nobody was using it :-(
 2013-06-26 11:50:09 +01:00
Miles Gould
2d8128e54d Slightly simplify tests for not_staff scope. 
There's no reason to set a location on the test member.
 2013-06-26 10:55:19 +01:00
Miles Gould
d26dd4499c Deleted unused admin_helper_spec.rb 2013-06-26 10:55:19 +01:00
Miles Gould
8dceb985a1 Fix pending tests in views/shop/index. 
We needed to stub out current_member, not current_user.
 2013-06-26 10:55:19 +01:00
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
756ebd3025 Use unicorn instead of Thin webserver 
This is in the name of eliminating unnecessary differences between
development and production. You must invoke unicorn with `unicorn`
rather than `rails s`. By default it listens on port 8080.
 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
Miles Gould
9ee0e03277 Remove explicit load of diff-lcs. 
It's a dependency of rspec-expectations.
 2013-06-26 10:50:28 +01:00
Miles Gould
efb5515b0f Remove unused gems; don't load assets group in CI. 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