mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-03 03:34:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 99 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mackenzie Morgan 0a256a2dd0 update harvest model test for oz 2014-07-30 09:15:53 -04:00
pozorvlak f280ff968b Merge pull request #381 from maco/dev 
Add 'oz' as a weight unit for harvesting
 2014-07-30 11:22:58 +01: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 9d6e787883 set up database_cleaner so js specs will use the same database connection as regular specs 2014-07-28 00:14:06 +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 1ee79c25f1 set up selenium test but encountering jQuery not defined error 2014-07-27 07:38:56 +10:00
Taylor Griffin 29752e049e remove stray reference to capybara 2014-07-26 20:19:46 +10:00
Taylor Griffin 8a1dd9d171 implement autocomplete for crop name on new planting form 2014-07-26 20:16:22 +10:00
Taylor Griffin 5df0c9c71a sketch feature test for planting a crop 2014-07-26 08:36:48 +10:00
Taylor Griffin b940644ef3 add capybara and selenium gems 2014-07-26 07:58:05 +10:00
Skud bb0f88bc0b Small amount of b3ification when merging dev into b3 branch 2014-07-22 14:26:22 +10:00
Skud d03bb5e849 Merge branch 'dev' into bootstrap3 2014-07-22 14:24:24 +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 6e48b7d224 Merge branch 'Skud-scinames' into dev 2014-07-22 11:23:38 +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 846a2c89c5 Tweaked FactoryGirl to use create_list 2014-07-20 19:29:06 +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
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 7184a0d5d5 Added scientific name field tests for edit form 2014-07-18 17:29:10 +10:00
Skud e63b2fb472 Set up sci names in spec file so fields are shown 2014-07-18 17:27:25 +10:00
Skud e412184737 Merge pull request #374 from Growstuff/dev 
Production push: crop map, crop images, case insensitive search, navbar tweaks
 2014-07-18 17:00:51 +10:00
Skud 6cbe194615 Merge pull request #373 from Skud/brandfix 
Make centering specific to footer
 2014-07-18 16:47:39 +10:00
Skud 48bc019419 Make centering specific to footer 2014-07-18 16:45:42 +10:00
Skud aeba4acf0d Merge pull request #372 from Skud/brandfix 
fixed broken brand link in navbar
 2014-07-18 16:34:59 +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
Skud 7ef6942694 Merge pull request #370 from sabreuse/bootstrap3 
Initial Bootstrap3 push
 2014-07-15 12:59:44 +10:00
Amy Hendrix 863f1dfae7 Update planting form 2014-07-14 22:19:07 -04:00
Taylor Griffin 3509b6e403 Merge branch 'master' of https://github.com/Growstuff/growstuff into dev 2014-07-15 11:52:00 +10:00
Amy Hendrix 8da3430852 override some thumbnail styles 2014-07-14 21:42:44 -04:00