mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-07 08:01:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
f8a404a88ba208a09f2e26594cecb710d2b6dc95
growstuff/app/controllers
History
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
..
admin
Removing shop, products, accounts, orders
2018-02-09 10:53:05 +13:00
api/v1
all our api controllers inheriting from base
2017-11-13 19:19:18 +13:00
charts
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
admin_controller.rb
Fixed admin typo
2017-05-29 17:52:08 +12:00
alternate_names_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
application_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
authentications_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
comments_controller.rb
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
crops_controller.rb
removed duplicate crop chart methods
2018-04-02 11:36:16 +12:00
follows_controller.rb
Redirect :back deprecated. updating follows controller
2018-04-02 16:28:34 +12:00
forums_controller.rb
Add ordering back into controller #index
2017-11-29 20:59:37 +13:00
gardens_controller.rb
Timeline is in a different controller now
2018-04-02 11:18:56 +12:00
harvests_controller.rb
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-04-28 21:25:06 +12:00
home_controller.rb
DRY the homes controller
2017-05-29 16:17:43 +12:00
likes_controller.rb
Style fixes after rubocop upgrade
2018-04-02 15:48:16 +12:00
members_controller.rb
WIP different profile page
2018-04-21 21:05:58 -05:00
notifications_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
omniauth_callbacks_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
pages_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
passwords_controller.rb
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
photo_associations_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
photos_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
places_controller.rb
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
plant_parts_controller.rb
Fix sort on plant parts
2017-11-29 20:59:37 +13:00
plantings_controller.rb
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
2018-04-28 21:25:06 +12:00
posts_controller.rb
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
registrations_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00
robots_controller.rb
Style fixes after rubocop upgrade
2018-04-02 15:48:16 +12:00
roles_controller.rb
Add ordering back into controller #index
2017-11-29 20:59:37 +13:00
scientific_names_controller.rb
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
seeds_controller.rb
Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550)
2018-03-12 08:39:32 +13:00
sessions_controller.rb
Revert "Auto corrected by following Style/StringLiterals"
2018-02-09 07:58:47 +13:00