mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-09 08:36:52 -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
Savant Krishna
36a9514add linkback for harvests and gardens as well : Fixing #679 2015-02-09 17:59:31 +11:00
Savant Krishna
49a5a26f17 Functionality to sort members by recently joined : Issue #550 2015-02-09 17:47:25 +11:00
Mackenzie Morgan
b66b8263c1 resolving schema merge 2015-02-09 00:06:18 -05:00
Mackenzie Morgan
c3429cc0f3 adding admin access test for cms, and changing the cms admin path, and adding a link for it to the admin page, and updating the navbar so i can actually target the sign-in link in the test. also removing sample fixture gencode from cms installation 2015-02-09 00:05:02 -05:00
Skud
f7a2ec2054 Merge pull request #676 from pozorvlak/seed_properties 
New seed properties: days until maturity, organic, GMO, heirloom
 2015-02-09 14:07:20 +11:00
Miles Gould
e6cbbb3e3d Use fieldset instead of abusing .input-group. 
As discussed in
https://github.com/Growstuff/growstuff/pull/676#issuecomment-73072087
and following comments by @maco and @Skud.
 2015-02-07 13:23:31 +00:00
robertlandreaux
b78ccaa097 fix crop_wrangling_button_spec.rb 2015-02-06 21:57:47 -05:00
robertlandreaux
593d6e7ec1 Merge branch 'dev' of https://github.com/Growstuff/growstuff into add-crop-wrangling-link 2015-02-06 21:29:18 -05:00
Taylor Griffin
a69ad34359 add link to search crops 2015-02-06 07:36:43 +11:00
Taylor Griffin
1099e4c9fe update copy for new / edit crop form 2015-02-06 07:34:01 +11:00
Yoong Kang Lim
33a66dce1f Starting stages of a like feature for posts. 2015-02-05 00:54:31 +11:00
Taylor Griffin
076a6cc1df catch up with upstream dev 2015-02-04 21:41:42 +11:00
Taylor Griffin
b842bff9cb wip: fix misc tests 2015-02-04 18:36:14 +11:00
Taylor Griffin
80a28085f1 make pending crops unviewable to regular members 2015-02-04 14:44:12 +11:00
Taylor Griffin
0dd8cbccf0 refactor default scope on crop 2015-02-04 14:21:35 +11:00
Taylor Griffin
abece6473b make rejected and pending crops viewable on wrangle crops page 2015-02-04 14:18:10 +11:00
Taylor Griffin
ff1b941690 validate that a crop hasn't already been rejected or approved 2015-02-04 06:56:51 +11:00
Mackenzie Morgan
b95975d632 swap footer over to CMS snippets and set CMS to use Devise for auth 2015-02-02 23:47:53 -05:00
Mackenzie Morgan
075cdb8272 Merge branch 'dev' of github.com:growstuff/growstuff into cms 2015-02-02 23:11:51 -05:00
Taylor Griffin
7db4dee61a add alert on crop show when rejected 2015-02-03 13:30:21 +11:00
Taylor Griffin
0993917dc6 define approval status options in model 2015-02-03 13:28:44 +11:00
Taylor Griffin
d6cb20e2c4 make reasons for rejection a select input 2015-02-03 13:27:41 +11:00
Taylor Griffin
3e65656c7b add meta data to crop pending alert 2015-02-03 13:25:14 +11:00
Taylor Griffin
47dc94f820 reason_for_rejection is required if marked as rejected 2015-02-03 13:18:59 +11:00
Miles Gould
c1870d46a2 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-02 17:45:49 +00:00
Shiho Takagi
656b0e44d8 fixing issue with elasticsearch option false in dev 2015-02-02 18:40:24 +11:00
Skud
af39df5e0c Fixed test failure if elasticsearch isn't present in test env 2015-02-02 18:20:16 +11:00
Mackenzie Morgan
1f23e1a646 merge from upstream 2015-02-01 22:08:28 -05:00
Mackenzie Morgan
7ca89908cd merge from upstream 2015-02-01 22:00:52 -05:00
Mackenzie Morgan
2c94f61843 use %0.3f instead of %0.2f so we get to gram-granularity, and don't duplicate code 2015-02-01 21:59:33 -05:00
Miles Gould
eca27d18ea Reword "days until maturity" on seed form. 2015-02-01 18:14:25 +00:00
Taylor Griffin
2f67ffd2f8 fix regressions 2015-02-02 00:01:49 +11:00
Taylor Griffin
40d13fadb3 write feature spec for requesting a crop 2015-02-01 23:29:31 +11:00
Taylor Griffin
3791f4aa6f validate wikipedia url only if crop is approved 2015-02-01 22:43:48 +11:00
Taylor Griffin
4211ebec76 add request notes to crop request 2015-02-01 17:56:51 +11:00
Taylor Griffin
d02edc3dd1 don't show sci name fields to regular users in crop form 2015-02-01 17:42:21 +11:00
Taylor Griffin
e86200b942 requester receives a message when crop request is rejected 2015-02-01 17:32:49 +11:00
Taylor Griffin
776b5450f9 requester receives email when crop request is approved 2015-02-01 17:20:48 +11:00
Taylor Griffin
c80b42d9bc change from approved boolean to approval_status string 2015-02-01 16:52:31 +11:00
Mackenzie Morgan
6aa37e6e26 adding CMS via comfortable mexican sofa gem 2015-02-01 00:27:04 -05:00
Miles Gould
089a3d5c24 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-01 00:03:10 +00:00
Mackenzie Morgan
de5b16e384 back to kg for si weight, also now adding si_weight to the csv correctly 2015-01-31 18:35:29 -05:00
Taylor Griffin
a8c203aea0 send emails to all crop wranglers when a new crop is requested 2015-02-01 09:32:50 +11:00
Marlena Compton
a013385d35 add bits to get the labels in the right place 2015-01-31 08:02:51 -08:00
Shiho Takagi
2aa30475e9 merge 2015-02-01 00:14:52 +11:00
Shiho Takagi
9a5e15b292 index when sci name or alt name is updated 2015-01-31 23:59:46 +11:00
Mackenzie Morgan
bb9695b272 add check for nil to set_si_weights and the corresponding deploy script and update test 2015-01-31 00:45:31 -05:00
Mackenzie Morgan
d436fd86f8 use ruby-units to handle conversion. note: the deploy task isn't working and i don't know why 2015-01-31 00:22:35 -05:00
Mackenzie Morgan
fb271633d9 Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights 2015-01-30 22:48:50 -05:00
Taylor Griffin
e40fad76fd exclude pending approval crops from default crops scope 2015-01-31 10:39:17 +11:00