mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-02 19:04:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,628 Commits 67 Branches 92 Tags
f2dc2aeaa07183d5c88e9ffaee2c2bcaf45f5c63
Commit Graph
7628 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace f2dc2aeaa0 Merge branch 'dev' into feature-2207 2019-10-19 16:01:11 +13:00
Brenda Wallace 1d97250726 Merge pull request #2216 from Br3nda/wider-gardens 
Widen gardens on gardens#index
 2019-10-19 13:23:00 +13:00
Brenda Wallace ecb0c53c80 Merge branch 'dev' into feature-2207 2019-10-19 13:22:19 +13:00
Brenda Wallace 0965168750 Group previous plantings by year 2019-10-19 11:25:19 +13:00
Brenda Wallace 95affc8ca8 Merge branch 'dev' into wider-gardens 2019-10-19 10:50:16 +13:00
Brenda Wallace f50417cc04 Merge pull request #2218 from Br3nda/gem-asset-fix 
Add source for leaflet
 2019-10-19 10:49:50 +13:00
Brenda Wallace c940ba447e Add source for leaflet, fixes #2217 2019-10-19 09:47:29 +13:00
Brenda Wallace a6cb81f4d1 Widen gardens on gardens#index 2019-10-19 09:41:43 +13:00
Brenda Wallace 80b82a99fe Fix broken spec on dev 2019-10-19 09:41:09 +13:00
Brenda Wallace fd39d6ef8c More per page 2019-10-08 15:54:53 +13:00
Brenda Wallace ca0915585c Merge pull request #2193 from Growstuff/dev 
Production release
 2019-10-08 11:21:18 +13:00
