Brenda Wallace
b603bae1a7
Rubocop compliance for the notification model
2017-01-14 21:09:47 +13:00
Brenda Wallace
05db5f3109
Rubocop compliance for the order_item model
2017-01-14 21:08:47 +13:00
Brenda Wallace
ad72ab0ba8
Rubocop compliance for the role model
2017-01-14 21:04:19 +13:00
Brenda Wallace
3beb3974fc
Rubocop compliance for the product model
2017-01-14 21:03:01 +13:00
Brenda Wallace
fa15fd2912
Rubocop compliance for the photo model
2017-01-14 21:01:46 +13:00
Brenda Wallace
78ed7869c5
Rubocop compliance for the member model
2017-01-14 20:57:18 +13:00
Brenda Wallace
0fa9f54c9c
Rename member.has_role? to role?
2017-01-14 20:54:43 +13:00
Brenda Wallace
f214f608ff
Rename member.is_paid? to paid?
2017-01-14 20:51:22 +13:00
Brenda Wallace
eb70f6dc57
Rubocop compliance for the seed model
2017-01-14 20:48:19 +13:00
Brenda Wallace
43c4b154f9
Rubocop compliance for the follow model
2017-01-14 20:45:54 +13:00
Brenda Wallace
21a536bf86
Merge remote-tracking branch 'upstream/dev' into bw/rubocop
2017-01-14 20:43:02 +13:00
Brenda Wallace
832a20eac9
Rubocop compliance for order model
2017-01-14 20:42:32 +13:00
Brenda Wallace
f6cc0f3e13
rubocop compliance in post model
2017-01-14 20:34:08 +13:00
Brenda Wallace
5be5585084
Rubocop disable Rails/HasAndBelongsToMany
2017-01-14 20:31:34 +13:00
Brenda Wallace
989f176fb7
Crop model adhering to rubocop
2017-01-14 20:09:54 +13:00
Brenda Wallace
be07b5fd0e
Only check values.zero? if they are present
2017-01-14 20:09:09 +13:00
Shiny
180505a1ca
Merge branch 'dev' into bw/active-plantings
2017-01-14 18:27:18 +13:00
Shiny
22343385f6
Merge branch 'dev' into bw/bar_graphs
2017-01-14 18:26:48 +13:00
Shiny
e11603cb3e
Merge branch 'dev' into bw/description-photo-links
2017-01-14 18:25:52 +13:00
Daniel O'Connor
97c5eb1c42
Merge pull request #1149 from Br3nda/bw/quotes-in-name
...
Removed unwanted quotes in member name in menu
2017-01-14 15:09:04 +10:30
Brenda Wallace
d07509f9e4
Rubocop compliance for comment model
2017-01-14 17:23:39 +13:00
Brenda Wallace
0c1220d11f
Rubocop compliance for harvest model
2017-01-14 17:22:33 +13:00
Brenda Wallace
f889b112fe
Rubocop compliance for garden model
2017-01-14 17:20:21 +13:00
Brenda Wallace
a1cfa826d9
Removed unwanted quotes in member name in menu
...
Fix for Issue #1144
2017-01-14 17:11:58 +13:00
Brenda Wallace
477f9669bd
Added nav for plantings
2017-01-14 16:54:37 +13:00
Brenda Wallace
c1da5e4dc8
Split plantings#index into two methods to simplify
2017-01-14 16:47:29 +13:00
Brenda Wallace
6bdfe5a669
Moved plantings nav bar to own file and simplified
2017-01-14 16:32:03 +13:00
Shiny
8138aa8c09
Merge branch 'dev' into bw/active-plantings
2017-01-14 15:33:28 +13:00
Brenda Wallace
eba397117c
Planting needs to calculate slugs before model is valid
2017-01-14 11:41:48 +13:00
Brenda Wallace
f9396248e6
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-11 12:12:36 +13:00
Miles Gould
d0351bad70
Merge branch 'dev' into bw/bar_graphs
2017-01-09 15:21:38 +00:00
Miles Gould
7ca371ae43
Merge remote-tracking branch 'mine/bw/bar_graphs' into bw/bar_graphs
2017-01-09 15:19:18 +00:00
Miles Gould
7fa0d22583
Graph real crop sunninesses from server
...
Works for me in superficial manual testing, but needs automated tests.
Also currently does two server round trips (one for planting locations
and one for sunninesses); it would be better to combine these into one,
or alternatively to create a "crop stats" API endpoint and calculate
sunniness stats in SQL.
2017-01-09 15:13:55 +00:00
pozorvlak
f31342c6e0
Merge pull request #1147 from Br3nda/alpha-bundle
...
Bundle alphabetical order to comply with stricter rubocop.
Patch is semantically a no-op, and the static check failure is expected.
2017-01-09 12:11:45 +00:00
Brenda Wallace
87a091d694
Bundle alpha-order to comply with stricter rubocop
2017-01-08 20:50:52 +00:00
Brenda Wallace
2e04d56225
Merge remote-tracking branch 'origin/bw/description-photo-links' into bw/description-photo-links
2017-01-08 21:48:58 +13:00
Brenda Wallace
405dfe4bc9
Merge remote-tracking branch 'upstream/dev' into bw/description-photo-links
2017-01-08 21:35:59 +13:00
Shiny
15de4ac08c
Merge branch 'dev' into bw/active-plantings
2017-01-08 11:16:19 +13:00
Shiny
6e535f2403
Merge branch 'dev' into bw/bar_graphs
2017-01-08 11:10:21 +13:00
Shiny
c55208713b
Merge branch 'dev' into bw/description-photo-links
2017-01-08 11:09:19 +13:00
Shiny
48c1b4d0f9
Merge pull request #1142 from Br3nda/bw/harvests-linkto-plantings
...
Link a harvest to a planting, and display
2017-01-08 11:08:42 +13:00
Brenda Wallace
2f38a8585b
Revert "update spec for stringify"
...
This reverts commit 144823bd13
2017-01-07 13:50:11 +13:00
Brenda Wallace
062ff16acf
Put garden.to_s back to garden.name
2017-01-07 13:17:53 +13:00
Brenda Wallace
7f30ce04e0
Garden name (truncated) on front page link
2017-01-07 13:09:35 +13:00
Brenda Wallace
144823bd13
update spec for stringify
2017-01-07 12:52:47 +13:00
Brenda Wallace
90b19d52bb
Don't rely on to_s for slug. Fragile with translations
2017-01-07 12:49:57 +13:00
Brenda Wallace
76be980163
Translate garden.location
2017-01-07 12:48:14 +13:00
Brenda Wallace
88b1f02574
Added require of photo model constants
2017-01-07 12:44:08 +13:00
Brenda Wallace
5b633b484b
Fixes link to seeds, and spec for link to seeds
2017-01-07 12:22:28 +13:00
Brenda Wallace
3be379cee9
updated specs to match new links on photo page
2017-01-07 12:05:35 +13:00
