mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 733a8642dd rubocop lint 2019-07-21 19:19:14 +12:00
Brenda Wallace 965c9af15a Sort scss lines 2019-07-21 19:18:13 +12:00
Brenda Wallace 3f84f5abe1 harvest owner info 2019-07-21 19:16:22 +12:00
Brenda Wallace e309548d20 mark required fields on a message 2019-07-21 19:16:07 +12:00
Brenda Wallace 6485bde8e7 show harvest owner 2019-07-21 19:15:45 +12:00
Brenda Wallace 36c4c1e971 use message path instead of notifications 2019-07-21 19:14:22 +12:00
Brenda Wallace bcd95aab4a removed unused partial 2019-07-21 19:14:02 +12:00
Brenda Wallace 754da0777a preserve which box we're looking at while deleting messages 2019-07-21 19:13:51 +12:00
Brenda Wallace d382f84f9b Remove notifications code 2019-07-21 17:28:04 +12:00
Brenda Wallace 6144a7c065 tidy display of discard member on admin page 2019-07-21 17:26:45 +12:00
Brenda Wallace eda3639708 Discard members on ban 2019-07-21 17:23:28 +12:00
Brenda Wallace c4806fddf3 re-coloured the memberships to green 2019-07-21 17:21:36 +12:00
Brenda Wallace 39dc878ea7 Tidy up styling of conversations#index 2019-07-21 17:15:21 +12:00
Brenda Wallace f9f1846bce Using chip on plantings cards 
(made room by shrinking the date)
 2019-07-21 16:59:59 +12:00
Brenda Wallace e77e806efc turn members/tiny into a "chip" 2019-07-21 16:59:26 +12:00
Brenda Wallace 67ce5265b4 Migrate from paranoia to discard 
closes #1995
 2019-07-21 16:59:06 +12:00
Brenda Wallace 7f16fdfe53 working on display of messages in conversations 2019-07-21 15:29:54 +12:00
Brenda Wallace 1df84beb6d introduce pretty chips for members 2019-07-21 15:29:39 +12:00
Brenda Wallace dab9a96486 better handling of deleted members 2019-07-21 14:47:32 +12:00
Brenda Wallace ecb8ad9dfd removing unused code 2019-07-21 14:24:02 +12:00
Brenda Wallace 1e7eb7326f rubocop linter 2019-07-21 14:23:02 +12:00
Brenda Wallace 48117eab43 Merge branch 'mailbox' of github.com:br3nda/growstuff into mailbox 2019-07-21 11:25:46 +12:00
Brenda Wallace a4e0ed0d8d Fixed deleted imports 2019-07-21 11:25:37 +12:00
Brenda Wallace 53358e9769 Merge branch 'dev' into mailbox 2019-07-21 10:14:36 +12:00
Brenda Wallace 7d9cbe9bf7 Merge branch 'dev' into UTFGardenNames 2019-07-21 10:14:03 +12:00
Brenda Wallace 93a171b1b2 Create stale.yml 2019-07-21 10:13:30 +12:00
Brenda Wallace 1199df6d9d Merge branch 'dev' into mailbox 2019-07-20 19:44:12 +12:00
Brenda Wallace d91a5bf55f Rewriting messages functionality to use mail boxer 2019-07-20 19:43:29 +12:00
Brenda Wallace 66f1133e9b Merge pull request #2090 from Growstuff/dev 
Release 58
 2019-07-20 14:02:51 +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 b3cc365941 Merge pull request #2095 from Br3nda/ban-hammer 
Ban hammer
 2019-07-20 13:22:36 +12:00
Brenda Wallace 49b6261f87 Merge branch 'dev' into fix/notifications 2019-07-20 13:22:21 +12:00
Brenda Wallace 26839acf01 Turn off message sending until errors are fixed 2019-07-20 13:21:26 +12:00
Brenda Wallace 339b3fd57e Moving to conversations and messages instead of notifications 2019-07-20 13:21:05 +12:00
Brenda Wallace 097555ec06 View for messages 2019-07-20 13:20:24 +12:00
Brenda Wallace 629352ef4f Merge remote-tracking branch 'upstream/dev' into mailbox 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/application.scss
	db/schema.rb
 2019-07-20 13:20:10 +12:00
dependabot-preview[bot] f0ec158053 Bump webdrivers from 4.1.0 to 4.1.1 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.0...v4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 20:25:54 +00:00
dependabot-preview[bot] e4512beb03 Bump oj from 3.7.12 to 3.8.0 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.8.0.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-19 00:37:34 +00:00
Brenda Wallace 314d95869a Merge branch 'dev' into fix/notifications 2019-07-18 12:57:36 +12:00
dependabot-preview[bot] 64fa4584b9 Bump rubocop from 0.72.0 to 0.73.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.72.0 to 0.73.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.72.0...v0.73.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 21:23:37 +00:00
dependabot-preview[bot] b7175a2e32 [Security] Bump mini_magick from 4.9.3 to 4.9.4 
Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.9.3 to 4.9.4. **This update includes security fixes.**
- [Release notes](https://github.com/minimagick/minimagick/releases)
- [Commits](https://github.com/minimagick/minimagick/compare/v4.9.3...v4.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-17 20:28:03 +00:00
Brenda Wallace 40b6ba6b1a Merge branch 'dev' into ban-hammer 2019-07-17 16:47:05 +12:00
Brenda Wallace 7f45b194e9 Update app/views/notifications/show.html.haml 2019-07-17 11:47:24 +12:00
Brenda Wallace a3b287fa3b Merge branch 'fix/notifications' of github.com:br3nda/growstuff into fix/notifications 2019-07-17 10:38:23 +12:00
Brenda Wallace 608cad2615 Fix variable name 2019-07-17 10:22:35 +12:00
Brenda Wallace fb7d8aa9c2 Merge branch 'dev' into fix/notifications 2019-07-17 09:30:28 +12:00
dependabot-preview[bot] f46cc31515 Bump capybara from 3.25.0 to 3.26.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.25.0 to 3.26.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.25.0...3.26.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 21:25:13 +00: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