Brenda Wallace
80371c835c
Moved long line (ebay url) to helper
2017-02-06 10:40:58 +13:00
Brenda Wallace
19aa3a1ca4
PlantingsHelper simplification
2017-02-03 20:42:15 +13:00
Brenda Wallace
40a981c94d
Removed unnecesary braces on hash args
2017-01-22 15:10:11 +13:00
Brenda Wallace
3b1753d3d5
Garden's name in link
2017-01-02 20:36:25 +13:00
Brenda Wallace
ca7868b79a
Use guard clauses
2016-12-14 21:28:35 +00: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
Miles Gould
9400225f65
Return a string from display_days_before_maturity
...
Sometimes we were returning a string, and sometimes we were returning an
integer. We're only ever displaying the result, and this seems a little
more consistent.
2016-11-30 10:16:02 +00:00
Miles Gould
b0b864a5d4
Fix off-by-one bug in display_days_before_maturity
...
We were counting from DateTime.now rather than Date.current, causing us to
under-count by a day.
2016-11-30 10:16:02 +00:00
pozorvlak
d3b927b44b
Merge pull request #1096 from Growstuff/master
...
Master to dev for 1092
2016-11-30 09:44:12 +00:00
Brenda Wallace
900e7361c6
Check we have a planted_at ts before doing maths with it
2016-11-30 17:39:26 +13:00
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
Brenda Wallace
2e46cccd21
Hash alignment
2016-11-26 11:52:10 +13:00
Brenda Wallace
ebacd83dde
Case statement indentation clean up
2016-11-26 11:42:34 +13:00
Brenda Wallace
c878baa886
Indented parameters cleanup
2016-11-26 11:41:07 +13:00
Brenda Wallace
917e33bccf
Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed
2016-11-20 19:24:53 +13:00
Brenda Wallace
2872a1c29d
Wrapped all long lines.
...
reduced rubocop's line length limit to 120
2016-11-17 22:02:18 +13:00
Brenda Wallace
5e0cff5b8e
Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces
...
Conflicts:
app/helpers/seeds_helper.rb
spec/support/controller_macros.rb
2016-11-17 19:04:44 +13:00
Brenda Wallace
5ec2877577
Covert all tabs to spaces
2016-11-16 13:18:26 +13:00
Brenda Wallace
6bd9bd98d9
Removed extra blank lines, & added a end of file
2016-11-16 12:52:48 +13:00
Brenda Wallace
510c31f669
Removed 3 blank lines that codeclimate didn't like
2016-11-14 15:10:13 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Daniel O'Connor
7f6a1a424d
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-08-15 23:13:55 +09:30
Daniel O'Connor
dba6b2a291
Mitigate security concerns with target=_blank via https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/
2016-08-15 21:31:45 +09:30
Daniel O'Connor
7947fd6e91
Clean up link_to as per #1013
2016-07-08 17:08:17 +09:30
Daniel O'Connor
43e7d6f7c2
Merge remote-tracking branch 'upstream/dev' into add_facebook_signup
2016-07-05 03:09:36 +09:30
Mackenzie Morgan
b28d146de7
use default of info
...
add tests
2016-06-19 22:42:20 -04:00
Mackenzie Morgan
55c8be8dc5
merge
2016-06-19 22:27:27 -04:00
Lucas Nogueira
63b8788c80
Change hash syntax
2016-06-09 11:57:56 -03:00
Lucas Nogueira
b911ebfd07
Replace pluralize calls
2016-06-08 22:03:40 -03:00
Lucas Nogueira
905710b6e9
Helper for plural localization
2016-06-08 21:55:33 -03:00
Daniel O'Connor
a8d22709e6
Add explict test coverage of the helper with nil seeds (page level tests already cover this rendering on crop detail in general)
2016-06-04 20:51:20 +09:30
Daniel O'Connor
321f3517a7
#920 Deal with .nil quantity of a seed in rendering helper
2016-06-01 23:26:43 +09:30
Mackenzie Morgan
32b98a7e40
Add support for Bootstrap alert types
...
* All alerts are currently shoved into either red (error) or green (success)
* Add support for yellow (warning) and blue (info) alert types
Solution from this Stack Overflow: http://stackoverflow.com/questions/31094771/rails-bootstrap-haml-how-to-convert-this-code-to-display-flash-messages-to
2016-05-30 21:48:11 -04:00
Mackenzie Morgan
2089866756
Display one line of description in harvest card, then go to ellipsis and put read more on next line
...
Fixes #854
2016-05-26 23:08:23 -04:00
Daniel O'Connor
083035c924
Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup
2016-05-23 16:58:22 +09:30
Daniel O'Connor
4b4e0cf69a
$ rubocop --only HashSyntax --auto-correct
...
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
hcbviolet
e8d7ed0c2d
Edit display_harvest_description method for no description
2016-04-08 17:34:58 -07:00
Daniel O'Connor
4983a6dfb3
#556 Improve user avatar sizing
2015-08-27 11:42:36 +09:30
Daniel O'Connor
859cf7f215
#509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic
2015-08-25 00:32:17 +09:30
Miles Gould
d9dd797c33
Merge branch 'pr/782' into dev
2015-07-24 11:09:35 +01:00
Miles Gould
f970fc4db2
Fix another whitespace problem.
2015-07-24 11:09:22 +01:00
Miles Gould
8873986562
Merge branch 'pr/779' into dev
2015-07-24 11:05:21 +01:00
Mackenzie Morgan
e3738ca0c6
whitespace tab/space correction
2015-07-23 13:56:23 -04:00
AELOGICA
7e03ef1687
Fixed display of plantings on gardens thumbnail.
2015-07-23 15:44:26 +08:00
AELOGICA
c12791e428
Created card-based thumbnails for Seeds and Gardens page.
2015-07-23 15:44:25 +08:00
AELOGICA
bbe7d967b4
Changed px to em and used truncate instead of srolling for long harvest descriptions.
2015-07-23 15:44:25 +08:00
