mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-06 23:51:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,603 Commits 65 Branches 76 Tags
c2b64ffbc0fbcc666de77fa91b4ee4bb13656751
Commit Graph

2767 Commits

Author SHA1 Message Date
Brenda Wallace
276accc314 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
 2018-12-30 13:02:02 +13:00
Brandon Baker
beab7fcfda hides crop varieties that have not been approved 2018-11-26 17:29:27 +13:00
Brenda Wallace
92939ca204 Spec updates 2018-10-16 14:08:37 +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
7a44e9499d More markup updates to fit specs 2018-10-08 14:18:19 +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
857c9e9d7a whitespace fixups 2018-09-09 12:44:52 +12:00
Brenda Wallace
913ac45127 Changed query syntax for elasticsearch 2018-09-09 12:40:40 +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
77d2dc6144 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 20:58:32 +12:00
Brenda Wallace
a8ab21d3bc Merge branch 'dev' into upgrade/rails-5 2018-06-17 08:48:25 +12:00
Brenda Wallace
a5fa69c7c7 Merge branch 'dev' into fix/plants-parts-dupe 2018-06-17 08:47:27 +12:00
Brenda Wallace
1d8c2db674 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 08:47:12 +12:00
robotscissors
dff6827761 create rss feed for harvests 2018-06-10 20:38:43 -07: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
5dc8bc5ec5 Order plantings and harvests in email 2018-06-04 17:35:06 +12:00
Brenda Wallace
a816ec2bba Fix up footer 2018-06-04 16:44:51 +12:00
Brenda Wallace
fd405ccad0 Added back link to CMS 2018-06-04 16:37:57 +12:00
Brenda Wallace
4d937a1f91 Restoring Comfy mexican sofa 2018-06-04 16:29:38 +12:00
Brenda Wallace
05bfbda5f5 Rubocop style fix ups 2018-06-04 16:18:49 +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
b898d83d21 Fix up notification redirect spec 2018-06-04 11:49:30 +12:00
Brenda Wallace
cc838e19b5 Show a 404 page on record not found 2018-06-04 10:59:34 +12:00
Brenda Wallace
ed3ae8bbd6 Remove some old currency methods from application helper 2018-05-01 13:47:25 +12:00
Brenda Wallace
1bbf0a3c18 Simplifying show_inactive_tickbox_path method 2018-04-28 22:11:02 +12:00
Brenda Wallace
cd910e74bc Don't need to throw exception on planting save error 2018-04-28 22:05:50 +12:00
Brenda Wallace
9cfdb93aa3 Remove some old currency methods from application helper 
Conflicts:
	app/helpers/application_helper.rb
 2018-04-28 21:50:15 +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
d3faa75d1d Merge branch 'dev' into feature/i18n 2018-04-26 17:26:55 +12:00
Brenda Wallace
85eea89792 i18n for plantings#index 2018-04-23 15:40:56 +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
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +12:00
jenkr55
25bba9c126 format fixes 2018-04-21 21:55:29 -05:00
jenkr55
028c2a28a5 unneeded class 2018-04-21 21:52:55 -05:00
jenkr55
fa28fe25b6 Fixing responsive design issues 2018-04-21 21:43:19 -05:00
jenkr55
77978a76f2 Fixing notes display bug on harvest card 2018-04-21 21:27:40 -05:00