Commit Graph

317 Commits

Author SHA1 Message Date
Rohan Mitchell
16847025dd Fix bug: local storage was not correctly keyed to user id 2014-08-08 11:14:50 +10:00
Rohan Mitchell
f8c71ced45 Fix display of state_name, after attribute was renamed in serializer 2014-08-07 16:46:57 +10:00
Rohan Mitchell
769e8410cc Fix checkout total display 2014-08-07 14:53:30 +10:00
Rohan Mitchell
a1dd5dabac Replace sleep with wait, add cart_dirty spec helper 2014-07-31 11:36:53 +10:00
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
2014-07-28 13:43:31 +10:00
Will Marshall
9d0919d201 Further minor regressions 2014-07-28 13:41:38 +10:00
Will Marshall
a5f478bde7 Ajax submission of max quantity 2014-07-28 13:33:13 +10:00
Will Marshall
39f9e991ad Minor regressions and bug fixes 2014-07-28 11:30:35 +10:00
Rohan Mitchell
f73a63e944 Switch spec to better spree paypal express payment method 2014-07-25 13:47:31 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Rohan Mitchell
159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. 2014-07-17 14:26:04 +10:00
Will Marshall
9f5f319edb Further patching regression 2014-07-11 17:55:06 +10:00
Will Marshall
a73bc2405d Fixing one regression 2014-07-11 17:08:39 +10:00
Will Marshall
9d519f5f4b Fixing a minor test regression 2014-07-10 11:52:32 +10:00
Will Marshall
30d78c8da3 Adding a spec to test a regression 2014-07-09 11:33:36 +10:00
Will Marshall
f316b8dec5 Adding product modals in new format 2014-06-27 15:15:41 +10:00
Will Marshall
a4e675e675 Refactoring visibility handling 2014-06-26 14:48:46 +10:00
Will Marshall
8862fd555c Removing ng-animate, changing our enterprise restriction 2014-06-26 14:36:16 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
369761ccc5 Minor regression bug 2014-06-24 17:15:31 +10:00
Will Marshall
c09555e380 Tab fixes, new tests, reworking modals 2014-06-24 17:15:31 +10:00
Will Marshall
21589fd5b0 Hack patching home page modals 2014-06-20 16:31:49 +10:00
Will Marshall
8bb5f75ea0 Temporary fix to get staging working 2014-06-20 13:51:21 +10:00
Will Marshall
8905b45333 Fixing a minor regression 2014-06-19 12:10:05 +10:00
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rohan Mitchell
71020a14ef Fix payments coming up as $0, credit card charges failing for the same reason 2014-06-12 11:49:54 +10:00
Rohan Mitchell
f068cb3cd7 Show shipping method via angular only (don't show spree's adjustment) 2014-06-06 17:05:50 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray"
This reverts commit c9d0091cd9.
2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Rohan Mitchell
566afc0b75 Merge branch 'laura_and_will' 2014-06-05 11:42:02 +10:00
Rohan Mitchell
f28d9f9d9b Fix distributor logo spec - Add a logo 2014-06-05 11:38:27 +10:00
Rohan Mitchell
4a7609a835 Basic styling for checkout credit card form 2014-06-05 11:17:53 +10:00
Rohan Mitchell
37c780ed70 WIP: Send credit card details to server on checkout 2014-06-04 16:20:48 +10:00
Rohan Mitchell
d4f65a63bb Remove spec for removed image 2014-06-03 11:31:30 +10:00
Will Marshall
638d6d2ac0 Moving around the authentication specs 2014-05-30 12:58:58 +10:00
Will Marshall
206c947ea5 Tweaking test 2014-05-30 12:20:18 +10:00
Will Marshall
272cb0469f Setting up after_login redirects 2014-05-22 12:40:46 +10:00
Will Marshall
685ba3f63a Fixing my modal and the tests 2014-05-20 12:18:28 +10:00
Will Marshall
da95df5ab3 patching one dud spec 2014-05-15 15:41:01 +10:00
Will Marshall
5b2e9e9c30 Final set of regression issues 2014-05-09 16:43:57 +10:00
Will Marshall
573d479e08 Fixing test regressions 2014-05-09 16:43:57 +10:00
Will Marshall
631bef223c Refactoring checkout test 2014-05-09 16:42:51 +10:00
Will Marshall
f25617dde7 Tweaks for laura, reworking authentication workflow, tidying up checkout 2014-05-09 16:42:51 +10:00
Will Marshall
9903e42811 Adding reset password stuff 2014-05-09 14:26:07 +10:00
Will Marshall
1297520051 Authentication steps test 2014-05-09 14:13:39 +10:00
Will Marshall
c52457505e Fixing issues with offcanvas 2014-05-09 12:18:05 +10:00
Will Marshall
05f5e5562f Adding menu helper, removing admin path 2014-05-09 10:05:09 +10:00
Will Marshall
998fb07330 Splitting out the accordion stuff for checkout 2014-05-08 16:07:56 +10:00
Rob H
169d5669f1 Amend specs 2014-05-07 13:34:47 +10:00