Amy Hendrix
471ecbc458
Require the new custom bootstrap the main stylesheet
2014-07-13 14:15:27 -04:00
Amy Hendrix
9a09d8a0ae
Switch from twitter-bootstrap-rails gem to less-rails-bootstrap
2014-07-13 14:12:36 -04:00
Taylor Griffin
ded464ad4c
removed call to for debugging
2014-07-13 18:00:46 +10:00
Taylor Griffin
8b45a1759c
got scientific names working on the crop page but view tests are failing
2014-07-13 17:57:55 +10:00
Skud
7d624fd9ca
Attempting to get scientific name editing on one page (doesn't work yet)
2014-07-06 21:21:51 +10:00
Skud
77d2b0e950
make crop search case insensitive
2014-07-06 20:16:59 +10:00
Skud
34c45c8935
Fixed bug with specific place map
...
(it was still referring to div#map not #placesmap)
also changed the headings a bit on that page
2014-07-04 11:17:04 +10:00
Skud
99c473ab40
Changed headings on places maps to match new menu ('Community map')
2014-07-04 11:13:35 +10:00
Skud
828e9d318a
check that map exists on page before drawing it
2014-07-04 11:02:23 +10:00
Skud
890a21ddb2
small refactoring to clean up js
2014-07-04 10:49:52 +10:00
Skud
c8dbdbe298
Rename map on /places to #placesmap
...
The way the javascript is compiled means it's a good idea to make sure
everything is as distinct as possible.
2014-07-04 10:47:50 +10:00
Skud
f28ddaded1
renamed div#map to #cropmap on crop page
...
this prevents confusion when assets are compiled (i.e. it worked in dev
but not on staging; this fixes the problem.)
2014-07-04 10:38:37 +10:00
pozorvlak
ec9bd2bd7b
Merge pull request #361 from Skud/crop-map
...
Crop map
2014-07-03 10:44:01 +01:00
Amelia Greenhall
a5e4b0816c
fix centering on top nav
2014-07-02 07:16:22 +12:00
Amelia Greenhall
adb275737f
update the navbar and footer to more modern design and colors
2014-07-02 07:16:22 +12:00
Amelia Greenhall
c489c6ac70
remove 1px wide black line on borders
2014-07-02 07:16:22 +12:00
Skud
fea7da3546
rearranged crop page headings and added tests
2014-06-30 12:14:06 -07:00
Skud
f8cb7248b7
Reduced cluster radius for maps
...
on both crops and places pages
Did this because the clusters were annoyingly over-general, eg. showing
164 people in the eastern part of North America. Cluster radius of 20px
is about the radius of the cluster icon itself. Seems to work better
eg. for separating Melbourne from Sydney on the world map.
2014-06-30 11:56:46 -07:00
Skud
4972127957
Display crop plantings on a map
2014-06-30 11:51:01 -07:00
Skud
3abaca3136
Tweak what's emitted as JSON
...
(let's just emit plantings for now, as that's all we're using)
2014-06-30 11:48:58 -07:00
Skud
8eb644fc66
Add map, move info to sidebar
2014-06-30 11:48:13 -07:00
Skud
2f8e060b49
added plantings, seeds, and harvests to the crops JSON
2014-06-30 10:56:58 -07:00
pozorvlak
cdb146c7d7
Merge pull request #360 from Skud/crop-images
...
Crop images
2014-06-28 20:04:52 +01:00
Skud
1ac35e7d4e
Darkened text background for readability
2014-06-28 11:29:51 -07:00
Skud
0560172565
Fixed incorrect env variable
2014-06-28 11:28:21 -07:00
Skud
d10c9d96f1
Fixed whitespace issues and tests
2014-06-28 11:27:26 -07:00
Barbara Natali
174b98b118
Improve display of images on crop page
2014-06-18 21:54:30 -07:00
Amelia Greenhall
360ca96526
change to input class, not input-append
2014-06-18 19:55:57 -07:00
Amelia Greenhall
ef39d26fbd
smaller search box in top nav
2014-06-18 19:49:10 -07:00
pozorvlak
6858ec3f17
Merge pull request #354 from Skud/places-name-bug
...
Fixed bug with capitalisation of usernames in map popups
2014-06-15 00:20:30 +01:00
Skud
997186a701
Rearranged menus to save space
2014-06-12 19:27:02 -07:00
Skud
050834734f
Fixed bug with capitalisation of usernames in map popups
2014-06-12 18:49:06 -07:00
Skud
5d587af8b0
replaced cloudmade maps with mapbox
2014-06-02 18:57:03 -05:00
Skud
1d71afdb2f
Added roots/tubers to the CSV output
...
Also rearranged their order on the planting form to put it nearer bulbs
2014-05-30 11:05:33 -05:00
Mackenzie Morgan
062add32dc
Add 'root/tuber' to 'planted from:' list, for things like potatoes
2014-05-04 22:46:45 -04:00
Skud
b61bbc2170
moved mailchimp settings to figaro
2014-04-29 13:11:57 +10:00
Skud
2cd5b1d2ed
Changed one config setting (site name) over to figaro
...
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
2014-04-29 12:57:16 +10:00
Skud
1c34d428f2
Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search
...
Conflicts:
spec/models/crop_spec.rb
2014-04-29 11:16:20 +10:00
Skud
b86014b04f
attempting to fix libv8 problem occurring on heroku
2014-04-28 13:02:23 +10:00
Skud
66a7dca5ab
apparently leaflet.ie isn't a thing any more?
...
https://github.com/Leaflet/Leaflet/issues/2159
2014-04-28 12:54:07 +10:00
Skud
14318ec235
Merge pull request #342 from pozorvlak/harvest_grams
...
Allow harvesting non-integer quantities.
2014-04-28 11:02:08 +10:00
Miles Gould
79f96f5ef4
Insist that crops created by db:seed are new.
...
This shaves 2s off the 22s runtime of `rake db:seed` on my machine.
2014-01-10 18:11:27 +00:00
Miles Gould
deb706607e
Explain step="any" in harvest _form view.
2014-01-05 12:27:10 +00:00
Miles Gould
96675e2eca
Allow harvesting non-integer quantities.
...
Some browsers (grrr Firefox for Android grrrr) assume "number" means
"integer" unless you specify `step="any"`. Perhaps the developers were
inspired by Kronecker?
http://mathoverflow.net/questions/34445/meaning-of-kroneckers-comment-to-lindemann
This was reported as a bug for non-integer weights; I've allowed
non-integer quantities in the other field, because some allowable units
(eg litres) are obviously divisible.
2014-01-03 21:03:01 +00:00
Skud
aa07928f1f
Show crop thumbnails on search results page
2014-01-03 22:56:31 +11:00
Skud
47f182193f
Added sexy search button to navbar search box
2014-01-03 22:48:06 +11:00
Skud
4ce071a0df
Fixed a bug that was deleting crops from the database!
...
Best bug of the night. TIL: don't call delete on an activerecord
collection expecting it to act like an array. D'oh!
2014-01-03 22:47:18 +11:00
Skud
0a3ecdc5ad
Added crop search controller and views
2014-01-03 22:29:44 +11:00
Skud
addd9cbddf
Added search method to crops
...
For now it just does a naive SQL LIKE query. We can make this fancier in
future, if we want to.
2014-01-03 21:50:41 +11:00
Skud
30c1129cab
Added route for crop search
2014-01-03 21:28:08 +11:00
