Brenda Wallace
1e0ccd72a2
Added missing semicolons to js files
2017-03-04 17:06:29 +13:00
Brenda Wallace
dd710860de
Run the linters etc from overcommit
2017-03-01 20:48:15 +00:00
Brenda Wallace
a507eb47bf
Removed trailing white space
2017-02-12 17:26:34 +13:00
Daniel O'Connor
15106a051c
Merge branch 'dev' into likeable
2017-01-27 12:05:13 +10:30
Shiny
b80e7f677c
Merge branch 'dev' into likeable
2017-01-24 19:44:42 +13:00
Shiny
76af02f2a5
Merge branch 'dev' into bw/bar_graphs
2017-01-23 20:18:19 +13:00
Brenda Wallace
08d407f041
Fix display of gardens on smaller screens
2017-01-22 20:33:37 +13: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
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
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +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
Daniel O'Connor
783406d730
Add a login splash
2016-11-25 09:44:12 +10:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Cesy
40cf5ba63a
Merge pull request #1030 from CloCkWeRX/fix_998
...
Ensure we look at the current control, not the entire collection when marking planting finished
2016-08-16 08:50:30 +01:00
Cesy
9a40449f08
Merge pull request #1024 from CloCkWeRX/mapboxv4
...
#981 Add mapbox v4
2016-08-16 08:49:44 +01:00
Daniel O'Connor
90a88cf69d
Fixes #998 Ensure we look at the current control, not the entire collection
2016-08-16 10:33:23 +09:30
Daniel O'Connor
e38321aa33
#981 Add mapbox access token (on my free 50k views account) and update to v4
2016-07-28 14:27:49 +09:30
Kristine Nicole Polvoriza
d1438d1b2e
Fixed the nav header in mobile view
2016-07-28 12:31:50 +08:00
Daniel O'Connor
04074ff372
Reimplement ajax like/unlike behaviour
2016-07-09 21:53:33 +09:30
Daniel O'Connor
7550bc860f
#816 Add better opengraph behaviour, fix facebook share thumbnail size
2016-06-03 01:01:03 +09:30
pozorvlak
b6169778fd
Merge pull request #932 from CloCkWeRX/location-not-set
...
Add a location not set layout (lets try this again!)
2016-05-31 11:41:11 +01:00
Daniel O'Connor
8f05e254a2
Remove crowdfunding code
2016-05-30 10:06:51 +09:30
Daniel O'Connor
fa77f11177
Based on MIT licenced icon-globe ( http://fontawesome.io/3.2.1/icon/globe/ )
2016-05-28 09:26:00 +09:30
pozorvlak
58d91ec0b0
Merge pull request #923 from maco/bug-#854
...
Display one line of description in harvest card, then go to ellipsis …
2016-05-27 12:17:10 +01:00
Mackenzie Morgan
03c74dae03
Capture originalText from the button that's been clicked, not from the array of all possible date-picker buttons.
...
Fixes #906
2016-05-26 23:55:49 -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
Mackenzie Morgan
58617b5685
set background color on autocomplete dropdown. Fixes #914
2016-05-25 16:07:49 -04:00
pozorvlak
63f8a2c5c0
Merge pull request #897 from maco/menu_fix
...
darken navbar item text when it opens (and the background turns light)
2016-05-23 12:25:22 +01:00
pozorvlak
a8e63ab397
Merge pull request #898 from CloCkWeRX/adjust_plantings_card_ui
...
Improve the styling of a planting to be more like the other card-layouts
2016-05-23 12:17:47 +01:00
Daniel O'Connor
92cce5910e
Improve planting card UI on mobile
2016-05-23 16:35:58 +09:30
Daniel O'Connor
ab897f05f9
Use panel-body and panel-heading more effectively
2016-05-23 16:21:13 +09:30
Daniel O'Connor
5104225d11
#856 Clip long text in definition lists within panels
2016-05-23 16:13:53 +09:30
Daniel O'Connor
d9ed21ba53
Styling the show view of a planting more like the card view (though 100% card view looks funny with the crop thumbnail floating to the right)
2016-05-23 11:24:32 +09:30
Daniel O'Connor
e7926b6f22
Improve the styling of a planting to be more like the other card-layouts
2016-05-23 10:48:49 +09:30
Mackenzie Morgan
fe7d8f73f3
darken navbar item text when it opens (and the background turns light)
...
Fixes #896
2016-05-22 20:49:51 -04:00
pozorvlak
8bea05a77b
Merge pull request #803 from cesy/issue734bootstrapaccessibility
...
Bootstrap accessibility
2016-05-22 17:19:55 +01:00
Mackenzie Morgan
8659ebca2d
switch from less to sass
...
* dependency hell + bit rot on upstream libraries prevents installation on OS X
2016-05-19 15:52:54 -04:00
Cesy
e8266480e5
Adding bootstrap-accessibility plugin
2015-08-12 14:17:41 +00:00
Cesy
5b19d236d0
Merge pull request #783 from pozorvlak/remove_last_count_calls
...
Replace the last few .count and .length calls with .size where possible
2015-08-05 18:57:04 +01:00
Miles Gould
d9dd797c33
Merge branch 'pr/782' into dev
2015-07-24 11:09:35 +01:00
Miles Gould
8873986562
Merge branch 'pr/779' into dev
2015-07-24 11:05:21 +01:00
Miles Gould
40b5a47aae
Remove trailing whitespace
2015-07-23 23:22:45 +01:00
Mackenzie Morgan
b0d4f9c731
switch homepage and members/ page member thumbnails to be a flexbox layout so it's more responsive. Fixes #780
2015-07-23 13:56:07 -04:00
AELOGICA
7e03ef1687
Fixed display of plantings on gardens thumbnail.
2015-07-23 15:44:26 +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
AELOGICA
f5336bd8f8
Created card based template for harvests.
2015-07-23 15:44:25 +08:00
Brenda Wallace