2551 Commits

Author	SHA1	Message	Date
Brenda Wallace	bf34feacba	Convert to use chartkick gem	2018-01-07 17:25:16 +13:00
Brenda Wallace	f02d328d1c	commented out a cms link	2018-01-06 15:34:51 +13:00
Brenda Wallace	987400526e	Use distinct for plant parts	2018-01-06 12:32:04 +13:00
Brenda Wallace	dd980d3f41	Harvests#edit needs to respond with something	2018-01-06 12:06:26 +13:00
Brenda Wallace	e5beb066a0	Moved members.create_account_and_garden to private	2018-01-06 11:32:49 +13:00
Brenda Wallace	7bb49f337f	Fixing up member's account model creation, post rails 5 upgrade	2018-01-06 11:31:04 +13:00
Brenda Wallace	fcbb57e659	Respond with data on gardens#edit, so non-html formats don't break specs	2018-01-06 10:47:04 +13:00
Brenda Wallace	a0fe19651e	Plant parts model using distinct query	2018-01-06 09:31:39 +13:00
Brenda Wallace	62fd16e6b2	Notifications don't have a post if they are a message	2018-01-06 09:01:18 +13:00
Brenda Wallace	641d227a87	Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 ... Conflicts: app/assets/javascripts/application.js package-lock.json	2018-01-06 08:46:52 +13:00
Brenda Wallace	fefc218b4c	Merge branch 'js/cleanup' of github.com:Br3nda/growstuff into js/cleanup	2018-01-04 15:12:30 +13:00
Brenda Wallace	53c9f89bc1	Fixed up tabulation	2018-01-04 15:11:36 +13:00
Brenda Wallace	090bc02269	belongs_to defaults to required. setting some to optional	2018-01-04 14:55:36 +13:00
Brenda Wallace	2fd13e9b7c	Updated new path to jquery autocomplete	2018-01-04 14:44:52 +13:00
Brenda Wallace	79cf7b452c	removing some cms stuff	2018-01-04 14:31:24 +13:00
Shiny	ba2e4b5dce	Merge branch 'dev' into upgrade/rails-5	2018-01-04 14:03:19 +13:00
pozorvlak	965fb28ab3	Merge branch 'dev' into js/cleanup	2018-01-03 11:07:35 +00:00
Brenda Wallace	d456d045cd	Changed order of photo association relationship declarations	2018-01-03 17:24:51 +13:00
Brenda Wallace	4917ab9ae8	Fixed order->member relationship, after change to paranoia gem	2018-01-03 17:21:40 +13:00
Brenda Wallace	46d56fde31	Application job for Rails 5	2018-01-03 17:20:08 +13:00
Brenda Wallace	65d5b2d61a	Application mailer for rails 5	2018-01-03 17:18:41 +13:00
Brenda Wallace	b6c9b13d4d	Models inherit from application record	2018-01-03 17:16:14 +13:00
Brenda Wallace	f4af682d45	Updated code for Rail 5	2018-01-03 17:12:17 +13:00
Brenda Wallace	d86de897c7	Wrap long line	2018-01-03 15:12:09 +13:00
Brenda Wallace	a39c304fac	Fix ordering of crops' parent on form	2018-01-03 15:06:55 +13:00
Brenda Wallace	0a71bfe99f	Tabulation and jsdoc fixes	2018-01-03 14:40:22 +13:00
Brenda Wallace	978317f47a	more JSDoc	2018-01-03 14:20:01 +13:00
Brenda Wallace	4570fda384	removed 2 unused variable in js	2018-01-03 13:03:10 +13:00
Brenda Wallace	122a7f17e2	Fix up JSDoc	2018-01-03 13:01:48 +13:00
Brenda Wallace	591c95dca2	added JSDoc	2018-01-03 12:56:52 +13:00
Brenda Wallace	e910bfd50f	added JSDoc	2018-01-03 12:54:33 +13:00
Brenda Wallace	0db2d6b346	converted variable to camel case	2018-01-03 12:42:20 +13:00
Brenda Wallace	5584da02c3	Some js cleanups	2018-01-03 12:35:30 +13:00
Shiny	9d47b2b029	Merge branch 'dev' into feature/admin-nicer	2017-12-18 15:10:36 +13:00
Brenda Wallace	4c35987cb7	Ignore long method in ability.rb	2017-12-17 17:57:19 +13:00
Brenda Wallace	54e0806f38	don't check role is there's no member	2017-12-17 17:55:14 +13:00
Brenda Wallace	99828c7c01	Updated spec for new admin#index	2017-12-17 17:54:13 +13:00
Brenda Wallace	25d2773464	Use nested module/class definitions instead of compact style.	2017-12-17 17:50:30 +13:00
Brenda Wallace	233a30a045	Haml code style fix up	2017-12-17 17:49:05 +13:00
Brenda Wallace	01a7463ae8	Split up ability.rb into methods	2017-12-17 12:47:41 +13:00
Brenda Wallace	8a446ecbfc	Member admin	2017-12-17 12:45:19 +13:00
Brenda Wallace	efc60e6313	Nicer layout on editing roles	2017-12-17 12:11:55 +13:00
Brenda Wallace	406b2dbf04	Make admin index a bit nicer	2017-12-17 12:06:03 +13:00
Brenda Wallace	2394f4d237	One view for showing photos on an item	2017-12-17 11:40:55 +13:00
Brenda Wallace	6f2b4b13cd	Only show photo pagination if there are photos	2017-12-17 09:55:52 +13:00
Brenda Wallace	970da53873	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-17 09:15:24 +13:00
Brenda Wallace	3aa2f0bd3b	Paginate photos on seeds#show (inc feature specs)	2017-12-17 08:55:08 +13:00
Shiny	8c1514bc04	Merge branch 'dev' into feature/photos-1457	2017-12-15 17:13:12 +13:00
Brenda Wallace	3d3a3b669e	Order posts by most recent	2017-12-15 13:28:41 +13:00
Brenda Wallace	8697e56323	Order the plantings on the front page	2017-12-15 13:26:48 +13:00