* master: (125 commits)
Fix syntax error in GETTING_STARTED.md
Fix syntax error in README.md
Fix link syntax errors in REAME.md and GETTING_STARTED.md
Style recently merged code
Update gem i18n-js to pick up locale changes
Fix embedded shopfront menu responsiveness
Add communications links to README
Fix script/setup by making it less clever
Change import and reset logic to work with first page
Move options to first page
Fix wrong sort predicates in customer index
Reset reverse when clicking another column to sort
Move logic for toggling by column into SortOptions
Generalize sorting through SortOptions service
Remove unused sorting preferences in ColumnsCtrl
Fix frontend sorting in "Bulk Order Management"
Fix frontend sorting in "Customers" index
Change sorting to be done in ascending order first
Wrap rows in customer index with TBODY tag
Update .rubocop_todo.yml
...
We are adding taxons to the product as you change the primary taxon.
However we never remove the previous primary taxon so it forces the user
to update the taxons manually. This can be a big problem if you are bulk
updating products.
We now remove the taxon that matches the previously set primary taxon.
* master: (206 commits)
embedded groups layout changes
embedded groups initial test
Allow html requests for OrderCycleController#update
Move applicator calls to OrderCycleForm
Refactor OrderCycleForm to make logic clearer
Extract schedule syncing logic into OrderCycleForm
Add basic specs for OrderCyclesController#create
Add basic OrderCycleForm to handle create/update logic
Remove unnecessary respond_to blocks from OrderCyclesController
Include admin users as managers on new enterprises
Remove obsolete goWithoutHashFragments
Simplify Navigation.go, not preserving hash fragments
Only show change warning for open order cycles
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
Preload subscription counts for serialization in order cycle collection actions
Request the subscription count for change warning each time, don't cache
Ask user to confirm oc date change for open order cycles with subsciptions
Fix ordering of Gemfile.lock
Add rack-rewrite to handle redirects
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
When a user is created with the same email as existing customers
Then the user is associated with these customers
So that the user can access the private shops where he has been invited
to before signup
This makes the upgrade to Spree 2.0 a bit easier.
`spree_variants.count_on_hand` is removed in that version and this
column was used in the `in_stock` scope that we no longer use.
