 Taylor Griffin
|
ead9a250af
|
test that status message appears when rejected / pending
|
2015-02-27 07:56:30 +11:00 |
|
|
Cesy Avon
|
8990e803a0
|
Increasing coverage of plantings controller
|
2015-02-26 17:28:26 +00:00 |
|
|
Mackenzie Morgan
|
1b62c5cb97
|
remove pending/rejected crops from browse and test that, change links on wrangling page to go directly to crop edit and update tests for that
|
2015-02-25 00:05:56 -05:00 |
|
|
Mackenzie
|
7bca5c8845
|
Merge pull request #715 from Skud/requestcrops
Improvements to crop requests
|
2015-02-20 22:11:28 -05:00 |
|
|
Skud
|
1dfac3fb2f
|
Improving crop request form
|
2015-02-17 20:44:24 +11:00 |
|
|
Skud
|
d0f856d389
|
Fixed various problems with search matching
|
2015-02-17 19:20:25 +11:00 |
|
|
Miles Gould
|
9e146cde18
|
Merge branch 'dev' into js_all_the_features
|
2015-02-16 14:42:30 +00:00 |
|
|
Yoong Kang Lim
|
75ac2081b0
|
Merge branch 'dev' into likeable
Conflicts:
db/schema.rb
|
2015-02-10 22:57:28 +11:00 |
|
|
Yoong Kang Lim
|
36a94156c1
|
Merge branch 'dev' into likeable
Conflicts:
db/schema.rb
|
2015-02-10 22:54:45 +11:00 |
|
|
Skud
|
09a78d4661
|
Merge pull request #701 from Skud/search_tweaks
Search tweaks
|
2015-02-10 20:57:32 +11:00 |
|
|
Skud
|
e0d8126514
|
Merge pull request #694 from maco/cms
Add comfortable mexican sofa CMS to growstuff & make footer use it
|
2015-02-10 20:53:50 +11:00 |
|
|
Skud
|
66fcad69fa
|
Paginate search results, make sexy subtitles
|
2015-02-10 20:48:36 +11:00 |
|
|
Savant Krishna
|
9bcd2d0aa6
|
Test for linkback of photos to harvest/garden/planting
|
2015-02-10 20:01:43 +11:00 |
|
|
Skud
|
9ccef5471f
|
Added search form to crop search result page
|
2015-02-10 19:18:57 +11:00 |
|
|
Skud
|
0fc4c3cb4d
|
Made search result page show a suitable title
|
2015-02-10 19:07:50 +11:00 |
|
|
Taylor Griffin
|
2697fea249
|
tests back to green
|
2015-02-09 22:41:35 +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 |
|
|
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
|
8631c78f9a
|
Merge branch 'dev' of https://github.com/Growstuff/growstuff into crop-request
|
2015-02-06 07:36:52 +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
|
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 |
|
|
Miles Gould
|
c1870d46a2
|
Merge branch 'dev' into seed_properties
Conflicts:
db/schema.rb
|
2015-02-02 17:45:49 +00:00 |
|
|
Yoong Kang Lim
|
a795d452c6
|
Remove redundant have_content expectations
|
2015-02-02 21:15:46 +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 |
|
|
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 |
|
|
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 |
|
|
Shiho Takagi
|
2aa30475e9
|
merge
|
2015-02-01 00:14:52 +11:00 |
|
|
Miles Gould
|
233f9dfd88
|
Split "days until maturity" into min and max fields.
|
2015-01-26 19:20:33 +00:00 |
|
|
Miles Gould
|
334b5bf63f
|
Test new seed properties on detail page
|
2015-01-24 12:34:09 +00:00 |
|
|
Miles Gould
|
58940a6765
|
Add new seed properties to feature.
|
2015-01-24 12:13:57 +00:00 |
|
|
Skud
|
ad76a04e8f
|
Fixed misnamed feature test
|
2015-01-24 21:07:27 +11:00 |
|
|
Miles Gould
|
f4d452f3bc
|
Turn on PhantomJS for Follows features.
|
2015-01-23 11:39:20 +00:00 |
|
|
Miles Gould
|
d08e2f09db
|
Add feature test for 500-on-follow error
This doesn't actually catch the problem; I'm committing it so other
people can see it and suggest ways of making it stronger.
|
2015-01-23 11:39:20 +00:00 |
|
|
Taylor Griffin
|
a67a55c599
|
add scientific name to crops create feature spec
|
2015-01-23 13:21:47 +11:00 |
|
|
Taylor Griffin
|
0e0c309c15
|
Revert "Sci names permitted params"
|
2015-01-23 11:42:42 +11:00 |
|
|
Miles Gould
|
6d1385f00c
|
Turn on PhantomJS for all feature tests.
|
2015-01-22 23:55:20 +00:00 |
|
|
Taylor Griffin
|
1ea5257da4
|
include sci names in create crop feature spec
|
2015-01-23 09:56:23 +11:00 |
|
|
Cesy Avon
|
14ad572f18
|
Adding test for products
|
2015-01-22 16:21:10 +00:00 |
|