mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-02 19:24:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 97 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
1227 Commits
Author SHA1 Message Date
pozorvlak 4a8297360c Merge pull request #434 from Skud/memberprofile 
Member profile
 2014-10-19 17:32:27 +01:00
Skud a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile 
Conflicts:
	app/views/scientific_names/index.html.haml
 2014-10-19 16:54:10 +01:00
Miles Gould 6de2112c4d Display note on successful sciname deletion. 2014-10-19 16:36:10 +01:00
Skud 7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
Skud dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Skud 41566d39f3 Added map to member profile page 2014-10-19 13:50:43 +01:00
Miles Gould 29d53a8f8b Test for notices in altname CRUD features. 2014-10-19 12:02:31 +01:00
Miles Gould 110ae99d83 Fix and test altname index page. 2014-10-18 17:55:56 +01:00
Miles Gould 96d2fa1cb6 Put alternate names controller in standard order. 2014-10-18 17:41:52 +01:00
Miles Gould c7c85aaa66 Creation and deletion of alternate names 2014-10-18 17:03:54 +01:00
Miles Gould eacfadae20 Make editing alternate names actually do something. 2014-10-18 16:51:43 +01:00
Miles Gould 37eb2a0e34 Show alternate names on their own page. 2014-10-18 16:49:27 +01:00
Miles Gould 10f6214c6c Views for adding/editing alternate names. 2014-10-18 16:34:38 +01:00
Miles Gould 7e4b51d1cb Add "Edit" link for alternate names on crops page. 2014-10-18 15:18:23 +01:00
Taylor Griffin a4e7f93421 Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n 2014-10-16 06:39:10 +11:00
Taylor Griffin 6a7c935d43 try setting locale from query parameter first 2014-10-16 06:37:02 +11:00
Shiho Takagi 6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi 14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Mackenzie Morgan 48ad561b76 convert tabs to spaces 2014-10-01 23:58:54 -04:00
Mackenzie Morgan fcda8742d8 go back to the nested error handling in the photos controller and add a migration for indexing harvests_photos 2014-10-01 22:52:52 -04:00
Mackenzie Morgan 57abfa04b3 fix whitespace 2014-10-01 21:46:15 -04:00
Mackenzie Morgan a29d11a07c refactor error handling on photo upload to be easier to read 2014-10-01 20:17:11 -04:00
Taylor Griffin a7da4b9ce4 no longer necessary to pass locale quuery param in every url 2014-09-28 21:38:28 +10:00
Taylor Griffin d10a62d336 set locale from subdomain 2014-09-28 21:32:15 +10:00
Taylor Griffin 984503480f remove necessity to add locale to url if current locale is English 2014-09-25 07:00:11 +10:00
Taylor Griffin 16f4d2f80e fix spec to check href with newly added locale query param 2014-09-19 07:17:08 +10:00
Taylor Griffin f355c393f0 basic setup 2014-09-18 06:15:59 +10:00
Mackenzie Morgan ed537e583b whitespace fixes and um oops no there shouldn't be a secret key in that config file 2014-09-09 20:31:14 -04:00
Mackenzie Morgan 512ccdbaa2 merging the schema changes from finished plantings and making the timestamp newer, then making the styling on harvest photos match the new styling (no li) on planting photos 2014-09-09 20:19:25 -04:00
Mackenzie Morgan 7d54ab347f Adding photo functionality to harvests 2014-09-09 19:55:40 -04:00
Skud 9d5c15a7da Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished 
Conflicts:
	spec/features/plantings/planting_a_crop_spec.rb
 2014-09-10 09:12:27 +10:00
Skud 965a3bf2a1 Modernise redirection after signup to use devise's stored_location_for 2014-08-31 18:28:26 +10:00
Skud 99ffa3775e Remove puts used for debugging 2014-08-30 18:38:16 +10:00
Skud d55d2c6409 Ongoing coverage improvements 2014-08-30 17:09:47 +10:00
Skud fbeafd4299 Improving test coverage for gardens 2014-08-30 11:28:52 +10:00
Skud 46e20f0562 Add finished planting data (and buttons) to plantings index 2014-08-30 11:04:31 +10:00
Skud 170d6b474e Updated garden page with "finished" plantings 
Also added a similar "mark as inactive" button for the garden itself
and rearranged some things on the page.
 2014-08-30 10:42:16 +10:00
Skud facba15154 Added a button on the planting details page to mark as finished 2014-08-30 10:14:11 +10:00
Taylor Griffin 2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Skud 840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev 
Conflicts:
	Gemfile.lock
 2014-08-28 08:00:10 +10: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
Skud 561b7c45ac b3ify and improve design of edit profile page 2014-08-11 14:42:00 +10:00
Taylor Griffin e0d81f5693 improve and abstract auto_suggest api 2014-08-02 22:14:10 +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 8223025d35 Set default plantings_count to 0 not nil 2014-07-18 18:06:43 +10:00