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 42269e3261 Comment out member avatar until we work out why it's breaking 2019-07-17 08:56:29 +12:00
Brenda Wallace 4ce2eca670 Comment out member avatar until we work out why it's breaking 2019-07-17 08:37:54 +12:00
Brenda Wallace 6ffc61aace Merge branch 'ban-hammer' of github.com:br3nda/growstuff into ban-hammer 2019-07-16 23:11:44 +12:00
Brenda Wallace 312cd0d770 Read posts from member.posts 2019-07-16 23:10:01 +12:00
Brenda Wallace 560936eb13 Merge branch 'dev' into ban-hammer 2019-07-16 23:05:28 +12: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 91897273be Merge branch 'dev' into ban-hammer 2019-07-16 20:56:59 +12:00
Brenda Wallace fb77beeb7d rubocop lint 2019-07-16 20:56:33 +12:00
Brenda Wallace bf77d4b913 removed test for @posts variables on members controller 
because that variable isn't used so it doesn't exist anymore
 2019-07-16 20:55:09 +12:00
Brenda Wallace c8e47e800e Moved admin ban code to admin controler 2019-07-16 20:54:32 +12:00
Brenda Wallace b2537638ed Move member banning to admin/members controller 2019-07-16 18:56:49 +12:00
Brenda Wallace 006c7f02f5 feature specs for banning a member 2019-07-16 18:31:53 +12:00
Brenda Wallace 8827fb1291 go to admin_members_path after banning a member 2019-07-16 18:31:43 +12:00
Brenda Wallace 29823fd953 Make the follow button stand out 2019-07-16 18:18:14 +12:00
Brenda Wallace 72d5d2e81a Match role names to names in the seeds 2019-07-16 18:18:03 +12:00
Brenda Wallace 0622823816 Remove unused db lookup 2019-07-16 18:17:37 +12:00
Brenda Wallace 075b9b3327 Add a ban button to members 2019-07-16 18:15:54 +12: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