mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-01-25 01:37:52 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,706 Commits 58 Branches 76 Tags
feature/dotenv
Commit Graph

213 Commits

Author SHA1 Message Date
Brenda Wallace
54778d9884 Likes popuplating from elastic, no more extra look ups 2020-01-01 08:38:27 +13:00
Brenda Wallace
7ea14bccfe Fix alt on img tag 2019-11-16 22:32:45 +13:00
Brenda Wallace
8d87f3c982 Remove console debug statement 2019-11-16 20:38:43 +13:00
Brenda Wallace
24f970f4f4 Added alt tag 2019-11-16 13:21:42 +13:00
Brenda Wallace
c87ae7be29 add photo to the map, if we have one 2019-11-16 13:20:38 +13:00
Brenda Wallace
535ddcdcff Added plantings to places map 2019-11-16 12:16:18 +13:00
Brenda Wallace
a437338961 Fix markers on crops#show map 2019-11-16 11:35:45 +13:00
Brenda Wallace
66fae333a9 Rename crops js file so it gets included correctly 
this crops.js.erb file was being ignored because a crops.coffee exists
 2019-11-16 11:21:40 +13:00
Brenda Wallace
2b7c21bf2e Fix marker on member map too 2019-11-16 11:16:53 +13:00
Brenda Wallace
f27cf0caf6 Added link to icon documentation 2019-11-16 11:11:41 +13:00
Brenda Wallace
df55a5b0a8 Add marker for leaflet maps, and use asset pipeline to serve file 2019-11-16 10:42:22 +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
2c75f62caf Avoid using id selectors 2019-09-01 20:23:59 +12:00
Brenda Wallace
017a942a41 Rename classes to name codeclimate happy 2019-09-01 19:58:47 +12:00
Brenda Wallace
1b87026df4 Use camel case in js 2019-07-12 11:59:48 +12:00
Brenda Wallace
9686305857 The like icons are now the buttons 2019-07-12 10:13:24 +12:00
Brenda Wallace
b36e80bbad Use our own class to indicate liked 2019-07-12 09:37:44 +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
170c7d99ac Merge branch 'dev' into likeable-photos 2019-07-11 08:42:07 +12:00
Brenda Wallace
f8c643d13a Updating links to use https to mapbox 2019-07-10 09:03:05 +00:00
codefactor-io
5d07a30d17 [CodeFactor] Apply fixes 2019-07-08 08:16:24 +00:00
Brenda Wallace
e40a2c3176 remove debugger 2019-07-08 20:12:42 +12:00
Brenda Wallace
f1df90f189 Remove debugger 2019-07-08 20:05:48 +12:00
Brenda Wallace
bff31ddb5c Removed extra blank lines 2019-07-08 20:04:27 +12:00
Brenda Wallace
cbed8cc259 likes for photos 2019-07-08 20:00:55 +12:00
Brenda Wallace
0715646688 Change crop autosuggest styles 2019-06-05 23:12:12 +12:00
codefactor-io
4af8282a44 [CodeFactor] Apply fixes 2019-05-18 19:36:26 +00:00
Brenda Wallace
d55af1b77d Fix droppdown/dropup menus 2019-05-17 11:53:32 +12:00
Brenda Wallace
4c0bca4b86 Removing isotope 
we don't need it anymore
 2019-05-17 09:49:57 +12:00
Brenda Wallace
126769bfad Remove jquery roadmap 2019-04-30 13:14:24 +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
9ee3f514cd Adding trailing comma 
because codeclimate likes them
 2019-04-20 20:01:34 +12:00
Brenda Wallace
7ea13c40ed Isotope not needed for photo thumbnails 2019-04-20 09:54:02 +12:00
Brenda Wallace
54146a3a9f javascript lint 2019-04-20 09:47:19 +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
93835b3ee6 Javascript lint 2019-02-09 15:21:30 +13:00
Brenda Wallace
63b8554435 Added missing semicolon 2019-02-09 15:16:53 +13:00
Brenda Wallace
ec4b443d8c Tool tips 2019-02-09 14:13:07 +13:00
Brenda Wallace
e337fcb7f7 Put displayed member back to using member.slug 2019-01-18 20:00:59 +13:00
Brenda Wallace
a06516b80f Put displayed link back to using login_name 2019-01-18 20:00:31 +13:00
Brenda Wallace
c969a9f830 Use slug, not member name, for urls to members 2019-01-06 08:45:42 +13:00
Brenda Wallace
e9ead68e94 Revert "Auto corrected by following Format Javascript Code" 
This reverts commit 334b33c555.
 2019-01-04 18:17:27 +13:00
Awesome Code
334b33c555 Auto corrected by following Format Javascript Code 2019-01-04 05:15:13 +00:00
Brenda Wallace
4218688d8e Revert "Auto corrected by following Format Javascript Code" 
This reverts commit f83a2b6397.
 2019-01-04 18:14:36 +13:00
Awesome Code
f83a2b6397 Auto corrected by following Format Javascript Code 2019-01-03 10:00:13 +00: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
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