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

4522 Commits

Author SHA1 Message Date
Taylor Griffin
1d071c197a Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 19:53:00 +11:00
Taylor Griffin
50b8acc67c put finished at bottom of list to make it more obvious when marking a planting finished 2014-11-11 19:52:31 +11:00
Skud
2426c51951 Fixed bug in deleting unused photos 
... and wow, my tests were really not testing what I thought they were
testing :-/
 2014-11-11 19:29:32 +11:00
Taylor Griffin
af9aa690ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 18:37:30 +11:00
pozorvlak
24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00:00
Taylor Griffin
0ccd6e843a implement confirm without date functionality on appty on append date js 2014-10-23 22:43:38 +11:00
Taylor Griffin
e9d1d11535 add append date functionality for planting finished on garden show page and planting list page 2014-10-21 19:43:51 +11:00
pozorvlak
4a8297360c Merge pull request #434 from Skud/memberprofile 
Member profile
 2014-10-19 17:32:27 +01:00
Skud
a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile 
Conflicts:
	app/views/scientific_names/index.html.haml
 2014-10-19 16:54:10 +01:00
Skud
58f1bca683 removed spurious console.log calls 2014-10-19 16:51:08 +01:00
Miles Gould
56b7d89d9e Link scinames to crops, don't show numeric crop IDs 2014-10-19 16:36:10 +01:00
Miles Gould
6de2112c4d Display note on successful sciname deletion. 2014-10-19 16:36:10 +01:00
Skud
7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
emmawinston
1daee9612c Changed set to album on photo page 2014-10-19 14:52:10 +01:00
Skud
dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Skud
496c070efd Tweaked layout of crop page sidebar 2014-10-19 14:14:24 +01:00
Skud
f468a8b77b Changed all h1 to content_for :title 2014-10-19 14:04:55 +01:00
Skud
16677a3b86 Removed underline on header area 2014-10-19 14:04:32 +01:00
Skud
41566d39f3 Added map to member profile page 2014-10-19 13:50:43 +01:00
Skud
82a61387a3 Improved layout of member profile page 
In doing this, I added some content areas for all pages on the site:

1) subtitle
2) buttonbar

These are intended to help standardise the layout of all pages.  On the
member page, the subtitle is the location, and the buttonbar has links
like "edit profile", "upgrade account", etc (or if looking at someone
else's page, then "send message" etc).

I also implemented subtitle/buttonbar on the crop detail page (the
subtitle is the default scientific name).

The rest is just refactoring and tests.  I've removed some view tests
and put them in feature tests instead.
 2014-10-19 12:23:19 +01:00
Miles Gould
29d53a8f8b Test for notices in altname CRUD features. 2014-10-19 12:02:31 +01:00
Miles Gould
3a797d4434 Use content_for :title in scientific names index. 2014-10-19 11:42:49 +01:00
Miles Gould
1d3c24ae27 Use content_for :title on altname index page. 2014-10-19 11:28:51 +01:00
Miles Gould
006bc54f3f Oops, add the altname index HAML file. 2014-10-18 18:13:04 +01:00
Miles Gould
110ae99d83 Fix and test altname index page. 2014-10-18 17:55:56 +01:00
Miles Gould
c447c1cb3a Make edit-altname test more featurey. 2014-10-18 17:49:13 +01:00
Miles Gould
96d2fa1cb6 Put alternate names controller in standard order. 2014-10-18 17:41:52 +01:00
Miles Gould
c7c85aaa66 Creation and deletion of alternate names 2014-10-18 17:03:54 +01:00
Miles Gould
b009603581 Fix link to crop on alternate name page 2014-10-18 16:54:02 +01:00
Miles Gould
eacfadae20 Make editing alternate names actually do something. 2014-10-18 16:51:43 +01:00
Miles Gould
37eb2a0e34 Show alternate names on their own page. 2014-10-18 16:49:27 +01:00
Miles Gould
10f6214c6c Views for adding/editing alternate names. 2014-10-18 16:34:38 +01:00
Miles Gould
77d1d067fa Crop wranglers can add alternate names 2014-10-18 15:35:57 +01:00
Miles Gould
cdf6d4b09a Delete alternate name button on crops page. 2014-10-18 15:29:21 +01:00
Miles Gould
7e4b51d1cb Add "Edit" link for alternate names on crops page. 2014-10-18 15:18:23 +01:00
Miles Gould
627587ee1b Show alternate names on crop page 2014-10-18 14:34:53 +01:00
Miles Gould
83fa291060 Fetch alternate names for a crop. 2014-10-18 13:50:28 +01:00
Miles Gould
e85cb4598d Add alternate name model. 2014-10-18 12:38:44 +01:00
Skud
f18feaa131 Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 2014-10-18 11:23:30 +01:00
pozorvlak
41d63f8f92 Merge pull request #417 from tygriffin/I18n 
I18n
 2014-10-18 11:11:25 +01:00
pozorvlak
7c783ecda3 Merge pull request #428 from tygriffin/finish-plantings-javascript 
Finish plantings javascript
 2014-10-18 10:54:50 +01:00
Taylor Griffin
a4e7f93421 Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n 2014-10-16 06:39:10 +11:00
Taylor Griffin
6a7c935d43 try setting locale from query parameter first 2014-10-16 06:37:02 +11:00
Skud
a3e02a3e61 Actually delete Crop.random, don't just comment it out 2014-10-15 16:47:43 +01:00
Skud
e4cf636bef Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	app/models/harvest.rb
	db/schema.rb
	spec/models/harvest_spec.rb
 2014-10-15 14:20:16 +01:00
Skud
75e076cef5 Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes 
Conflicts:
	spec/models/crop_spec.rb
 2014-10-15 14:07:03 +01:00
Skud
1d81064ced removed unused Crop.random method 2014-10-15 14:03:00 +01:00
Skud
25cb3fd469 Fixed scientific name upload bug and wrote tests 
Wrote unit tests and refactored Crop.create_from_csv

The actual bug (now fixed) is that if you didn't specify a SN in the
CSV, it would try and pick it up from the parent crop, but then the
testing for "is this a dup?" was based on what was in the CSV and didn't
take that parent SN into account.  This is now fixed.
 2014-10-15 13:58:21 +01:00
Taylor Griffin
6bcb9dae4a trigger datepicker when planting finished checkbox is ticked 2014-10-15 06:41:28 +11:00
Taylor Griffin
3a46a5bd18 add comments to javascripts 2014-10-13 06:48:46 +11:00