Commit Graph

  • cbbf84b305 Merge branch 'dev' into fix/2106-followers Brenda Wallace 2019-09-05 10:13:15 +12:00
  • dcc9e3edf3 Merge branch 'dev' into fix/2105-padding Brenda Wallace 2019-09-04 17:16:37 +12:00
  • fedfd4fd08 Bump capybara from 3.28.0 to 3.29.0 dependabot-preview[bot] 2019-09-03 08:18:47 +00:00
  • 95c7fa2d93 Bump sidekiq from 5.2.7 to 6.0.0 dependabot-preview[bot] 2019-09-02 09:52:49 +00:00
  • 64f2d208d4 Bump selenium-webdriver from 3.142.3 to 3.142.4 dependabot-preview[bot] 2019-09-02 09:54:40 +00:00
  • 6af25d2d63 Bump rubocop-rails from 2.3.1 to 2.3.2 dependabot-preview[bot] 2019-09-02 09:51:04 +00:00
  • 1ad256efa2 Bump csv_shaper from 1.3.0 to 1.3.1 dependabot-preview[bot] 2019-09-02 09:51:52 +00:00
  • a866c1f991 Bump oj from 3.9.0 to 3.9.1 dependabot-preview[bot] 2019-09-02 09:56:33 +00:00
  • 82e2b56b0d Bump faker from 2.2.0 to 2.2.1 dependabot-preview[bot] 2019-09-02 09:49:57 +00:00
  • f16921d994 Remove extra whitespace Brenda Wallace 2019-09-01 21:22:59 +12:00
  • 4e9ba4f438 Merge css class Brenda Wallace 2019-09-01 20:50:57 +12:00
  • a50b0485ac find button by class Brenda Wallace 2019-09-01 20:46:46 +12:00
  • f121f7f3fe Place map on a high zindex, but below the menu Brenda Wallace 2019-09-01 20:41:12 +12:00
  • c53015b922 Scss lint Brenda Wallace 2019-09-01 20:34:34 +12:00
  • c122aa41d3 Scss lint Brenda Wallace 2019-09-01 20:30:19 +12:00
  • 2c75f62caf Avoid using id selectors Brenda Wallace 2019-09-01 20:23:59 +12:00
  • 017a942a41 Rename classes to name codeclimate happy Brenda Wallace 2019-09-01 19:58:47 +12:00
  • e4908fe299 Removing unused styles Brenda Wallace 2019-09-01 18:42:57 +12:00
  • 2a55f61a4c Section padding Brenda Wallace 2019-09-01 16:29:50 +12:00
  • 5ded29ef7c Allow anyone to view followers - and tidy up display Brenda Wallace 2019-08-31 14:24:32 +12:00
  • 777408a6dc Merge branch 'dev' into UTFGardenNames Brenda Wallace 2019-08-29 13:53:04 +12:00
  • 22549c5b12 Bump faker from 2.1.2 to 2.2.0 dependabot-preview[bot] 2019-08-28 11:43:25 +00:00
  • 0744c35fdd Merge pull request #2148 from Growstuff/dev Brenda Wallace 2019-08-28 16:53:05 +12:00
  • f3bd2e978d Bump rubocop-rails from 2.3.0 to 2.3.1 dependabot-preview[bot] 2019-08-26 08:21:05 +00:00
  • 5b762dac85 Bump rack-protection from 2.0.6 to 2.0.7 dependabot-preview[bot] 2019-08-23 09:07:00 +00:00
  • c5aba387fe Bump rack-protection from 2.0.5 to 2.0.6 dependabot-preview[bot] 2019-08-22 08:27:06 +00:00
  • 8dfa2cb777 Bump bullet from 6.0.1 to 6.0.2 dependabot-preview[bot] 2019-08-21 09:32:29 +00:00
  • 39fde4e7c9 Merge pull request #2139 from Growstuff/dev Brenda Wallace 2019-08-21 09:17:57 +12:00
  • e3f32d8bb4 Updated specs Brenda Wallace 2019-08-19 15:46:45 +12:00
  • c6d4563edc Updated spec Brenda Wallace 2019-08-19 14:53:22 +12:00
  • 99228d8850 Add css class, so can find in test Brenda Wallace 2019-08-19 14:53:12 +12:00
  • ed4aaa1c9c Tidy up admin landing page Brenda Wallace 2019-08-19 14:49:18 +12:00
  • 4241a7c5f5 Tidy up crop wrangling page Brenda Wallace 2019-08-19 14:37:41 +12:00
  • b3520a1b3f Search for members in admin/members#index Brenda Wallace 2019-08-19 14:11:29 +12:00
  • a792b5933f Bump devise from 4.6.2 to 4.7.0 dependabot-preview[bot] 2019-08-20 08:27:44 +00:00
  • ee59a7a35c Merge pull request #2133 from Br3nda/fix/feature-spec-sessions pozorvlak 2019-08-20 15:10:42 +01:00
  • 61d0a6e635 Merge branch 'dev' into fix/feature-spec-sessions pozorvlak 2019-08-20 14:51:27 +01:00
  • 5ecc010cf5 Bump sass-rails from 5.0.7 to 5.1.0 dependabot-preview[bot] 2019-08-20 08:28:32 +00:00
  • 715f111182 Bump will_paginate from 3.1.7 to 3.1.8 dependabot-preview[bot] 2019-08-20 08:27:10 +00:00
  • ba224bacbd Bump oj from 3.8.1 to 3.9.0 dependabot-preview[bot] 2019-08-19 19:13:10 +00:00
  • a7735e77d1 Bump haml_lint from 0.32.0 to 0.33.0 dependabot-preview[bot] 2019-08-19 11:44:35 +00:00
  • 6782765581 Merge branch 'fix/feature-spec-sessions' of github.com:br3nda/growstuff into fix/feature-spec-sessions Brenda Wallace 2019-08-19 09:21:34 +12:00
  • fa5b2eea32 DRY spec Brenda Wallace 2019-08-19 09:21:28 +12:00
  • e48dae006b Delete notifications_spec.rb Brenda Wallace 2019-08-18 20:15:55 +12:00
  • 38477c9bfd Wrap admin in context Brenda Wallace 2019-08-18 16:15:47 +12:00
  • 34b399cd8e Use more signed in contexts in browse crops spec Brenda Wallace 2019-08-18 15:06:26 +12:00
  • c6894e7917 Setting linters as require: false in gemfile Brenda Wallace 2019-08-18 14:51:46 +12:00
  • 756cf1fe3a Removing unused code in specs Brenda Wallace 2019-08-18 14:51:24 +12:00
  • f3346fcadf Add rspectre gem Brenda Wallace 2019-08-18 14:31:51 +12:00
  • 626ad68bba Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions Brenda Wallace 2019-08-17 19:21:31 +12:00
  • a334ea03bf fix spec Brenda Wallace 2019-08-17 19:20:43 +12:00
  • 8595dbe7aa Merge pull request #2134 from Br3nda/debug-migration Brenda Wallace 2019-08-17 16:14:23 +12:00
  • 586bc21e93 Merge remote-tracking branch 'upstream/dev' into fix/feature-spec-sessions Brenda Wallace 2019-08-17 16:09:32 +12:00
  • cbe5871369 Send message to everyone in migration (no email tho) Brenda Wallace 2019-08-17 16:00:18 +12:00
  • 23c6c3059f Merge pull request #2103 from Br3nda/mailbox Brenda Wallace 2019-08-17 15:33:30 +12:00
  • a74891f97f Fix spec Brenda Wallace 2019-08-17 15:30:45 +12:00
  • 7a21ec31d9 wrap context in spec Brenda Wallace 2019-08-17 15:08:02 +12:00
  • 27d4ebda51 make sure there's a member to find in specs Brenda Wallace 2019-08-17 15:01:34 +12:00
  • a993eadea9 fix spec Brenda Wallace 2019-08-17 14:43:39 +12:00
  • b2d8818ae1 don't notify wranglers if there are none Brenda Wallace 2019-08-17 14:43:32 +12:00
  • 1cb0096788 fixed specs Brenda Wallace 2019-08-17 14:38:43 +12:00
  • a36d149125 sign in as member with location Brenda Wallace 2019-08-17 14:35:39 +12:00
  • c1deed70ad Keep username consistent in specs Brenda Wallace 2019-08-17 14:32:18 +12:00
  • b6f61a9af3 Merge branch 'dev' into mailbox Brenda Wallace 2019-08-17 14:27:38 +12:00
  • 34d9d33ed6 Merge pull request #2124 from Growstuff/dev Brenda Wallace 2019-08-17 14:27:02 +12:00
  • aa17f8e332 Removed unused let() Brenda Wallace 2019-08-17 14:17:05 +12:00
  • b49b7b563c Added logout after like spec Brenda Wallace 2019-08-17 14:14:58 +12:00
  • 8936933251 Shared context for signing in (and then out) in feature specs Brenda Wallace 2019-08-17 14:10:48 +12:00
  • e27cf02d96 Shared context for signing in/out on feature specs Brenda Wallace 2019-08-16 13:49:31 +12:00
  • f90a29a7a5 Bump scout_apm from 2.5.1 to 2.5.2 dependabot-preview[bot] 2019-08-14 07:56:36 +00:00
  • 8489109a87 Bump faker from 2.1.0 to 2.1.2 dependabot-preview[bot] 2019-08-12 09:36:43 +00:00
  • b7b260d8f8 Bump rubocop-rails from 2.2.1 to 2.3.0 dependabot-preview[bot] 2019-08-13 07:46:38 +00:00
  • c173d359d8 Split up giant member model Brenda Wallace 2019-08-12 10:00:21 +12:00
  • c77742abab Wrapped long line Brenda Wallace 2019-08-12 09:51:00 +12:00
  • 295eb57a86 Merge branch 'dev' into mailbox Brenda Wallace 2019-08-12 09:42:55 +12:00
  • 522bec7775 Merge pull request #2129 from Growstuff/awesomecode-lint-ruby-space-36545 Brenda Wallace 2019-08-12 09:42:29 +12:00
  • df87a79ab6 Only send email if user wants them Brenda Wallace 2019-08-12 09:40:53 +12:00
  • 924e96eda1 Auto corrected by following Lint Ruby Space Awesome Code 2019-08-11 21:39:46 +00:00
  • 0dfe8abd51 [Security] Bump nokogiri from 1.10.3 to 1.10.4 dependabot-preview[bot] 2019-08-11 21:16:59 +00:00
  • 222400d4e1 links to member from conversations#index Brenda Wallace 2019-08-11 20:55:20 +12:00
  • 109f9af0b9 Unread counts Brenda Wallace 2019-08-11 17:04:52 +12:00
  • c189e4ed3d Bigger envelope icons on conversations#index Brenda Wallace 2019-08-11 16:55:32 +12:00
  • 44d8cd0f63 Copy timestamps from Notifications to Conversations Brenda Wallace 2019-08-11 16:55:15 +12:00
  • 11ef0fb694 Removed test for unused method Brenda Wallace 2019-08-11 16:31:51 +12:00
  • e01b53fd9b Remove extra validators on notification Brenda Wallace 2019-08-11 15:52:11 +12:00
  • 3c073a950a Reducing size of member model Brenda Wallace 2019-08-11 15:50:48 +12:00
  • c4b33db495 Mark read notifications as read after migrating to conversations Brenda Wallace 2019-08-11 15:50:36 +12:00
  • 031734bb7f shorten method Brenda Wallace 2019-08-11 14:24:43 +12:00
  • 3976d1a982 Shorten method Brenda Wallace 2019-08-11 14:24:17 +12:00
  • 105c2639e4 Adding timestamps to tables Brenda Wallace 2019-08-11 14:23:27 +12:00
  • 4f74b20565 Migrate from notifications to conversations without sending emails Brenda Wallace 2019-08-11 14:17:30 +12:00
  • 0d370603b7 Rename spec from Notifications to Conversations Brenda Wallace 2019-08-11 13:39:00 +12:00
  • 2a3563f9fd Migration from notifications to mailboxer Brenda Wallace 2019-08-11 13:37:56 +12:00
  • 5d7ef7e861 rubocop lint Brenda Wallace 2019-08-10 17:30:41 +12:00
  • 083d7c09e6 Migration of notifications to mailboxer, without sending new emails Brenda Wallace 2019-08-10 17:30:24 +12:00
  • d76c77d176 Merge branch 'dev' into mailbox Brenda Wallace 2019-08-10 16:34:43 +12:00
  • f676054cd6 switch to member.discard Brenda Wallace 2019-08-10 16:09:57 +12:00
  • 82a3cc35a4 Fix member discarding to match specs Brenda Wallace 2019-08-10 15:39:07 +12:00
  • 1872bff346 Restore notifier Brenda Wallace 2019-08-10 12:09:23 +12:00
  • b3807100d1 fixes email sending Brenda Wallace 2019-08-10 11:47:45 +12:00