 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 |
|
|
Miles Gould
|
089a3d5c24
|
Merge branch 'dev' into seed_properties
Conflicts:
db/schema.rb
|
2015-02-01 00:03:10 +00:00 |
|
|
Taylor Griffin
|
a8c203aea0
|
send emails to all crop wranglers when a new crop is requested
|
2015-02-01 09:32:50 +11:00 |
|
|
Shiho Takagi
|
2aa30475e9
|
merge
|
2015-02-01 00:14:52 +11: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
|
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 |
|
|
Mackenzie Morgan
|
2d55d88db8
|
fixing harvest csv so it doesn't error
|
2015-01-29 00:49:23 -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 |
|
|
Mackenzie Morgan
|
c38dc4661d
|
basics of garden photos
|
2015-01-27 00:54:05 -05:00 |
|
|
Miles Gould
|
233f9dfd88
|
Split "days until maturity" into min and max fields.
|
2015-01-26 19:20:33 +00:00 |
|
|
Miles Gould
|
b56237115e
|
Add form and controller for new seed properties
|
2015-01-24 12:01:11 +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 |
|
|
Taylor Griffin
|
253b5a3f85
|
define permitted param for nested attribute
|
2015-01-23 13:20:37 +11:00 |
|
|
Taylor Griffin
|
0e0c309c15
|
Revert "Sci names permitted params"
|
2015-01-23 11:42:42 +11:00 |
|
|
Taylor Griffin
|
3c360ab1b8
|
specify permitted params for nested attributes
|
2015-01-23 09:22:13 +11:00 |
|
|
Shiho Takagi
|
f910fdfa73
|
use elasticsearch for auto-suggest
|
2015-01-20 13:20:13 +11:00 |
|
|
Shiho Takagi
|
99eb33ccbb
|
clearning up the code
|
2015-01-18 12:23:54 +11:00 |
|
|
Shiho Takagi
|
b4cd151a03
|
merge from upstream
|
2015-01-17 14:09:45 +11:00 |
|
|
Skud
|
17e94e01d0
|
Tidied up authorization around follows
|
2015-01-17 00:57:05 +11:00 |
|
|
Shiho Takagi
|
ce265e281a
|
cleaning up the code
|
2015-01-17 00:37:37 +11:00 |
|
|
Shiho Takagi
|
06c7703628
|
auto-suggest to use existing search
|
2015-01-17 00:31:01 +11:00 |
|
|
Shiho Takagi
|
556ba33172
|
updated crop search view
|
2015-01-17 00:09:39 +11:00 |
|
|
Taylor Griffin
|
36ac0b75e7
|
decoy commit to test if travis / phantomjs error was spurious
|
2015-01-15 22:23:27 +11:00 |
|
|
Shiho Takagi
|
9a3c4e69e8
|
Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search
Conflicts:
app/models/crop.rb
|
2015-01-15 21:32:46 +11:00 |
|
|
Shiho Takagi
|
10e6e7c3cb
|
Integrate Elasticsearch and implement crop search against scientific_name
|
2015-01-15 19:05:02 +11:00 |
|
|
Miles Gould
|
401f3e176e
|
Remove the authentications index page
|
2015-01-11 11:57:13 +00:00 |
|
|
Taylor Griffin
|
86cea2ad9f
|
add current_password to permitted params
|
2015-01-11 14:55:12 +11:00 |
|
|
Taylor Griffin
|
ccef46a5cf
|
add more permitted parameters to member update
|
2015-01-11 14:32:19 +11:00 |
|
|
Taylor Griffin
|
c803da3dfa
|
fix planted_at on planting create bug
|
2015-01-11 14:00:51 +11:00 |
|
|
Taylor Griffin
|
8a05a959c3
|
remove depricated method
|
2015-01-10 15:46:36 +11:00 |
|
|
Taylor Griffin
|
e5d407b1ce
|
replace depricated method
|
2015-01-10 15:35:54 +11:00 |
|
|
Taylor Griffin
|
c6cc8ee6bb
|
configure devise account update for strong parameters
|
2014-12-31 18:32:37 +11:00 |
|
|
Taylor Griffin
|
007f7112a7
|
replaced caching using observers with a key-based (and simplified) caching system
|
2014-12-19 21:17:43 +11:00 |
|
|
Taylor Griffin
|
a35a573b2b
|
update follow member code to be rails 4 compatible
|
2014-12-14 14:51:18 +11:00 |
|
|
Yoong Kang Lim
|
2fc6bfb77f
|
Merge remote-tracking branch 'upstream/dev' into cancanredirect
|
2014-12-09 21:32:01 +11:00 |
|
|
Yoong Kang Lim
|
837121265a
|
Reversed order of authorization and authentication. Also added tests
|
2014-12-09 21:27:16 +11:00 |
|
|
Skud
|
7227c1f330
|
Merge pull request #455 from yoongkang/cancanredirect
Redirect to sign-in page for any action that requires authentication
|
2014-12-09 20:17:58 +11:00 |
|
|
Yoong Kang Lim
|
81d1189203
|
Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in
|
2014-11-24 22:12:42 +11:00 |
|
|
Yoong Kang Lim
|
5de6759917
|
Moved number of follows/followers under activity and added pagination.
|
2014-11-21 00:29:45 +11:00 |
|
|
Taylor Griffin
|
acbd3f9a9e
|
implement strong parameters instead of protected attributes
|
2014-11-18 20:08:54 +11:00 |
|
|
Taylor Griffin
|
0ffe9adc86
|
tests are green
|
2014-11-16 21:40:43 +11:00 |
|
|
Taylor Griffin
|
56b4f8a221
|
mimick old FriendlyId behavior when calling find on a model - therefore, Model.find not Model.friendly.find (this probably needs review)
|
2014-11-16 20:21:34 +11:00 |
|
|
Yoong Kang Lim
|
77f40a3dc2
|
Fixed comment + code style
|
2014-11-13 02:10:54 +11:00 |
|
|
Yoong Kang Lim
|
b5e1b6bc22
|
Delete unused views, add feature tests
|
2014-11-13 00:46:34 +11:00 |
|
|
Yoong Kang Lim
|
cacc002a01
|
Added follow/unfollow buttons
|
2014-11-12 01:47:26 +11:00 |
|
|
Yoong Kang Lim
|
a9fdab5d7c
|
Basic follower relationship
|
2014-11-12 00:23:01 +11:00 |
|