mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 09:43:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,299 Commits 64 Branches 76 Tags
e3db003bbcd8ca2fb36139f0051cb4d36d7fe3c0
Commit Graph

2299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yoong Kang Lim
e3db003bbc Added tests for the concern and member model 2015-02-10 20:18:26 +11:00
Yoong Kang Lim
33a66dce1f Starting stages of a like feature for posts. 2015-02-05 00:54:31 +11: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
Skud
af39df5e0c Fixed test failure if elasticsearch isn't present in test env 2015-02-02 18:20:16 +11: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
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
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
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
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
Mackenzie Morgan
2d55d88db8 fixing harvest csv so it doesn't error 2015-01-29 00:49:23 -05:00
Mackenzie Morgan
2567e7cd74 adding tests (not passing, need to figure out saving mid-test), fixing before_save, adding CSV column, and adding task to set the si_weight throughout the db 2015-01-29 00:27:53 -05:00
Mackenzie Morgan
e2bac619b7 Merge branch 'dev' of github.com:growstuff/growstuff into standard_weights 2015-01-28 23:10:10 -05:00
Mackenzie Morgan
0bdab0d9fc basics of harvest standardized weights 2015-01-28 23:00:16 -05:00
Skud
e55fe55dc7 Merge pull request #680 from maco/garden_photos 
Garden photos
 2015-01-29 09:48:39 +11:00
Mackenzie Morgan
5a474d523c merge from upstream 2015-01-27 22:35:19 -05:00
Mackenzie Morgan
d126392ee2 display garden photos on member page garden tabs too 2015-01-27 00:58:44 -05:00
Mackenzie Morgan
c38dc4661d basics of garden photos 2015-01-27 00:54:05 -05:00
Mackenzie Morgan
675ac5a03f add before_save for harvest weight and index for harvest photos 2015-01-26 22:26:21 -05:00
Shiho Takagi
b414598b07 adding comments for search options 2015-01-26 22:50:47 +11:00
Shiho Takagi
2c4e768a3a fixing wrong file name 2015-01-26 22:30:19 +11:00
Shiho Takagi
04d61bd040 deployment sript 2015-01-25 16:18:26 +11:00
Shiho Takagi
5a96b7efd6 adding a rake task to generate elasticsearch index 2015-01-25 15:47:40 +11:00
Skud
c6f5abc036 Made info alerts be green like Growstuff is green 2015-01-24 21:07:41 +11:00
Skud
ad76a04e8f Fixed misnamed feature test 2015-01-24 21:07:27 +11:00
Skud
0b70be4939 Merge branch 'issues/625_add_context_for_logged_out_users' of https://github.com/rocky-jaiswal/growstuff into rocky-jaiswal-issues/625_add_context_for_logged_out_users 2015-01-24 20:45:14 +11:00
pozorvlak
da2590791e Merge pull request #665 from pozorvlak/500_on_follow 
Fix the 500 server error when you try to follow another user
 2015-01-23 23:45:03 +00:00
Miles Gould
79a7958519 Don't try to load a Follow before it's been created. 2015-01-23 11:39:20 +00: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
pozorvlak
d5cc3f300a Merge pull request #664 from pozorvlak/travis_containers 
Deployment from Travis containers
 2015-01-23 11:00:11 +00:00
Skud
1982cecc31 Merge pull request #673 from tygriffin/sci-names-permitted-params 
Sci names permitted params
 2015-01-23 13:40:47 +11:00
Taylor Griffin
2f05f1dbdb raise exceptions on unpermitted params in staging 2015-01-23 13:22:52 +11:00
Taylor Griffin
a67a55c599 add scientific name to crops create feature spec 2015-01-23 13:21:47 +11:00
Taylor Griffin
253b5a3f85 define permitted param for nested attribute 2015-01-23 13:20:37 +11:00
Taylor Griffin
45aaf31722 Merge branch 'dev' of https://github.com/Growstuff/growstuff into sci-names-permitted-params 2015-01-23 13:19:33 +11:00
Taylor Griffin
d0b9917e84 Merge pull request #671 from Growstuff/revert-669-sci-names-permitted-params 
Revert "Sci names permitted params"
 2015-01-23 13:14:42 +11:00
Taylor Griffin
32dcacf9ba copy schema from last known correct version 2015-01-23 13:14:13 +11:00
Taylor Griffin
0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00