mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 15:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,795 Commits 65 Branches 76 Tags
Style/SoleNestedConditional
Commit Graph

72 Commits

Author SHA1 Message Date
Daniel O'Connor
f23289ec6e Improve header, footer 2024-04-07 12:31:07 +00:00
Daniel O'Connor
5cc6135b2d Mark breadcrumbs as a nav 2024-01-17 21:13:41 +00:00
Daniel O'Connor
6e23aff347 Add main landmark to document 2024-01-17 21:11:43 +00:00
Brenda
3ab67786e0 Wrapping the whole layout, to center the page 2020-02-20 22:39:12 +13:00
Brenda Wallace
c6fc519e7d Production release (#2311) 
* Reduce the number of queries to find if member has seed of this crop

* Don't read crop photos from db again

* Cache the footer

* Reduce queries per thumbnail.

* Reducing the number of db queries on crops#show

* Cache photos

* Add query_diet, to count queries on the page

* Fix model spec

* Put query count on the page

* Little bit less queries to look up sci name

* Turn on bullet in dev

* Tell default photo to expire in 1 hour

* Small improvements to crops controller to reduce query count

* Don't cache photo do agressively

* Fix specs

* Bump bootstrap from 4.3.1 to 4.4.1

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.3.1 to 4.4.1.
- [Release notes](https://github.com/twbs/bootstrap-rubygem/releases)
- [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md)
- [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.3.1...v4.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* [Security] Bump puma from 4.3.0 to 4.3.1

Bumps [puma](https://github.com/puma/puma) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [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.3.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Move signout link into user menu

* fixed logo display on small screens

* Update specs to find logout link

* [CodeFactor] Apply fixes to commit b999d89
 2019-12-06 20:46:24 +13:00
Brenda Wallace
59fffbfa7b Put query count on the page 2019-12-04 21:48:00 +13:00
Brenda Wallace
057e6f3069 Change fonts, tidy up navbar, and use text for site name 2019-11-30 16:22:45 +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
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
37e6ed1b08 Link to ogp.me using https 2019-07-10 09:03:05 +00:00
Brenda Wallace
fae3155237 match to spec 2019-06-08 14:57:11 +12:00
Brenda Wallace
84ca2154f4 fix up footer 2019-06-05 22:58:12 +12:00
Brenda Wallace
00010d3a0f Breadcrumps 2019-06-03 22:23:36 +12:00
Brenda Wallace
c7e4216a31 move global actions 2019-05-25 17:01:28 +12:00
Brenda Wallace
c67adc1bd0 move global actions buttons 2019-05-24 20:37:06 +12:00
Brenda Wallace
dccbf440cb Breadcrumbs 2019-05-18 23:18:27 +12:00
Brenda Wallace
599cc349b8 Home page tidy for plantings, harvests, and discussion 2019-05-16 19:58:37 +12:00
Brenda Wallace
f5d48d1b56 Removing bootstrap 3 - only bootstrap 4 
because both isn't particularly clever
 2019-05-13 07:52:38 +12:00
Brenda Wallace
3cb6fb90f7 Fix crop display 2019-04-29 15:31:39 +12:00
Brenda Wallace
9ecf210ffb More form tidy up 2019-04-27 19:19:42 +12:00
Brenda Wallace
945d320a0a Remove the title from every page - because sometimes we don't want it 2019-04-27 19:11:49 +12:00
Brenda Wallace
4196ce9e6b Fix search 2019-04-26 17:35:22 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
27d12bf07e Isotope making nice layout on plantings#show 2019-04-20 09:09:07 +12:00
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Brenda Wallace
fc6183eb52 DRY actions more 2019-01-24 13:46:35 +13:00
Brenda Wallace
79c22308df Fixed nested row on layout, that was breaking photo add page 2019-01-24 11:58:58 +13:00
Brenda Wallace
2d68aa2082 Wider action bar 2019-01-23 21:49:17 +13:00
Brenda Wallace
d418745e87 Moving buttons to the right of page (with translations) 2019-01-22 15:19:24 +13:00
Brenda Wallace
fbc958b76a Moved global actions - only show if no buttonbar 2019-01-21 18:41:51 +13:00
Brenda Wallace
e8a4cc61ea Move global buttons and search 2019-01-21 14:13:36 +13:00
Brenda Wallace
0914caae88 Move the action buttons to EVERY page 2019-01-21 11:47:25 +13:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
d19c9ab669 Remove duplicate scripts yield in layout 2018-04-02 15:31:20 +12:00
Brenda Wallace
e43740bd3d Two more application name renames 2018-04-02 15:05:46 +12:00
Brenda Wallace
fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace
f1afe1ca79 Expanding layout to use full screen 2018-04-01 12:44:59 +12:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
86b9a3650b Move application.js loading last again 2018-01-23 09:00:34 +13:00
Brenda Wallace
33276874a8 add google js to gardens#show 2018-01-23 09:00:34 +13:00
Brenda Wallace
b1096cd021 Moved chart includes to application.js, attempting to fix json parse error 2018-01-23 09:00:34 +13:00
Brenda Wallace
1bf05f81ab Convert to use chartkick gem 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/assets.rb
 2018-01-23 09:00:34 +13:00
Brenda Wallace
29be61c790 Merge branch 'timeline' into upgrade/rails-5 2018-01-12 07:56:09 +13:00
Brenda Wallace
c442bdbd45 add google js to gardens#show 2018-01-12 07:53:34 +13:00
Brenda Wallace
2d813e49de add google js to gardens#show 2018-01-11 15:36:27 +13:00
Brenda Wallace
74ff648f90 Moved chart includes to application.js, attempting to fix json parse error 2018-01-09 12:51:21 +13:00
Brenda Wallace
34280123e5 Convert to use chartkick gem 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/assets.rb
 2018-01-08 11:28:59 +13:00
Brenda Wallace
123c34b6d1 Haml cleanup for layout 2017-02-13 07:33:48 +13:00
Mackenzie Morgan
32b98a7e40 Add support for Bootstrap alert types 
* All alerts are currently shoved into either red (error) or green (success)
* Add support for yellow (warning) and blue (info) alert types

Solution from this Stack Overflow: http://stackoverflow.com/questions/31094771/rails-bootstrap-haml-how-to-convert-this-code-to-display-flash-messages-to
 2016-05-30 21:48:11 -04:00
Daniel O'Connor
8f05e254a2 Remove crowdfunding code 2016-05-30 10:06:51 +09:30