Brenda Wallace b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13:00
bestest-mensch d72ec5890a address code climate issues 2019-10-07 21:38:19 +00:00
bestest-mensch 1e1b9f5ef5 scope conversations delete multiple to current user 2019-10-07 21:38:19 +00:00
bestest-mensch 9f8e2e65be update/add specs 2019-10-07 21:38:19 +00:00
bestest-mensch 80fb4f5fe6 add ability to delete multiple conversations at once 2019-10-07 21:38:19 +00:00
bestest-mensch 01df35e5a6 update contributors 2019-10-06 04:08:09 +00:00
bestest-mensch d39dc65c4e small ui tweak 2019-10-06 04:08:09 +00:00
Brenda Wallace 0a71807237 Stop using rails-assets.org (#2194) 2019-09-28 18:38:58 +12:00
Brenda Wallace 3eb30a5555 Removed duplicate crop info 2019-09-28 17:44:37 +12:00
Brenda Wallace 7b5698f977 👩‍🌾 Import openfarm data (#2177) 
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
 2019-09-28 17:23:25 +12:00
Brenda Wallace 6a4158ae04 👭 Crop companions (#2176) 
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
 2019-09-28 10:38:01 +12:00
dependabot-preview[bot] e043199866 Bump uglifier from 4.1.20 to 4.2.0 
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases)
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lautis/uglifier/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 16:20:37 +00:00
Brenda Wallace eaa6ecec98 Merge pull request #2179 from Br3nda/post-comments 
🚝 Crop to post relationship made more rails standard
 2019-09-27 08:14:47 +12:00
Brenda Wallace 9c0c0eeb18 Merge branch 'dev' into post-comments 2019-09-27 08:13:33 +12:00
Brenda Wallace 66a3b2c52b If we delete a photo, delete the associations records 2019-09-27 08:13:07 +12:00
Brenda Wallace 99e2ca4920 If a crop is deleted, delete association (gerund) records too 2019-09-27 08:13:07 +12:00
Brenda Wallace 719fec24d0 if someone is destroy, delete all likes 2019-09-27 08:13:07 +12:00
Brenda Wallace f7f7638540 Merge branch 'dev' into post-comments 2019-09-26 21:52:47 +12:00
dependabot-preview[bot] 8dc56c48e2 Bump scout_apm from 2.6.0 to 2.6.1 
Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/scoutapp/scout_apm_ruby/releases)
- [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 21:51:55 +12:00
Brenda Wallace e08daa0b2b Merge branch 'dev' into post-comments 2019-09-26 21:51:17 +12:00
Brenda Wallace 5072353293 Only save location (used for post-signin redirect) if this is a format html page 2019-09-26 21:50:42 +12:00
dependabot-preview[bot] bcb2464b53 Bump friendly_id from 5.2.5 to 5.3.0 
Bumps [friendly_id](https://github.com/norman/friendly_id) from 5.2.5 to 5.3.0.
- [Release notes](https://github.com/norman/friendly_id/releases)
- [Changelog](https://github.com/norman/friendly_id/blob/master/Changelog.md)
- [Commits](https://github.com/norman/friendly_id/compare/5.2.5...5.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 09:48:38 +00:00
Brenda Wallace 685fddb2be Merge remote-tracking branch 'origin/post-comments' into post-comments 2019-09-26 21:14:53 +12:00
Brenda Wallace 7acdc6c96f Merge remote-tracking branch 'upstream/dev' into post-comments 
Conflicts:
	db/schema.rb
 2019-09-26 21:14:12 +12:00
dependabot-preview[bot] 758db158cb Bump font-awesome-sass from 5.10.2 to 5.11.2 
Bumps [font-awesome-sass](https://github.com/FortAwesome/font-awesome-sass) from 5.10.2 to 5.11.2.
- [Release notes](https://github.com/FortAwesome/font-awesome-sass/releases)
- [Commits](https://github.com/FortAwesome/font-awesome-sass/compare/5.10.2...5.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-26 09:08:48 +00:00
Brenda Wallace 5da0f1fda0 Merge pull request #2175 from Br3nda/photo-sources 
📸 Add source to photos
 2019-09-26 20:42:19 +12:00
Brenda Wallace ee093db0e6 Merge branch 'dev' into photo-sources 2019-09-25 10:30:19 +12:00
dependabot-preview[bot] 17b468d440 Bump factory_bot_rails from 5.0.2 to 5.1.0 
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v5.0.2...v5.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-24 10:21:36 +00:00
Brenda Wallace 93921a9a23 Merge pull request #2166 from Growstuff/dev 
Production release
 2019-09-24 19:10:57 +12:00
dependabot-preview[bot] 61bede6031 Bump bootstrap_form from 4.2.0 to 4.3.0 
Bumps [bootstrap_form](https://github.com/bootstrap-ruby/bootstrap_form) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/bootstrap-ruby/bootstrap_form/releases)
- [Changelog](https://github.com/bootstrap-ruby/bootstrap_form/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bootstrap-ruby/bootstrap_form/compare/v4.2.0...v4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 11:03:58 +00:00
dependabot-preview[bot] 743d10e098 Bump puma from 4.1.1 to 4.2.0 
Bumps [puma](https://github.com/puma/puma) from 4.1.1 to 4.2.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.1.1...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 10:36:37 +00:00
Brenda Wallace fab9560c46 Apply suggestions from code review 2019-09-22 13:22:02 +12:00
Brenda Wallace 90035e79b8 Crop to post relationship made more rails standard 2019-09-22 10:07:50 +12:00
Brenda Wallace 5fab14dc8a Fixed associations view 2019-09-21 10:28:52 +12:00
Brenda Wallace 87e1a7571b Photo source in the schema 2019-09-21 09:45:34 +12:00
Brenda Wallace 60ceef4fce Only show photo associations if we have any 2019-09-21 09:43:36 +12:00
Brenda Wallace 367377088b Fix specs for photo sources 2019-09-21 09:37:55 +12:00
Brenda Wallace c97e380187 Merge branch 'dev' into photo-sources 2019-09-20 22:37:02 +12:00
Brenda Wallace b7321ed46f Add source to photos 2019-09-20 22:26:39 +12:00