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
5319d23ee3
Using translations on links from photo page
2017-01-07 12:03:31 +13:00
Brenda Wallace
350c1d4c08
Descriptive links from photo page
2017-01-06 22:25:13 +13:00
Miles Gould
885c9433ce
Merge branch 'dev' into bw/bar_graphs
2017-01-05 11:39:10 +00:00
Miles Gould
b0c132c28f
Replace literal RGB with variable in graph.css
2017-01-05 11:38:55 +00:00
Miles Gould
8083ae9052
Remove duplicate getBarValues() methods
...
I've replaced one with a getMaxValue() function, which is what we
actually want, and deleted the other.
2017-01-05 11:18:51 +00:00
Shiny
5ca8829727
Merge branch 'dev' into bw/active-plantings
2017-01-05 16:35:39 +13:00
Shiny
d40eccdb63
Merge branch 'dev' into bw/harvests-linkto-plantings
2017-01-05 16:31:22 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Brenda Wallace
b27b361e2f
Show active plantings by default
2017-01-04 16:25:19 +13:00
Shiny
a95fca3682
Merge branch 'dev' into bw/bar_graphs
2017-01-03 22:42:58 +13:00
Shiny
8b3b28b9d6
Merge branch 'dev' into bw/garden-specs
2017-01-03 20:50:20 +13:00
Brenda Wallace
881acdccc9
Shortening long garden names on a user's page
2017-01-02 20:54:22 +13:00
Brenda Wallace
3b1753d3d5
Garden's name in link
2017-01-02 20:36:25 +13:00
Brenda Wallace
ab75f830fb
Controller garden specs for member doing what they shouldn't
2016-12-25 10:38:07 +13:00
Shiny
0c8345d1e2
Merge branch 'dev' into bw/bar_graphs
2016-12-22 10:22:29 +13:00
Shiny
ee7fbb9ab9
Merge branch 'dev' into bw/guard-clauses
2016-12-21 20:53:47 +13:00
Miles Gould
4b1cdc5650
Test Model.newsletter_(un)subscribe
...
I'm not very happy with this change as-is. The tests are very shallow
(they wouldn't have caught the bug @tconquest and I found in this code,
for instance), and use the deprecated `receive_message_chain` method.
From the RSpec docs:
"Chains can be arbitrarily long, which makes it quite painless to
violate the Law of Demeter in violent ways, so you should consider any
use of receive_message_chain a code smell. Even though not all code
smells indicate real problems (think fluent interfaces),
receive_message_chain still results in brittle examples. For example, if
you write allow(foo).to receive_message_chain(:bar, :baz => 37) in a
spec and then the implementation calls foo.baz.bar, the stub will not
work."
Further work needed.
2016-12-19 22:15:53 +00:00
Brenda Wallace
ca7868b79a
Use guard clauses
2016-12-14 21:28:35 +00:00
Daniel O'Connor
88ba4f9198
Rubocop
2016-12-09 12:19:38 +10:30
Daniel O'Connor
2594e5d334
Rubocop
2016-12-09 12:06:14 +10:30
Daniel O'Connor
8edbef3965
Rubocop
2016-12-09 11:56:53 +10:30
Daniel O'Connor
2e23675425
app/controllers/likes_controller.rb:2:3: C: Rails/ActionFilter: Prefer before_action over before_filter.
2016-12-09 11:52:46 +10:30
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Shiny
391d5bed5f
Merge branch 'dev' into bw/bar_graphs
2016-12-09 07:29:55 +13:00
Brenda Wallace
4f465d808c
We don't need to load the resource again
2016-12-07 23:54:03 +00:00
Shiny
8161e90fbd
Merge branch 'dev' into bw/bar_graphs
2016-12-08 12:35:59 +13:00
Brenda Wallace
e695d5646a
FIX Gardens query was running twice in contoller
2016-12-07 22:27:17 +00:00
Daniel O'Connor
a074e72b9b
Merge branch 'dev' into bw/bar_graphs
2016-12-07 13:36:21 +10:30
Brenda Wallace
d4a496eb1c
Removed duplicate variable assignment
2016-12-07 12:26:12 +13:00
Brenda Wallace
a23e241480
Eslint clean ups
2016-12-07 12:22:33 +13:00
Brenda Wallace
0f15095129
Fix up css style
2016-12-07 11:30:17 +13:00
Brenda Wallace
6e0e7e4de1
Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs
...
Conflicts:
CONTRIBUTORS.md
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/crops.js.erb
app/views/crops/show.html.haml
2016-12-07 11:17:30 +13:00
Shiny
00e240c038
Merge branch 'dev' into bw/ParenthesesAsGroupedExpression
2016-12-07 10:06:50 +13:00
Brenda Wallace
05e7a27782
Call to verify options stays as a hash
2016-12-07 10:04:17 +13:00
Mackenzie
c760112e1b
Merge pull request #1118 from Br3nda/bw/assignment-in-condition
...
Don't use assignments in conditions
2016-12-06 12:40:00 -05:00
Brenda Wallace
a7bafafa06
Yet another wikipedia url char added to regex
2016-12-06 21:58:17 +13:00
Brenda Wallace
464c570d99
Fixed parentheses that are interp-ed as grouped expression
2016-12-06 21:23:55 +13:00
Brenda Wallace
abc5ac5f29
Don't use assignments in conditions
2016-12-06 21:18:13 +13:00
Brenda Wallace
8981a222ea
Simplified display_weight
2016-12-06 00:32:20 +00:00
Brenda Wallace
91b0c1898e
Simplifying display_harvest_description
2016-12-05 20:40:34 +00:00
Brenda Wallace
26e5a414cf
Line no longer needs wrapping
2016-12-04 21:23:33 +00:00
Brenda Wallace
92195d51d2
Removed redundant returns
2016-12-04 21:21:35 +00:00
Daniel O'Connor
c43ec3d256
Merge branch 'dev' into bw/useless-assignments
2016-12-04 10:30:41 +10:30
Daniel O'Connor
8bb6df6ca7
Merge branch 'dev' into seed_photos
2016-12-03 16:47:13 +10:30
Daniel O'Connor
afbdd1194f
Merge branch 'dev' into bw/useless-assignments
2016-12-03 16:43:11 +10:30
Mackenzie
04ba871949
Merge pull request #1108 from maco/fix_photo_requires
...
WIP: add require_relative to photo_capable concern for constants
2016-12-02 23:13:56 -05:00
Shiny
7785a9d797
Merge branch 'dev' into seed_photos
2016-12-03 09:31:20 +13:00
