Commit Graph

  • e309548d20 mark required fields on a message Brenda Wallace 2019-07-21 19:16:07 +12:00
  • 6485bde8e7 show harvest owner Brenda Wallace 2019-07-21 19:15:45 +12:00
  • 36c4c1e971 use message path instead of notifications Brenda Wallace 2019-07-21 19:14:22 +12:00
  • bcd95aab4a removed unused partial Brenda Wallace 2019-07-21 19:14:02 +12:00
  • 754da0777a preserve which box we're looking at while deleting messages Brenda Wallace 2019-07-21 19:13:51 +12:00
  • d382f84f9b Remove notifications code Brenda Wallace 2019-07-21 17:28:04 +12:00
  • 6144a7c065 tidy display of discard member on admin page Brenda Wallace 2019-07-21 17:26:45 +12:00
  • eda3639708 Discard members on ban Brenda Wallace 2019-07-21 17:23:28 +12:00
  • c4806fddf3 re-coloured the memberships to green Brenda Wallace 2019-07-21 17:21:36 +12:00
  • 39dc878ea7 Tidy up styling of conversations#index Brenda Wallace 2019-07-21 17:15:21 +12:00
  • f9f1846bce Using chip on plantings cards Brenda Wallace 2019-07-21 16:59:59 +12:00
  • e77e806efc turn members/tiny into a "chip" Brenda Wallace 2019-07-21 16:59:26 +12:00
  • 67ce5265b4 Migrate from paranoia to discard Brenda Wallace 2019-07-21 16:58:57 +12:00
  • 7f16fdfe53 working on display of messages in conversations Brenda Wallace 2019-07-21 15:29:54 +12:00
  • 1df84beb6d introduce pretty chips for members Brenda Wallace 2019-07-21 15:29:39 +12:00
  • dab9a96486 better handling of deleted members Brenda Wallace 2019-07-21 14:47:32 +12:00
  • ecb8ad9dfd removing unused code Brenda Wallace 2019-07-21 14:24:02 +12:00
  • 1e7eb7326f rubocop linter Brenda Wallace 2019-07-21 14:22:32 +12:00
  • 48117eab43 Merge branch 'mailbox' of github.com:br3nda/growstuff into mailbox Brenda Wallace 2019-07-21 11:25:46 +12:00
  • a4e0ed0d8d Fixed deleted imports Brenda Wallace 2019-07-21 11:25:37 +12:00
  • 53358e9769 Merge branch 'dev' into mailbox Brenda Wallace 2019-07-21 10:14:36 +12:00
  • 7d9cbe9bf7 Merge branch 'dev' into UTFGardenNames Brenda Wallace 2019-07-21 10:14:03 +12:00
  • 93a171b1b2 Create stale.yml Brenda Wallace 2019-07-21 10:13:30 +12:00
  • 1199df6d9d Merge branch 'dev' into mailbox Brenda Wallace 2019-07-20 19:44:12 +12:00
  • d91a5bf55f Rewriting messages functionality to use mail boxer Brenda Wallace 2019-07-20 19:43:29 +12:00
  • 66f1133e9b Merge pull request #2090 from Growstuff/dev Brenda Wallace 2019-07-20 14:02:51 +12:00
  • e25e03a2e9 Merge pull request #2097 from Br3nda/fix/notifications Brenda Wallace 2019-07-20 13:22:54 +12:00
  • b3cc365941 Merge pull request #2095 from Br3nda/ban-hammer Brenda Wallace 2019-07-20 13:22:36 +12:00
  • 49b6261f87 Merge branch 'dev' into fix/notifications Brenda Wallace 2019-07-20 13:22:21 +12:00
  • 26839acf01 Turn off message sending until errors are fixed Brenda Wallace 2019-07-20 13:21:26 +12:00
  • 339b3fd57e Moving to conversations and messages instead of notifications Brenda Wallace 2019-07-20 13:21:05 +12:00
  • 097555ec06 View for messages Brenda Wallace 2019-07-20 13:20:24 +12:00
  • 629352ef4f Merge remote-tracking branch 'upstream/dev' into mailbox Brenda Wallace 2019-07-20 13:20:10 +12:00
  • f0ec158053 Bump webdrivers from 4.1.0 to 4.1.1 dependabot-preview[bot] 2019-07-19 07:15:47 +00:00
  • e4512beb03 Bump oj from 3.7.12 to 3.8.0 dependabot-preview[bot] 2019-07-18 16:23:55 +00:00
  • 314d95869a Merge branch 'dev' into fix/notifications Brenda Wallace 2019-07-18 12:57:36 +12:00
  • 64fa4584b9 Bump rubocop from 0.72.0 to 0.73.0 dependabot-preview[bot] 2019-07-17 20:29:38 +00:00
  • b7175a2e32 [Security] Bump mini_magick from 4.9.3 to 4.9.4 dependabot-preview[bot] 2019-07-17 09:31:43 +00:00
  • 40b6ba6b1a Merge branch 'dev' into ban-hammer Brenda Wallace 2019-07-17 16:47:05 +12:00
  • 7f45b194e9 Update app/views/notifications/show.html.haml Brenda Wallace 2019-07-17 11:47:24 +12:00
  • a3b287fa3b Merge branch 'fix/notifications' of github.com:br3nda/growstuff into fix/notifications Brenda Wallace 2019-07-17 10:38:23 +12:00
  • 608cad2615 Fix variable name Brenda Wallace 2019-07-17 10:22:35 +12:00
  • fb7d8aa9c2 Merge branch 'dev' into fix/notifications Brenda Wallace 2019-07-17 09:30:28 +12:00
  • f46cc31515 Bump capybara from 3.25.0 to 3.26.0 dependabot-preview[bot] 2019-07-16 10:54:48 +00:00
  • ac6ef384e0 Merge branch 'master' into fix/notifications Brenda Wallace 2019-07-17 09:24:04 +12:00
  • c8a721c304 Fixes error displaying messages from deleted members Brenda Wallace 2019-07-17 09:22:25 +12:00
  • e0dcd0226e Handle messages from deleted members Brenda Wallace 2019-07-17 09:09:16 +12:00
  • 42269e3261 Comment out member avatar until we work out why it's breaking Brenda Wallace 2019-07-17 08:37:54 +12:00
  • 4ce2eca670 Comment out member avatar until we work out why it's breaking Brenda Wallace 2019-07-17 08:37:54 +12:00
  • 6ffc61aace Merge branch 'ban-hammer' of github.com:br3nda/growstuff into ban-hammer Brenda Wallace 2019-07-16 23:11:44 +12:00
  • 312cd0d770 Read posts from member.posts Brenda Wallace 2019-07-16 23:10:01 +12:00
  • 560936eb13 Merge branch 'dev' into ban-hammer Brenda Wallace 2019-07-16 23:05:28 +12:00
  • 2dfef909bd Bump chartkick from 3.2.0 to 3.2.1 dependabot-preview[bot] 2019-07-16 07:15:22 +00:00
  • 91897273be Merge branch 'dev' into ban-hammer Brenda Wallace 2019-07-16 20:56:59 +12:00
  • fb77beeb7d rubocop lint Brenda Wallace 2019-07-16 20:56:33 +12:00
  • bf77d4b913 removed test for @posts variables on members controller Brenda Wallace 2019-07-16 20:55:09 +12:00
  • c8e47e800e Moved admin ban code to admin controler Brenda Wallace 2019-07-16 20:54:32 +12:00
  • b2537638ed Move member banning to admin/members controller Brenda Wallace 2019-07-16 18:56:49 +12:00
  • 006c7f02f5 feature specs for banning a member Brenda Wallace 2019-07-16 18:31:53 +12:00
  • 8827fb1291 go to admin_members_path after banning a member Brenda Wallace 2019-07-16 18:31:43 +12:00
  • 29823fd953 Make the follow button stand out Brenda Wallace 2019-07-16 18:18:14 +12:00
  • 72d5d2e81a Match role names to names in the seeds Brenda Wallace 2019-07-16 18:17:57 +12:00
  • 0622823816 Remove unused db lookup Brenda Wallace 2019-07-16 18:17:37 +12:00
  • 075b9b3327 Add a ban button to members Brenda Wallace 2019-07-16 18:15:54 +12:00
  • c3ee80f24b Merge pull request #2085 from Br3nda/renamed-photographings-associations Brenda Wallace 2019-07-16 17:55:33 +12:00
  • b82c0ab9f1 Merge branch 'dev' into renamed-photographings-associations Daniel O'Connor 2019-07-16 12:45:25 +09:30
  • 2162c11280 Couple breadcrumbs tidied Brenda Wallace 2019-07-15 13:49:10 +12:00
  • 548bbf5e57 Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations Brenda Wallace 2019-07-16 12:12:16 +12:00
  • 3cd67bcc9f Fix liked photo spec Brenda Wallace 2019-07-12 22:27:55 +12:00
  • efe14d43cb read photo from a harvest's planting Brenda Wallace 2019-07-12 16:36:54 +12:00
  • 99c119c07f fixed looking up photo counts in spec Brenda Wallace 2019-07-12 15:29:05 +12:00
  • 60a510e73f tests the default photo changes when someone likes a photo Brenda Wallace 2019-07-12 15:21:18 +12:00
  • b1ebf67960 added more possible photo associations in photo model spec Brenda Wallace 2019-07-12 15:13:10 +12:00
  • 32695e3241 photos behave like likeable Brenda Wallace 2019-07-12 15:08:39 +12:00
  • 2879979db4 tests that likes are deleted when their photo is deleted Brenda Wallace 2019-07-12 15:08:02 +12:00
  • b654fd483b counter cache was on the wrong side of the relationship Brenda Wallace 2019-07-12 15:07:41 +12:00
  • d8df4338a7 DRY garden model - get default photo from photo_capable concern Brenda Wallace 2019-07-12 13:21:36 +12:00
  • e5e54d651b Remove duplicate and unused photo methods Brenda Wallace 2019-07-12 13:18:18 +12:00
  • acf58fc5e2 Choose crop photos by most liked Brenda Wallace 2019-07-12 13:08:23 +12:00
  • 9413d86b05 fixes percy error, running same snapshot more than once Brenda Wallace 2019-07-11 12:14:54 +12:00
  • d4cfcb37ba more percy specs Brenda Wallace 2019-07-11 12:08:15 +12:00
  • 5348cb6fb5 Merge branch 'master' into dev Brenda Wallace 2019-07-15 23:56:25 +12:00
  • 485b637e04 Bump rubocop-rails from 2.2.0 to 2.2.1 dependabot-preview[bot] 2019-07-15 08:52:06 +00:00
  • 1947b01c40 Merge pull request #2076 from Growstuff/dev Brenda Wallace 2019-07-14 17:53:42 +12:00
  • e0e10c29dc Renaming photographings to photo associations Brenda Wallace 2019-07-11 12:08:15 +12:00
  • 117d066917 Bump puma from 4.0.0 to 4.0.1 dependabot-preview[bot] 2019-07-12 11:32:47 +00:00
  • 3a746e7755 Bump font-awesome-sass from 5.8.1 to 5.9.0 dependabot-preview[bot] 2019-07-12 09:30:15 +00:00
  • a4fd0bd011 Merge pull request #2075 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.10 Brenda Wallace 2019-07-12 12:27:19 +12:00
  • 004319b97c Merge pull request #2049 from Br3nda/likeable-photos Brenda Wallace 2019-07-12 12:26:05 +12:00
  • 6816fb9072 Added missing semicolon in scss Brenda Wallace 2019-07-12 12:01:26 +12:00
  • 1b87026df4 Use camel case in js Brenda Wallace 2019-07-12 11:59:48 +12:00
  • 80ee3eb8f1 Newline at end of file Brenda Wallace 2019-07-12 11:59:24 +12:00
  • 013860ba5a specs for liking photos from crops#show and photos#index Brenda Wallace 2019-07-12 11:55:43 +12:00
  • c9f9315d8d specs for liking photos from photos#show Brenda Wallace 2019-07-12 11:29:47 +12:00
  • a7acaea03d Update posts liking spec to find where the count moved to Brenda Wallace 2019-07-12 10:47:48 +12:00
  • 76260fec1d Merge branch 'dev' into likeable-photos Brenda Wallace 2019-07-12 10:20:05 +12:00
  • 9686305857 The like icons are now the buttons Brenda Wallace 2019-07-12 10:13:24 +12:00
  • a87248a43e DRY up detecting if photo/post already liked Brenda Wallace 2019-07-12 09:42:45 +12:00
  • b36e80bbad Use our own class to indicate liked Brenda Wallace 2019-07-12 09:37:44 +12:00
  • 2b1895968b reverting a line Brenda Wallace 2019-07-12 09:32:03 +12:00