4765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	ed4d78bca8	Decorators can't be in same file name as original file, otherwise the original file is ignored	2015-01-30 11:23:49 +11:00
Rohan Mitchell	a25bf32156	Show extended variant name/unit info for admin variant overrides	2015-01-29 15:15:28 +11:00
Rohan Mitchell	7a5c56cbca	Do not show out of stock lines on order confirmation page	2015-01-29 13:19:04 +11:00
Rob Harrington	cbae7dcc8e	Adding visible to user and enterprises report, and sorting by confirmation date	2015-01-29 10:46:44 +11:00
Rob Harrington	9163b0c1ad	Adding missing equals sign to test for equality in permalink migration 0.7.3	2015-01-28 11:37:02 +11:00
Rob Harrington	fd9f65f1b6	Merge branch 'shopfront-filters' into shop-url	2015-01-28 10:57:11 +11:00
Rob Harrington	713999c1d8	Merge branch 'master' into shop-url	2015-01-28 10:53:42 +11:00
Rob Harrington	21db56ce6c	Rollback angularjs upgrade	2015-01-28 08:41:14 +11:00
Rob Harrington	adbe127e76	Revert "Update bindonce" ... This reverts commit 48dc85cfc2.	2015-01-25 14:08:29 +11:00
Lynne Davis	3c4ad4121f	LD adding whitespace to get my master version back in line with origin	2015-01-22 14:00:48 +00:00
Lynne Davis	8e8f38e484	app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-22 12:01:20 +00:00
Rob Harrington	b429be707c	Split out payment and shipping methods from admin enterprises controller as services	2015-01-22 12:19:41 +11:00
Rob Harrington	4829e59663	Fixing checkout controller spec	2015-01-22 10:46:31 +11:00
Rob Harrington	d12fdd23fb	Fixing navcheck callback	2015-01-22 10:46:01 +11:00
Rob Harrington	b0a29801b6	Making spec controller product request spec a little bit more robust	2015-01-22 10:20:03 +11:00
Rob Harrington	6ebd58b67d	Updating home spec to reflect new shopfront url	2015-01-22 10:19:47 +11:00
Rob Harrington	0791cc3c2a	Making sure that we have a .path() in HashNavigation	2015-01-22 10:19:47 +11:00
Rob Harrington	76acbb6159	Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)	2015-01-22 10:19:47 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Rob Harrington	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	36430d3bad	Enterprise permalink generator handles blank permalink case	2015-01-22 10:19:46 +11:00
Rob Harrington	7520552fd7	Removing spec for testing empty permalink, since we now force permalink to be created when empty	2015-01-22 10:19:46 +11:00
Rob Harrington	6991e5e6b1	Finally got all callbacks available to all action that need them	2015-01-22 10:19:46 +11:00
Rob Harrington	42d6695264	Fix permalink migration to handle blank auto-generated permalinks and fixed down migration	2015-01-22 10:19:45 +11:00
Rob Harrington	4d26b3d648	Make unused cart_controller happy	2015-01-22 10:19:45 +11:00
Rob Harrington	177181cd75	CurrentUser always returns a factory	2015-01-22 10:19:45 +11:00
Rob Harrington	4baa205cf9	before_filters for enterprise controller are run in the correct order, and put inside the shop action	2015-01-22 10:19:45 +11:00
Rob Harrington	60313f7a6a	Replace delete with parameterize	2015-01-22 10:19:45 +11:00
Rob Harrington	3e5ea3fe63	Adding automatic permalink generation on enterprise creation	2015-01-22 10:19:45 +11:00
Rob Harrington	b98c01b280	Updating permalink controller specs	2015-01-22 10:19:44 +11:00
Rob Harrington	ff624e83eb	Require distributor in enterprise controller, so that everything actually works	2015-01-22 10:19:44 +11:00
Rob Harrington	48dc85cfc2	Update bindonce	2015-01-22 10:19:44 +11:00
Rob Harrington	a0990c107f	Moving navigation check to controller	2015-01-22 10:19:44 +11:00
Rob Harrington	585c061fb0	Upgrade angularjs	2015-01-22 10:19:44 +11:00
Rob Harrington	83726eba63	Refactoring permalink checker to handle multiple requests elegantly	2015-01-22 10:19:43 +11:00
Rob Harrington	7ad9fdf0be	Cleaning permalink before checking	2015-01-22 10:19:43 +11:00
Rob Harrington	6b10a4a775	Restoring enterprise permalinks when they cause errors	2015-01-22 10:19:43 +11:00
Rob Harrington	4088bdc236	Clean up permalink checker	2015-01-22 10:19:43 +11:00
Rob Harrington	9b78963d5a	Adding a javascript interface for checking permalinks and user input on enterprise console	2015-01-22 10:19:43 +11:00
Rob Harrington	3ec3441cfa	Replacing all uses of the old enterprise shop url helper	2015-01-22 10:19:43 +11:00
Rob Harrington	39889390ef	Altering shop page routing so that shop url is copy-and-pastable	2015-01-22 10:19:42 +11:00
Rob Harrington	c3659612ed	enterprise routes use permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	7a6cd98646	Fixing failing spec, missing permalink	2015-01-22 10:19:42 +11:00
Rob Harrington	9286c82b43	Removing obsolete methods	2015-01-22 10:19:42 +11:00
Rob Harrington	c330e49a7f	Moving permalink check action to enterprise controller	2015-01-22 10:19:42 +11:00
Rob Harrington	e2268e53bb	Adding action to check uniquness of enterprise permalink against existing routes	2015-01-22 10:19:41 +11:00
Rob Harrington	9f0aeb5adf	Adding unique permalink to enterprises	2015-01-22 10:19:41 +11:00
Rohan Mitchell	41e42c78c4	Update spec link name	2015-01-16 17:25:38 +11:00
summerscope	1753432f36	Adding new loading animation to replace ugly and large gif	2015-01-16 17:06:40 +11:00
summerscope	0f8809abfc	Merge branch 'master' into shopfront-filters	2015-01-16 16:12:34 +11:00