mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 06:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,310 Commits 61 Branches 82 Tags
d91a5bf55f75e8fb3cf3d692ddd1d3ea2c1ebd28
Commit Graph

7310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
d91a5bf55f Rewriting messages functionality to use mail boxer 2019-07-20 19:43:29 +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
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
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
dependabot-preview[bot]
2dfef909bd Bump chartkick from 3.2.0 to 3.2.1 
Bumps [chartkick](https://github.com/ankane/chartkick) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/ankane/chartkick/releases)
- [Changelog](https://github.com/ankane/chartkick/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/chartkick/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-16 10:53:06 +00:00
Brenda Wallace
c3ee80f24b Merge pull request #2085 from Br3nda/renamed-photographings-associations 
Renamed photographings to photo associations
 2019-07-16 17:55:33 +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
3cd67bcc9f Fix liked photo spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
efe14d43cb read photo from a harvest's planting 2019-07-15 11:58:46 +00:00
Brenda Wallace
99c119c07f fixed looking up photo counts in spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
60a510e73f tests the default photo changes when someone likes a photo 2019-07-15 11:58:46 +00:00
Brenda Wallace
b1ebf67960 added more possible photo associations in photo model spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
32695e3241 photos behave like likeable 2019-07-15 11:58:46 +00:00
Brenda Wallace
2879979db4 tests that likes are deleted when their photo is deleted 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
9413d86b05 fixes percy error, running same snapshot more than once 2019-07-15 11:58:46 +00:00
Brenda Wallace
d4cfcb37ba more percy specs 2019-07-15 11:58:46 +00:00
Brenda Wallace
5348cb6fb5 Merge branch 'master' into dev 2019-07-15 23:56:25 +12:00
dependabot-preview[bot]
485b637e04 Bump rubocop-rails from 2.2.0 to 2.2.1 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.2.0...v2.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 09:04:21 +00:00
Brenda Wallace
1947b01c40 Merge pull request #2076 from Growstuff/dev 
Release 57
 2019-07-14 17:53:42 +12: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
dependabot-preview[bot]
117d066917 Bump puma from 4.0.0 to 4.0.1 
Bumps [puma](https://github.com/puma/puma) from 4.0.0 to 4.0.1.
- [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.0...v4.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 14:52:22 +00:00
dependabot-preview[bot]
3a746e7755 Bump font-awesome-sass from 5.8.1 to 5.9.0 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.8.1 to 5.9.0.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.8.1...5.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-12 11:31:08 +00:00
Brenda Wallace
a4fd0bd011 Merge pull request #2075 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.10 
Bump jsonapi-resources from 0.9.9 to 0.9.10
 2019-07-12 12:27:19 +12:00
Brenda Wallace
004319b97c Merge pull request #2049 from Br3nda/likeable-photos 
likes for photos
 2019-07-12 12:26:05 +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
013860ba5a specs for liking photos from crops#show and photos#index 2019-07-12 11:57:21 +12:00
Brenda Wallace
c9f9315d8d specs for liking photos from photos#show 2019-07-12 11:29:47 +12:00
Brenda Wallace
a7acaea03d Update posts liking spec to find where the count moved to 2019-07-12 10:47:48 +12:00
Brenda Wallace
76260fec1d Merge branch 'dev' into likeable-photos 2019-07-12 10:20:05 +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
addb9a48cf Fix growstuff markdown specs to expect path only links 2019-07-11 15:12:16 +00:00