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
pozorvlak
1988c22626
Merge pull request #692 from Skud/elasticsearch-test-failures
...
Fixed test failure if elasticsearch isn't present in test env
2015-02-02 17:00:53 +00:00
Yoong Kang Lim
a795d452c6
Remove redundant have_content expectations
2015-02-02 21:15:46 +11: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
Skud
ca47127197
Merge pull request #684 from maco/standard_weights
...
Standard weights for harvests
2015-02-02 14:06:39 +11: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
Mackenzie Morgan
7326acba81
add cms routes
2015-02-01 21:56:06 -05:00
Skud
77b4b76f14
Merge pull request #648 from oshiho3/PT80956846_crop_search
...
PT80956846 crop search
Fixes #649 as well.
Notes for deployment:
Edit config/application.yml to include GROWSTUFF_ELASTICSEARCH: "true" for dev and prod
Run:
figaro heroku:set -e staging --app growstuff-staging
heroku addons:add bonsai --app growstuff-staging
(or prod as appropriate)
Note: if you get a heap of figaro errors, you probably need to quote the value strings in your application.yml (especially numeric ones).
Now I'm ready to actually merge. The indexing will happen as part of deploy-tasks.sh.
2015-02-02 11:14:16 +11: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
Yoong Kang Lim
79c60dc7c7
Allow the planting reminder spec to test links in emails properly
2015-02-01 22:26:44 +11:00
Miles Gould
5035b65883
Fix stupid call-nonexistent-method bug in tests.
2015-02-01 10:11:55 +00: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
Miles Gould
1741567e19
Add tests for display of date ranges.
...
They fail for me with the error
undefined method `days_until_harvest_min=' for #<Seed:0x0000000b8dfcd8>
2015-01-31 23:59:27 +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
3f393b0937
moving si_weight population to one-off
2015-01-30 23:17:42 -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
Taylor Griffin
41db12d8d7
pending approval crops appear on crops wrangle page
2015-01-31 10:36:02 +11:00
Taylor Griffin
28d29291a7
any member can create a crop at least provisionally
2015-01-31 10:03:44 +11:00
Taylor Griffin
22e0379769
give crops a requester
2015-01-31 09:54:59 +11:00
pozorvlak
b60bbbcb4e
Merge pull request #682 from maco/dev
...
fixing harvest csv so it doesn't error
2015-01-30 15:54:58 +00:00
Mackenzie Morgan
0da121a48d
adding test for harvest csv
2015-01-29 22:27:09 -05:00
Skud
6b6ffd6e58
Merge pull request #653 from rocky-jaiswal/issues/625_add_context_for_logged_out_users
...
Show friendly message to unregistered users who view posts.
2015-01-30 12:37:48 +11:00
Rocky Jaiswal
21dbf87ab9
Merge branch 'issues/625_add_context_for_logged_out_users' of github.com:rocky-jaiswal/growstuff into issues/625_add_context_for_logged_out_users
2015-01-29 12:03:40 +01:00
Rocky Jaiswal
a5fcd9f860
Merge branch 'dev' of github.com:Growstuff/growstuff into issues/625_add_context_for_logged_out_users
2015-01-29 12:03:27 +01:00
Rocky Jaiswal
2853bf5c70
Merge pull request #1 from Skud/rocky-jaiswal-issues/625_add_context_for_logged_out_users
...
Rocky jaiswal issues/625 add context for logged out users
2015-01-29 12:02:19 +01:00
