mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-14 03:05:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,118 Commits 59 Branches 82 Tags
d07c97b6a67dbedd5b75fd57ee2fa9789bd4df8a
Commit Graph

876 Commits

Author SHA1 Message Date
Brenda Wallace
6167af700d Rubocop lint tidy 2019-02-05 12:37:09 +13:00
Brenda Wallace
9c4e649c5d Split up photos on crops#show by model type 2019-02-05 12:31:59 +13:00
Brenda Wallace
b61c2290be Removed unnecesary helper wrapper 2019-02-04 22:15:18 +13:00
Brenda Wallace
6a1954b1e7 added dependent: destroy 2019-02-04 21:22:19 +13:00
Brenda Wallace
f1ad9cc3c7 Rubocop fix up 2019-02-04 20:55:04 +13:00
Brenda Wallace
ab880514c2 Further tidy of photo display 2019-02-04 20:43:52 +13:00
Brenda Wallace
e8ac207fa7 Save the crop on the photo association 2019-02-04 20:32:11 +13:00
Brenda Wallace
a9ca12c1c5 Method to find planting photos only 2019-02-04 19:39:44 +13:00
Brenda Wallace
e3a0de081e Merge branch 'dev' into photos/seeds 2019-01-30 16:46:42 +13:00
Brenda Wallace
1660629cf9 DRY crop.interesting? 2019-01-06 08:45:42 +13:00
Brenda Wallace
106497c841 Rubocop fix ups 2019-01-06 08:45:42 +13:00
Brenda Wallace
ffb87a4432 Validators of garden name uniquness, and slug name 2019-01-06 08:45:42 +13:00
Brenda Wallace
c969a9f830 Use slug, not member name, for urls to members 2019-01-06 08:45:42 +13:00
Brenda Wallace
e313a7160f Active plantings option on plantings#index 2019-01-06 08:45:42 +13:00
Brenda Wallace
1e266a92f6 Members slug used in rotes 2019-01-06 08:45:42 +13:00
Brenda Wallace
387200abf7 Moving garden data under members 2019-01-06 08:45:42 +13:00
Brenda Wallace
b13ddf9c92 Add photos of seeds 2019-01-04 22:21:48 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
510124758d Inverse relation ships 2018-10-16 13:26:54 +13:00
Brenda Wallace
de2175ce16 More inverse relationships defined 2018-10-16 13:20:03 +13:00
Brenda Wallace
0d3588a2b2 Add another inverse_of created_alternate_names 2018-10-16 12:47:05 +13:00
Brenda Wallace
c1dabfc3d3 Typo fix, requestd_crops to requested_crops 2018-10-16 12:42:49 +13:00
Brenda Wallace
fc0a941fb6 Adding more inverse relationships 2018-10-16 11:32:03 +13:00
Brenda Wallace
6c2afb2804 Adding missing inverswe relationship alternatename.creator 2018-10-16 10:16:45 +13:00
Brenda Wallace
bcb466dbf1 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
	spec/controllers/photos_controller_spec.rb
 2018-10-16 09:46:14 +13:00
Brenda Wallace
1e7e275684 Adding inverse relationships (except for photos) 2018-10-08 13:43:09 +13:00
Brenda Wallace
d1d1a61be3 Added inverse to model 2018-09-29 15:52:32 +12:00
Brenda Wallace
3ad048b7e8 Fixed linter issue, empty line after guard clause 2018-09-13 23:10:43 +12:00
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
Brenda Wallace
27c4dbedf2 Elasticsearch has dropped the string type and is now using text 2018-09-09 12:18:50 +12:00
Brenda Wallace
9b6db4cde7 Merge branch 'dev' into upgrade/rails-5 2018-06-17 20:59:49 +12:00
Brenda Wallace
0d303ee6df Don't allow duplicate plant parts names 
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
 2018-06-04 17:42:41 +12:00
Brenda Wallace
748da6c3e6 Comments from deleted members need to show 2018-06-04 16:02:07 +12:00
Brenda Wallace
a590b89302 Photos in spec needs to have same owner as item they link to 2018-06-04 15:29:59 +12:00
Brenda Wallace
a221f10113 Move photos owner validation to models 2018-06-04 12:03:11 +12:00
Brenda Wallace
90f8b9e042 Fixed last crop spec for rails5 ugprade 2018-04-28 21:30:08 +12:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
fc46685ab9 Renamed should_be_finshed? to late? 2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d Rename zombie to super_late 2018-04-23 13:33:38 +12:00
Brenda Wallace
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +12:00
Brenda Wallace
e103e6be35 Reducing complexity in planting predictions code 2018-04-21 15:32:04 +12:00
Brenda Wallace
4ad4dd0c7f Style fix up 2018-04-21 15:17:51 +12:00
Brenda Wallace
a8509acd49 Zombie status needs 90 days 2018-04-21 13:02:51 +12:00
Brenda Wallace
4fe8cd566b USe finished not finished? 
because some plants have finished_at in the past but haven't had their .finished set to true yet
 2018-04-21 12:37:00 +12:00
Brenda Wallace
f8b76e9c84 Reducing complexity in planting predictions 2018-04-21 11:12:25 +12:00
Brenda Wallace
b7d4781aef Split the planting&harvest predictions into files 2018-04-21 10:18:18 +12:00
Brenda Wallace
7a112aeecf Grammar correction in method name 2018-04-19 13:49:54 +12:00
Brenda Wallace
279c922b34 Rename update predictions methods to have ! 2018-04-19 13:45:29 +12:00
Brenda Wallace
3ed90b8d04 Moving predictions to own file 2018-04-19 13:44:39 +12:00
Brenda Wallace
d1603a6e7f Badges showing finished and harvest status 2018-04-16 21:06:20 +12:00