3605 Commits

Author	SHA1	Message	Date
Brenda Wallace	abdfbdd3b1	Merge branch 'dev' into harvest-show	2019-07-29 10:25:33 +12:00
Brenda Wallace	4859116577	Tidy up display of harvests#show	2019-07-29 10:15:06 +12:00
Brenda Wallace	e25e03a2e9	Merge pull request #2097 from Br3nda/fix/notifications ... Fix display of messages from deleted members	2019-07-20 13:22:54 +12:00
Brenda Wallace	7f45b194e9	Update app/views/notifications/show.html.haml	2019-07-17 11:47:24 +12:00
Brenda Wallace	608cad2615	Fix variable name	2019-07-17 10:22:35 +12:00
Brenda Wallace	ac6ef384e0	Merge branch 'master' into fix/notifications ... Conflicts: app/views/notifications/index.html.haml	2019-07-17 09:24:04 +12:00
Brenda Wallace	c8a721c304	Fixes error displaying messages from deleted members	2019-07-17 09:22:25 +12:00
Brenda Wallace	e0dcd0226e	Handle messages from deleted members	2019-07-17 09:09:16 +12:00
Brenda Wallace	42269e3261	Comment out member avatar until we work out why it's breaking	2019-07-17 08:56:29 +12:00
Brenda Wallace	4ce2eca670	Comment out member avatar until we work out why it's breaking	2019-07-17 08:37:54 +12:00
Brenda Wallace	312cd0d770	Read posts from member.posts	2019-07-16 23:10:01 +12:00
Brenda Wallace	91897273be	Merge branch 'dev' into ban-hammer	2019-07-16 20:56:59 +12:00
Brenda Wallace	fb77beeb7d	rubocop lint	2019-07-16 20:56:33 +12:00
Brenda Wallace	c8e47e800e	Moved admin ban code to admin controler	2019-07-16 20:54:32 +12:00
Brenda Wallace	b2537638ed	Move member banning to admin/members controller	2019-07-16 18:56:49 +12:00
Brenda Wallace	8827fb1291	go to admin_members_path after banning a member	2019-07-16 18:31:43 +12:00
Brenda Wallace	29823fd953	Make the follow button stand out	2019-07-16 18:18:14 +12:00
Brenda Wallace	0622823816	Remove unused db lookup	2019-07-16 18:17:37 +12:00
Brenda Wallace	075b9b3327	Add a ban button to members	2019-07-16 18:15:54 +12:00
Daniel O'Connor	b82c0ab9f1	Merge branch 'dev' into renamed-photographings-associations	2019-07-16 12:45:25 +09:30
Brenda Wallace	2162c11280	Couple breadcrumbs tidied	2019-07-16 03:15:04 +00:00
Brenda Wallace	548bbf5e57	Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations ... Conflicts: db/schema.rb	2019-07-16 12:12:16 +12:00
Brenda Wallace	efe14d43cb	read photo from a harvest's planting	2019-07-15 11:58:46 +00:00
Brenda Wallace	b654fd483b	counter cache was on the wrong side of the relationship	2019-07-15 11:58:46 +00:00
Brenda Wallace	d8df4338a7	DRY garden model - get default photo from photo_capable concern	2019-07-15 11:58:46 +00:00
Brenda Wallace	e5e54d651b	Remove duplicate and unused photo methods	2019-07-15 11:58:46 +00:00
Brenda Wallace	acf58fc5e2	Choose crop photos by most liked	2019-07-15 11:58:46 +00:00
Brenda Wallace	e0e10c29dc	Renaming photographings to photo associations ... now it matches the name of its controller, and it is clearer to understand	2019-07-13 16:13:37 +12:00
Brenda Wallace	6816fb9072	Added missing semicolon in scss	2019-07-12 12:02:26 +12:00
Brenda Wallace	1b87026df4	Use camel case in js	2019-07-12 11:59:48 +12:00
Brenda Wallace	80ee3eb8f1	Newline at end of file	2019-07-12 11:59:24 +12:00
Brenda Wallace	c9f9315d8d	specs for liking photos from photos#show	2019-07-12 11:29:47 +12:00
Brenda Wallace	9686305857	The like icons are now the buttons	2019-07-12 10:13:24 +12:00
Brenda Wallace	a87248a43e	DRY up detecting if photo/post already liked	2019-07-12 09:42:45 +12:00
Brenda Wallace	b36e80bbad	Use our own class to indicate liked	2019-07-12 09:37:44 +12:00
Brenda Wallace	2b1895968b	reverting a line ... aparently this link works out if you've already like it	2019-07-12 09:32:03 +12:00
Brenda Wallace	af0d84d9f1	Updating likes js code	2019-07-12 09:28:45 +12:00
Brenda Wallace	7d1f9c5a3a	Most post like into a wrapper in the html	2019-07-12 08:47:22 +12:00
Brenda Wallace	80429f935a	Merge branch 'dev' into likeable-photos	2019-07-11 22:42:22 +12:00
Brenda Wallace	738644ffbc	Remove unnecesary theme param from pagination	2019-07-11 10:18:54 +00:00
Brenda Wallace	2a390f9c24	Fix sorting	2019-07-11 10:18:54 +00:00
Brenda Wallace	347417b7ed	Put newest messages at the top of the page	2019-07-11 10:18:54 +00:00
Brenda Wallace	5c69dc0528	use badges for unread message count	2019-07-11 10:18:54 +00:00
Brenda Wallace	edf4985da0	adding breadcrumbs	2019-07-11 10:18:54 +00:00
Brenda Wallace	b064d8db96	tidy up larger screen display of inbox	2019-07-11 10:18:54 +00:00
Brenda Wallace	dde6668293	Notifications responsiveness	2019-07-11 10:18:54 +00:00
Brenda Wallace	b1440041cd	Remove duplicate and empty css definitions	2019-07-11 06:18:16 +00:00
Brenda Wallace	430a29865d	Remove badge override	2019-07-11 06:18:16 +00:00
Brenda Wallace	170c7d99ac	Merge branch 'dev' into likeable-photos	2019-07-11 08:42:07 +12:00
Brenda Wallace	3e4a9f0292	Ebay link using https	2019-07-10 09:03:05 +00:00