Skud
497121a221
Merge pull request #695 from sksavant/member_sort
...
Functionality to sort members by recently joined : Issue #550
2015-02-09 17:53:11 +11:00
Savant Krishna
e17a3a2ab1
Addition to Contributors list
2015-02-09 17:47: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
Skud
95ecdad024
Merge pull request #650 from robertlandreaux/add-crop-wrangling-link
...
add wrangle crop button to browse crops page
2015-02-09 14:06:28 +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
Skud
4c6b96e590
Merge pull request #687 from tygriffin/crop-request
...
Crop request
2015-02-06 13:55:08 +11:00
Taylor Griffin
8631c78f9a
Merge branch 'dev' of https://github.com/Growstuff/growstuff into crop-request
2015-02-06 07:36:52 +11: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
Skud
3a53f4f8a8
Merge pull request #686 from yoongkang/mydev
...
Allow the planting reminder spec to test links in emails properly
2015-02-05 13:53:17 +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
Skud
85a6eb6195
Merge pull request #693 from maco/standard_weights
...
make the one-off save the si weight
2015-02-03 20:10:37 +11:00
Mackenzie Morgan
87bfceb035
make the one-off save the si weight
2015-02-02 23:49:07 -05: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
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
Skud