mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-06 07:59:53 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,635 Commits 62 Branches 76 Tags
c19d09bb3754b733c0e42261e9ea712439fa57ae
Commit Graph

578 Commits

Author SHA1 Message Date
Brenda Wallace
6a4158ae04 👭 Crop companions (#2176) 
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
 2019-09-28 10:38:01 +12:00
Brenda Wallace
756cf1fe3a Removing unused code in specs 2019-08-18 14:51:24 +12:00
Brenda Wallace
11ef0fb694 Removed test for unused method 2019-08-11 16:31:51 +12:00
Brenda Wallace
4f74b20565 Migrate from notifications to conversations without sending emails 2019-08-11 14:17:30 +12:00
Brenda Wallace
2a3563f9fd Migration from notifications to mailboxer 2019-08-11 13:37:56 +12:00
Brenda Wallace
f676054cd6 switch to member.discard 2019-08-10 16:09:57 +12:00
Brenda Wallace
b3807100d1 fixes email sending 2019-08-10 11:47:45 +12:00
Brenda Wallace
86540c3352 Removed feature plantings code and spec 
because it's not used
 2019-08-10 10:52:49 +12:00
Brenda Wallace
3cd67bcc9f Fix liked photo spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
efe14d43cb read photo from a harvest's planting 2019-07-15 11:58:46 +00:00
Brenda Wallace
99c119c07f fixed looking up photo counts in spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
60a510e73f tests the default photo changes when someone likes a photo 2019-07-15 11:58:46 +00:00
Brenda Wallace
b1ebf67960 added more possible photo associations in photo model spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
32695e3241 photos behave like likeable 2019-07-15 11:58:46 +00:00
Brenda Wallace
2879979db4 tests that likes are deleted when their photo is deleted 2019-07-15 11:58:46 +00:00
Brenda Wallace
0af9fe0e4c Updated a wierd spec on crop.photos.size that looked wrong 2019-06-14 12:00:41 +12:00
Brenda Wallace
2949abd6bf SEt subject of post in spec, so it matches the tests 2019-06-14 11:47:15 +12:00
codefactor-io
977ff7d174 [CodeFactor] Apply fixes 2019-06-08 05:20:29 +00:00
Brenda Wallace
9b8638a3b6 tests for plantings.active scope 2019-06-08 15:38:27 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
85ba701045 Merge branch 'dev' into feature/searchkick 2019-04-17 12:35:09 +12:00
Awesome Code
d0001691d5 Auto corrected by following Lint Ruby EmptyLine 2019-04-16 22:02:27 +12:00
Awesome Code
a4e398bb62 Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-04-16 09:55:51 +00:00
Awesome Code
b9ca89b336 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples 2019-04-14 19:38:16 +00:00
Awesome Code
ff3ea5c52f Auto corrected by following Lint Ruby RSpec/HookArgument 2019-04-14 18:38:06 +00:00
Awesome Code
b84b1e89c1 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-04-14 18:37:52 +00:00
Awesome Code
e54c13afe3 Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-04-14 18:36:34 +00:00
Awesome Code
50a2de3709 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-04-14 10:01:46 +00:00
Brenda Wallace
cb680a5a0e Auto corrected by following Lint Ruby Space (#1917) 2019-04-13 12:09:47 +12:00
Brenda Wallace
026efe5d15 Rubocop lint 2019-04-13 09:50:49 +12:00
Brenda Wallace
9683983f23 Merge branch 'dev' into feature/searchkick 2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499 varieties info on crops#show (#1848) 
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
 2019-04-10 20:02:05 +12:00
Brenda Wallace
77d1fc7347 Move crop searching specs from the crop model to the crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
ab57451b17 only reindex our one crop 2019-04-08 21:39:20 +12:00
Brenda Wallace
370747390a Add default pagination to crop search service 2019-04-08 21:39:20 +12:00
Awesome Code
6e10dc2a2b Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-31 10:20:08 +13:00
Awesome Code
fb243c1f8d Auto corrected by following Lint Ruby RSpec/ExpectChange 2019-03-31 09:24:13 +13:00
Awesome Code
837ae8cb8e Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-30 18:09:37 +13:00
Awesome Code
f48e131e14 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-30 18:07:30 +13:00
Brenda Wallace
8d579a4616 Gardens have descriptions 2019-03-26 22:27:10 +13:00
Brenda Wallace
09dc928250 Update model specs to not use should 2019-03-26 22:07:07 +13:00
Brenda Wallace
95d2aa221f Removed plot spec 2019-03-26 22:06:53 +13:00
Brenda Wallace
e5ee89c865 garden_types.description becomes garden_type.name 2019-03-26 21:43:34 +13:00
Brenda Wallace
1fe5f67aa1 Update garden_type model spec 2019-03-26 21:14:31 +13:00
Brenda Wallace
63edfa36df Gardens have garden_Types in specs 2019-03-26 21:13:12 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
Awesome Code
ad470ede1d Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-13 17:23:33 +13:00
Awesome Code
3bc1bba448 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-12 22:51:12 +00:00
Awesome Code
f90cc792bb Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-13 11:42:27 +13:00