Commit Graph
1080 Commits
Author SHA1 Message Date
Skud e7dd50c3f1 Added scopes for finished and current plantings 2014-08-30 09:28:02 +10:00
Skud b07d9d8db0 Added finished fields for plantings 2014-08-30 09:27:41 +10:00
Skud 40c7124769 Merge pull request #379 from tygriffin/crop-suggest
Crop suggest
2014-08-29 11:35:25 +10:00
Skud 30d436cb5d Fixed inline form on places page to make it b3-ish 2014-08-29 10:19:37 +10:00
Skud e3627f6dcd Fixed devise forms to make them b3ish and pretty 2014-08-29 10:02:56 +10:00
Taylor Griffin 3beae6f500 add request crop link to seeds 2014-08-29 08:43:02 +10:00
Taylor Griffin 83d3c369c2 style noscript warning 2014-08-29 08:42:43 +10:00
Taylor Griffin 7fa05d81e9 fix tests to match new implementation of of auto_suggest 2014-08-29 07:38:55 +10:00
Taylor Griffin d8c7aba725 pass options hash into auto_suggest helper to allow setting class 2014-08-29 07:31:32 +10:00
Taylor Griffin 6bb74039a7 fix slug bug 2014-08-29 07:31:02 +10:00
Taylor Griffin 2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Taylor Griffin 550cb4b265 put validation in the correct place this time 2014-08-29 06:56:02 +10:00
Taylor Griffin 62e1c3bb93 add server side validation 2014-08-29 06:45:37 +10:00
Taylor Griffin cd6fc7e804 add noscript tag 2014-08-29 06:45:11 +10:00
Taylor Griffin 4e0d62b28d remove client side validation 2014-08-29 06:44:48 +10:00
Skud 55c2fceffb changed layout of planting list on homepage
... as b3 seems to have more gutter space between columns
2014-08-28 12:09:43 +10:00
Skud 848b583d94 Tweak formatting of images with popovers (used mostly on homepage) 2014-08-28 11:46:36 +10:00
Skud 840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev
Conflicts:
	Gemfile.lock
2014-08-28 08:00:10 +10:00
Skud e5b15fae1a got rid of ugly scaffolding 'back' links 2014-08-27 19:02:49 +10:00
Skud 501fda3fc9 b3ified a few of the lesser-used forms 2014-08-27 19:02:06 +10:00
Skud a5c2c0bb5c Fixed twitter link on contact page 2014-08-25 13:41:15 +10:00
Skud 03ecb7e238 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-08-25 09:30:46 +10:00
Taylor Griffin fd651de7ea implement auto suggest on new seed page 2014-08-24 12:02:53 +10:00
Taylor Griffin d038ac6d8a test that input value is not affected by auto suggest 2014-08-24 10:53:24 +10:00
Marlena Compton 36199054c0 changed method so that you can now call crop_wranglers and admins. meta-programming ftw 2014-08-21 20:11:10 -07:00
Marlena Compton 38b9207122 remove extra method 2014-08-21 20:11:10 -07:00
Marlena Compton ec25f2ab91 created list of crop wranglers on the crop wranglers page 2014-08-21 20:11:10 -07:00
Skud 793eecfcb7 Fixed typo 2014-08-22 10:25:40 +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
Skud f02f2ae77e b3ify the signup/signin pages 2014-08-11 14:49:05 +10:00
Skud 561b7c45ac b3ify and improve design of edit profile page 2014-08-11 14:42:00 +10:00
Skud a684efcf2a b3ified some of the forms 2014-08-11 13:02:08 +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
Skud 59608c5851 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-07-31 10:19:08 +10:00
Mackenzie Morgan d17ab658c8 fix typo. pint was ping 2014-07-30 09:28:08 -04:00
Mackenzie Morgan 1716de2dfc Add 'oz' as a weight unit for harvesting 2014-07-30 01:31:39 -04: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