Commit Graph

65 Commits

Author SHA1 Message Date
Taylor Griffin
d038ac6d8a test that input value is not affected by auto suggest 2014-08-24 10:53:24 +10:00
Taylor Griffin
ca41f86d93 add validation for case when user input is not in the database 2014-08-17 11:34:00 +10:00
Taylor Griffin
e0d81f5693 improve and abstract auto_suggest api 2014-08-02 22:14:10 +10:00
Taylor Griffin
7aef1264ce fix edge case where user types in full name of crop and doesn't use autocomplete suggestions 2014-08-02 20:44:19 +10:00
Taylor Griffin
1bed42876c write instructions for using crop_suggest.js in a view 2014-08-01 19:30:30 +10:00
Taylor Griffin
a49880d4da make crop_suggest.js more abstract so it works for other resources, not just planting 2014-08-01 19:19:27 +10:00
Taylor Griffin
b4fdf97056 switch to poltergeist-phantomjs from selenium for js webdriver 2014-07-31 14:48:35 +10:00
Taylor Griffin
094d9c509a write feature spec for create planting functionality 2014-07-29 10:14:20 +10:00
Taylor Griffin
012f37f366 set autoFocus to true for jquery autocomplete 2014-07-29 08:42:35 +10:00
Taylor Griffin
a707d9a2ea write feature spec that tests crop suggest functionality in new planting form 2014-07-28 00:15:31 +10:00
Taylor Griffin
b28ce28703 replace mapbox_map_id and nominatim_user_agent_email with benign values if Rails env is test 2014-07-28 00:12:40 +10:00
Taylor Griffin
948aeb1289 working on getting Selenium tests to pass 2014-07-27 21:04:52 +10:00
Taylor Griffin
8a1dd9d171 implement autocomplete for crop name on new planting form 2014-07-26 20:16:22 +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
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
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
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
Miles Gould
e9a3c0f4ee rails g scaffold PlantPart...
Also migration to remove the string plant_part.
2013-10-30 23:32:20 +00:00
Skud
37383ba451 rails g scaffold Harvest... 2013-09-17 15:39:25 +10:00
Skud
f753211096 removed marker bounds on hover 2013-09-12 21:44:42 +10:00
Skud
d345a082c8 use a different, greener cloudmade tileset for maps 2013-09-11 19:19:23 +10:00
Skud
7e65af532d Set Leaflet icon path explicitly.
When we tried to deploy maps on staging, we got the following error
message in our Javascript console:

Error: Couldn't autodetect L.Icon.Default.imagePath, set it manually.

... so we did. The end.
2013-09-11 18:05:38 +10:00
Skud
a75ed5090a Hardcode Cloudmade API key.
Ugh, I know. But it's not any less secure than having it out there in
our Javascript, and it turns out Heroku just downright *refuses* to read
it from an environment variable during asset compilation. I even tried
an experimental Heroku addon
(https://devcenter.heroku.com/articles/labs-user-env-compile) but it
didn't work, so for now let's just do this and get it out there. I'm
sick of messing with it.
2013-09-11 18:03:19 +10:00
Skud
7a57b4818f fixed js == vs === as per sabreuse's recommendation 2013-09-11 14:00:30 +10:00
Skud
3cd48f751e Redid places/show using the all-javascript method.
Moved JSON for "what's here?" from members/index to places/index -- we
can improve this later if we want to show things other than members.
2013-09-11 12:14:18 +10:00
Skud
f201f357da reinstated map attribution 2013-09-11 10:28:19 +10:00
Skud
c02772d219 Spike: use pure javascript and JSON API to draw map 2013-09-09 22:15:47 +10:00
Skud
d30f8e443e added popovers, added map on places/show page 2013-08-12 12:36:09 +10:00
Skud
32f2830df5 changed located scope to ignore blank lat/long 2013-08-12 10:46:35 +10:00
Ryan Clark
23f8848773 Added markers for member locations 2013-08-06 19:52:29 -07:00
Ryan Clark
fe00146f22 Added map to places/index 2013-08-06 19:38:11 -07:00
Skud
adceb61679 fixed javascript datepicker for seeds 2013-07-23 20:55:54 +10:00
Skud
91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +10:00
Skud
89a5a777e6 Merge branch 'dev' into payments-new
Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb
2013-06-04 19:42:00 +10:00
Skud
cbca8c19a5 added admin controller and index view 2013-05-31 10:23:06 +10:00
Skud
7a1eaeffee added admin controller and index view 2013-05-29 14:37:42 +10:00
Skud
3aaf344951 rename account details to just account 2013-05-18 10:50:36 +10:00
Skud
c595b2181d added account_types, fixed a bunch of tests 2013-05-17 16:07:46 +10:00
Skud
0157229936 added account_details table, set up abilities
also tweaked some order/order_item related abilities
2013-05-17 13:05:46 +10:00
Skud
7d74203735 rails g scaffold OrderItem... 2013-05-15 13:47:16 +10:00
Skud
5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +10:00
Skud
245115fd7f rails g scaffold Order... 2013-05-07 21:14:08 +10:00
Skud
af38f8574e rails g scaffold Product... 2013-05-07 21:13:23 +10:00
Skud
7b065a0092 fixed pozorvlak's date-picker branch
- tweaked javascript to specify date format (this fixed the javascript
    problems)
- converted planted_at to a date field, rather than datetime
- made tests pass even in non-UTC timezones
2013-03-26 20:54:12 +11:00