mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-05 14:47:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
c173d359d8 Split up giant member model 2019-08-12 10:00:21 +12:00
Brenda Wallace
c77742abab Wrapped long line 2019-08-12 09:51:05 +12:00
Brenda Wallace
295eb57a86 Merge branch 'dev' into mailbox 2019-08-12 09:42:55 +12:00
Brenda Wallace
522bec7775 Merge pull request #2129 from Growstuff/awesomecode-lint-ruby-space-36545 
Auto corrected by following Lint Ruby Space
 2019-08-12 09:42:29 +12:00
Brenda Wallace
df87a79ab6 Only send email if user wants them 2019-08-12 09:40:53 +12:00
Awesome Code
924e96eda1 Auto corrected by following Lint Ruby Space 2019-08-11 21:39:46 +00:00
dependabot-preview[bot]
0dfe8abd51 [Security] Bump nokogiri from 1.10.3 to 1.10.4 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.3 to 1.10.4. **This update includes a security fix.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-11 21:38:33 +00:00
Brenda Wallace
222400d4e1 links to member from conversations#index 2019-08-11 20:55:20 +12:00
Brenda Wallace
109f9af0b9 Unread counts 2019-08-11 17:04:52 +12:00
Brenda Wallace
c189e4ed3d Bigger envelope icons on conversations#index 2019-08-11 16:55:32 +12:00
Brenda Wallace
44d8cd0f63 Copy timestamps from Notifications to Conversations 2019-08-11 16:55:15 +12:00
Brenda Wallace
11ef0fb694 Removed test for unused method 2019-08-11 16:31:51 +12:00
Brenda Wallace
e01b53fd9b Remove extra validators on notification 
We are migrating away from here
 2019-08-11 15:52:11 +12:00
Brenda Wallace
3c073a950a Reducing size of member model 2019-08-11 15:50:48 +12:00
Brenda Wallace
c4b33db495 Mark read notifications as read after migrating to conversations 2019-08-11 15:50:36 +12:00
Brenda Wallace
031734bb7f shorten method 2019-08-11 14:24:43 +12:00
Brenda Wallace
3976d1a982 Shorten method 2019-08-11 14:24:17 +12:00
Brenda Wallace
105c2639e4 Adding timestamps to tables 2019-08-11 14:23:27 +12:00
Brenda Wallace
4f74b20565 Migrate from notifications to conversations without sending emails 2019-08-11 14:17:30 +12:00
Brenda Wallace
0d370603b7 Rename spec from Notifications to Conversations 2019-08-11 13:39:00 +12:00
Brenda Wallace
2a3563f9fd Migration from notifications to mailboxer 2019-08-11 13:37:56 +12:00
Brenda Wallace
5d7ef7e861 rubocop lint 2019-08-10 17:30:41 +12:00
Brenda Wallace
083d7c09e6 Migration of notifications to mailboxer, without sending new emails 2019-08-10 17:30:24 +12:00
Brenda Wallace
d76c77d176 Merge branch 'dev' into mailbox 2019-08-10 16:34:43 +12:00
Brenda Wallace
f676054cd6 switch to member.discard 2019-08-10 16:09:57 +12:00
Brenda Wallace
82a3cc35a4 Fix member discarding to match specs 2019-08-10 15:43:06 +12:00
Brenda Wallace
1872bff346 Restore notifier 
not hooked up to mailboxer yet
 2019-08-10 12:09:23 +12:00
Brenda Wallace
b3807100d1 fixes email sending 2019-08-10 11:47:45 +12:00
Brenda Wallace
d4644ccdf8 Added join to members to fix error caused by discard gem 2019-08-10 11:37:52 +12:00
Brenda Wallace
5226eadfd8 fix crop join to members 2019-08-10 11:07:12 +12:00
Brenda Wallace
843e15a107 Removed notification view spec 2019-08-10 10:53:20 +12:00
Brenda Wallace
86540c3352 Removed feature plantings code and spec 
because it's not used
 2019-08-10 10:52:49 +12:00
Brenda Wallace
0a919d8599 Remove notifications spec 2019-08-10 10:50:57 +12:00
Brenda Wallace
c137d5e285 update signin spec to use messages and converations 2019-08-10 10:48:48 +12:00
Brenda Wallace
9de51d8a9a Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-08-10 10:39:59 +12:00
Brenda Wallace
c29f0c15ee don't join to owners when fetching gardens 
discard isn't the same
 2019-08-10 10:39:40 +12:00
dependabot-preview[bot]
b726d0c9bf Bump puma from 4.0.1 to 4.1.0 
Bumps [puma](https://github.com/puma/puma) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.0.1...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-09 21:16:24 +00:00
Brenda Wallace
2764c3f0e0 Merge branch 'dev' into mailbox 2019-08-09 22:33:22 +12:00
Brenda Wallace
1dfbecfac0 Don't re-look up planting 2019-08-09 22:32:36 +12:00
dependabot-preview[bot]
b33ab3bd71 Bump js-routes from 1.4.7 to 1.4.9 
Bumps [js-routes](https://github.com/railsware/js-routes) from 1.4.7 to 1.4.9.
- [Release notes](https://github.com/railsware/js-routes/releases)
- [Changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md)
- [Commits](https://github.com/railsware/js-routes/compare/v1.4.7...v1.4.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-08 00:01:50 +00:00
Brenda Wallace
b04bdd111a Merge remote-tracking branch 'upstream/dev' into mailbox 
Conflicts:
	app/views/harvests/show.html.haml
 2019-08-08 11:23:41 +12:00
Brenda Wallace
e49878ff7f Delete stale.yml 2019-08-08 11:15:36 +12:00
Brenda Wallace
523eda01a0 Merge branch 'master' into dev 2019-08-08 11:15:22 +12:00
Brenda Wallace
8641c13c06 Merge pull request #2112 from Br3nda/harvest-show 
Tidy up display of harvests#show
 2019-08-08 11:14:49 +12:00
Brenda Wallace
548bc1581a Removing notification mailer spec 2019-08-08 10:21:39 +12:00
Brenda Wallace
4a81b18159 Merge remote-tracking branch 'origin/mailbox' into mailbox 2019-08-08 09:32:09 +12:00
Brenda Wallace
12c1002dc6 Removing unused notifications code 2019-08-08 09:31:53 +12:00
Brenda Wallace
0fa1966c68 Merge branch 'dev' into mailbox 2019-08-08 09:25:30 +12:00
dependabot-preview[bot]
6ebd22c8a3 Bump percy-capybara from 4.0.1 to 4.0.2 
Bumps [percy-capybara](https://github.com/percy/percy-capybara) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/percy/percy-capybara/releases)
- [Commits](https://github.com/percy/percy-capybara/compare/v4.0.1...v4.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 13:47:07 +00:00
dependabot-preview[bot]
4306ab12c7 Bump haml from 5.1.1 to 5.1.2 
Bumps [haml](https://github.com/haml/haml) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/haml/haml/releases)
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/haml/haml/compare/v5.1.1...v5.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-07 13:20:56 +00:00