mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-09 16:47:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

4522 Commits

Author SHA1 Message Date
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
Skud
bb0f88bc0b Small amount of b3ification when merging dev into b3 branch 2014-07-22 14:26:22 +10:00
Skud
250a2b7d02 Merge branch 'bootstrap3' into dev 
Conflicts:
	app/assets/stylesheets/overrides.css.less
 2014-07-22 14:24:07 +10:00
Skud
c0ea08ddc1 s/btn-large/btn-lg/ for bootstrap 3 2014-07-22 12:11:33 +10:00
Skud
4e9679b22a make sure all buttons are either btn-default or btn-primary 2014-07-22 12:09:08 +10:00
Skud
117fd23bea add btn-default to all btn-xs 2014-07-22 12:06:28 +10:00
Skud
0294daf423 s/btn-mini/btn-xs/ for bootstrap3 2014-07-22 12:01:49 +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
817663bdaf Merge branch 'dev' of https://github.com/Growstuff/growstuff into regularemail 
Conflicts:
	db/schema.rb
 2014-07-20 19:30:20 +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
f67732e125 Added checkbox for whether to send planting reminder 2014-07-20 19:17:59 +10:00
Skud
7c09188bb8 Renamed email to planting_reminder 2014-07-20 18:54:58 +10:00
Skud
f4c2c2481d Include plantings/harvests in regular email 2014-07-20 18:45:48 +10:00
Skud
a7d56d4f92 Added stub code for sending regular (eg. weekly) emails 2014-07-20 17:39:27 +10:00