Commit Graph

1003 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
69162cf228 write feature specs for harvesting a crop 2014-08-01 19:38:47 +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
8352807d5a add presence validation for crop association on harvest 2014-08-01 19:27:51 +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
1054f08206 write feature spec for crop-suggest functionality on new planting form 2014-07-28 00:23:13 +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
ec060b9cc0 fix most view tests that broke after changing new planting form to auto-suggest crop name 2014-07-27 22:40:14 +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
d558353e4c Merge branch 'scinames' of github.com:Skud/growstuff into Skud-scinames
Conflicts:
	CONTRIBUTORS.md
2014-07-22 11:23:08 +10:00
Skud
bac836329c Merge pull request #376 from Skud/cropbrowse
Show most popular crops on "browse crops" page
2014-07-20 19:29:32 +10:00
Skud
a0fc8802b2 Allow selection of crop display order (popularity or alphabetical)
Had some trouble with tests; apparently the counter_cache behaves
differently when it starts counting from 0, which meant that some tests
started failing unless you do @crop.reload to refresh the
plantings_count.  Weird, but oh well.
2014-07-18 18:37:47 +10:00
Skud
aeb14021f3 Removed unpopular scope (guess it really was unpopular) 2014-07-18 18:17:37 +10:00
Skud
8223025d35 Set default plantings_count to 0 not nil 2014-07-18 18:06:43 +10:00
Skud
573e555bcf Added unpopular scope to crop 2014-07-18 17:52:11 +10:00
Skud
c9857bf1c8 popular scope for crops 2014-07-18 17:38:15 +10:00
Skud
6c048dec77 Merge pull request #371 from tygriffin/dev
Fix for bug when redirecting after password reset
2014-07-18 17:30:14 +10:00
Skud
48bc019419 Make centering specific to footer 2014-07-18 16:45:42 +10:00
Skud
90c43336ca fixed broken brand link in navbar
the "float:none" was causing trouble; removing it doesn't seem to change
the display at all.
2014-07-18 16:34:07 +10:00
Taylor Griffin
82598e75f8 fix redirect after reset password bug 2014-07-15 22:57:07 +10:00
Amy Hendrix
10af60f30d Cleanup crops.js.erb 2014-07-13 21:46:33 -04:00
Amy Hendrix
191363402a Replace crops.js.erb 2014-07-13 21:45:19 -04:00
Amy Hendrix
0714c2a38c Menu items should be block, not inline-block, at mobile screen sizes 2014-07-13 21:30:08 -04:00
Amy Hendrix
bf1821f8ce Force bootstrap overrides into sync with upstream/dev 2014-07-13 21:26:07 -04:00
Amy Hendrix
c2435cfb8a catch up with upstream 2014-07-13 21:08:44 -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