2518 Commits

Author	SHA1	Message	Date
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
Brenda Wallace	25e9ef892d	Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457	2017-12-14 08:45:40 +13:00
Shiny	82149d4565	Merge branch 'dev' into feature/photos-1457	2017-12-14 08:44:31 +13:00
Brenda Wallace	fcd3e36e36	Removed commented out code	2017-12-14 08:42:51 +13:00
pozorvlak	e8b5850bfe	Merge branch 'dev' into planting-harvests	2017-12-13 10:57:40 +00:00
Brenda Wallace	1c8b75b7cb	add and show photos for seeds ... close #1457	2017-12-13 22:34:16 +13:00
Brenda Wallace	1f66df0743	Fixed link to associated flickr, twitter, facebook accountss ... fixes #1479	2017-12-13 22:23:22 +13:00
Brenda Wallace	72f52230a1	Fix Growstuff::OauthSignupAction not found error when connecting flickr account	2017-12-13 22:19:41 +13:00
Brenda Wallace	08dc2a0513	Show photos of a planting's harvests	2017-12-09 22:24:51 +13:00
Brenda Wallace	14551b6ec8	Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 ... Conflicts: spec/models/crop_spec.rb	2017-12-09 20:59:20 +13:00
Shiny	96bb345ca9	Merge branch 'dev' into ordering	2017-12-08 20:20:27 +13:00
Brenda Wallace	ac07f18b2d	Show most recent seeds first	2017-12-07 15:00:16 +13:00
Brenda Wallace	4ce3e8968f	crops#show order posts by most recent first	2017-12-07 14:58:57 +13:00
Brenda Wallace	cd35538b83	Order forums by name	2017-12-07 13:42:48 +13:00
Brenda Wallace	35d8461811	Order recent plantings by when they were planted	2017-12-07 13:39:32 +13:00
Brenda Wallace	8d03a3ffa8	Most recent photos is a crop's default photo	2017-12-06 21:47:01 +13:00
Brenda Wallace	24f18f78da	use bare percent literals	2017-12-06 14:33:51 +13:00
Brenda Wallace	182c626226	Prefer if/unless modifier	2017-12-06 14:23:12 +13:00
Brenda Wallace	ea2fcd09dc	Fixed last old style word array	2017-12-06 14:18:51 +13:00
Brenda Wallace	515325c44e	Fixed up % delimiters	2017-12-06 14:14:31 +13:00
Brenda Wallace	2d00206abf	Converted sprintf to format	2017-12-06 14:10:26 +13:00
Brenda Wallace	a6a7f789a3	Rubocop upgrade (and some style fixes)	2017-12-01 21:07:39 +13:00
Brenda Wallace	14b16b0d8c	Moved photo.items's item lookup to a class method	2017-11-30 11:23:34 +13:00
Brenda Wallace	697779e67c	Don't add item to photo is already there	2017-11-30 10:15:05 +13:00
Brenda Wallace	ff57176d60	Simplified the photos controller a bit	2017-11-29 22:13:03 +13:00
Brenda Wallace	12700d6268	Added polymorphic relationship to photos	2017-11-29 21:41:22 +13:00
Brenda Wallace	a62b668781	Fix up duplicate order item in controller spec, and DRY	2017-11-29 20:59:37 +13:00
Brenda Wallace	d7ec4eacee	Fix sort on plant parts	2017-11-29 20:59:37 +13:00
Brenda Wallace	3a3f4eefbf	Added sort to members controller	2017-11-29 20:59:37 +13:00
Brenda Wallace	9e00023332	Fixed post ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	e3886ce5b5	Fixed up unescaped model attribute	2017-11-29 20:59:37 +13:00
Brenda Wallace	48f8085e2d	Fix seeds order	2017-11-29 20:59:37 +13:00
Brenda Wallace	594e466fd4	Fixed photos ordering	2017-11-29 20:59:37 +13:00
Brenda Wallace	d0b8ae3411	Delete follows records when a member is deleted	2017-11-29 20:59:37 +13:00