Maikel 155b205ac2 Merge pull request #3401 from luisramos0/2-0-stable-jan-29th ...

[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)

2019-01-30 14:44:40 +11:00

..

admin

Merge pull request #2988 from Matt-Yorkley/pi/utf8

2019-01-09 15:39:05 +11:00

api

Merge branch 'master' into 2-0-stable-dec-3rd

2018-12-03 15:30:16 +00:00

spree

Merge pull request #3401 from luisramos0/2-0-stable-jan-29th

2019-01-30 14:44:40 +11:00

stripe

Update stripe controller routing comments

2017-10-16 09:39:15 +11:00

application_controller.rb

Remove css_splitter references, delete all_split2.css. #1361 #2633

2018-09-03 09:20:26 +10:00

base_controller.rb

Add i18n helper for controllers to switch language by params

2017-08-02 09:57:32 +10:00

cart_controller.rb

Make rubocop happy on cart controller, cart service and stock levels service

2019-01-15 13:42:51 +00:00

checkout_controller.rb

Merge branch 'master' into 2-0-stable-dec-18th

2018-12-18 23:32:45 +00:00

discourse_sso_controller.rb

Adjust Discourse login for user confirmations

2018-02-07 10:41:53 +11:00

enterprises_controller.rb

Reduce complexity of EnterprisesController#shop

2019-01-03 11:17:10 +01:00

groups_controller.rb

Hide the menu on embedded group pages

2017-10-06 14:24:28 +11:00

home_controller.rb

Rewrite user stat query for improved performance of homepage

2018-06-06 16:27:23 +10:00

line_items_controller.rb

Further tweaks to LineItemsController

2017-05-17 12:27:29 +10:00

map_controller.rb

Load active distributors where they're needed rather than in most controllers

2015-05-27 15:44:01 +10:00

producers_controller.rb

Enable iframes for embedded shopfronts

2017-07-26 13:56:36 +10:00

registration_controller.rb

Remove unrequired store registration action

2014-10-17 11:01:39 +11:00

shop_controller.rb

Fix current violations of Style/Send cop

2018-09-05 12:05:05 +02:00

shops_controller.rb

Eager load product properties to avoid N+1

2018-11-28 16:21:40 +01:00

sitemap_controller.rb

#1027: Use url helpers for basic pages

2017-01-12 10:18:30 +00:00

user_confirmations_controller.rb

Update :return_url value when re-sending email confirmations

2018-04-27 12:37:42 +10:00

user_passwords_controller.rb

Extract json render from :user_confirmed? method

2018-04-27 12:37:42 +10:00

user_registrations_controller.rb

Set user locale on user registrations #create

2018-12-18 15:30:01 +00:00