Commit Graph

3834 Commits

Author SHA1 Message Date
Will Marshall
6f50c45bba Adding the last checkout distributor to the account link 2014-03-28 16:02:32 +11:00
Will Marshall
197f1cfa72 Further improving the navigation 2014-03-28 16:02:32 +11:00
Will Marshall
e1465352d0 Improving the navigation by moving it all to a service, adding a generic icon 2014-03-28 16:02:31 +11:00
Will Marshall
12b1a1b0e9 Switching our recover password form to Darkswarm 2014-03-28 16:02:31 +11:00
Rohan Mitchell
466b10e797 Select all distributed products on order cycle admin page 2014-03-28 15:34:26 +11:00
Rohan Mitchell
fddfdf8050 Select all supplied products on order cycle admin page 2014-03-28 15:34:26 +11:00
Rohan Mitchell
b8147474e8 Add label tags around order cycle admin checkboxes and labels 2014-03-28 15:34:26 +11:00
Rob H
b74a845875 Merge branch 'master' into bom 2014-03-28 14:42:15 +11:00
Rob H
ee147c232e WIP: Remove changes to variant bulk show casuing issues 2014-03-28 14:41:03 +11:00
Rob H
771ccc6e76 Merge branch 'capybara-fails' into bom 2014-03-28 13:52:17 +11:00
Rob H
4d65427d18 Fix BPE regression bugs caused by capybara upgrade 2014-03-28 12:11:36 +11:00
Will Marshall
08c25b1604 Getting a success message in place 2014-03-27 16:26:22 +11:00
Will Marshall
54491e0de2 Syncing up the email addresses between the SpreeUser tabs 2014-03-27 16:17:51 +11:00
Rob H
ab14bf70ab Merge branch 'bpe_issues' into bom 2014-03-27 15:39:37 +11:00
Rob H
dae2d9db9e BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update 2014-03-27 15:38:44 +11:00
Will Marshall
e48a25983a Starting a working forgot password system 2014-03-27 15:11:11 +11:00
Rob H
9c65dd2ace BOM: add warning message about missing unit values to group buy calc box 2014-03-27 14:18:00 +11:00
Rob H
0c2e215fef BOM: Add a method to check that all selected variants have a unit_value 2014-03-27 14:11:19 +11:00
Will Marshall
2158937f82 Adding a sidebar tab 2014-03-27 13:34:38 +11:00
Will Marshall
3976694dad Patching up some regressions 2014-03-27 13:01:05 +11:00
Will Marshall
e444ff8d2c Patching order cycle selector 2014-03-27 13:01:05 +11:00
Will Marshall
17bb1f9d25 Getting the tests working once more 2014-03-27 13:01:05 +11:00
Will Marshall
67762317cb Removing close link 2014-03-27 13:01:05 +11:00
Will Marshall
007428b6dc Splitting between path and hashfragment for offcanvas and tabs respectively 2014-03-27 13:01:04 +11:00
Will Marshall
c118a86119 Latest snapshot of the patched mm-foundation, and a quick tab implementation sidebar 2014-03-27 13:01:04 +11:00
Will Marshall
cdfaf4fc92 Temporary working version with hacked Foundation/Angular/Tabs 2014-03-27 13:01:04 +11:00
Will Marshall
166c8c3df4 Adding the basic Angular tabs and changed markup to keep it pretty 2014-03-27 13:01:03 +11:00
Will Marshall
bf7d12b40e Upgrading Foundation, starting to work through regression issues 2014-03-27 13:01:01 +11:00
Will Marshall
0690fcda48 Reworking the way the Sidebar works 2014-03-27 11:54:25 +11:00
Rohan Mitchell
3104d285ca Order cycle admin JS uses exchanges.incoming instead of role 2014-03-27 09:30:53 +11:00
Rob H
cd1086ce05 WIP: Bulk calculation box work with shared resources 2014-03-26 16:44:26 +11:00
Will Marshall
b623a64fb4 Working signup :) 2014-03-21 15:18:27 +11:00
Will Marshall
40d1563cd9 Adding our own user registrations controller, reworking sidebar a touch 2014-03-21 15:18:27 +11:00
Rob H
cbd3722380 Merge branch 'master' into bom 2014-03-21 13:47:50 +11:00
Rob H
f2729f9e80 Add more columns to BOM 2014-03-21 13:46:48 +11:00
Rob H
b329aed0f2 BOM: Can toggle columns, and interface rearrange 2014-03-21 13:00:12 +11:00
Will Marshall
250e1d236b Working login form 2014-03-20 16:58:58 +11:00
Will Marshall
7f88b8eb39 Switching to separate controllers for ze sidebar 2014-03-20 16:58:57 +11:00
Will Marshall
d8a7860d51 Getting some switching into place 2014-03-20 16:58:57 +11:00
Will Marshall
0cabc2eb4d Working sliding panel in basic form 2014-03-20 16:58:57 +11:00
Will Marshall
d954a8f4e4 Starting on the sidebar 2014-03-20 16:58:57 +11:00
Will Marshall
6e5c93526c Moving everything to a single Angular application 2014-03-20 16:58:57 +11:00
Rob H
8c998e6fa8 BOM: columns are sortable 2014-03-20 15:39:13 +11:00
Rohan Mitchell
c563057809 Merge branch 'new-enterprises-form' 2014-03-20 15:34:09 +11:00
Rohan Mitchell
51fdf86329 Polish the new enterprise form 2014-03-20 15:18:21 +11:00
Rob H
ed0b7da20f BOM page has a fancy calculation box for managing group buys 2014-03-20 14:40:24 +11:00
Rohan Mitchell
811b0cb36a Admin can remove a master variant from an order cycle when further variants have been added 2014-03-20 10:27:55 +11:00
Rohan Mitchell
fd81b143b5 Sort suppliers and distributors by name on order cycle edit page 2014-03-20 10:27:55 +11:00
Maikel Linke
f3789469b2 Feedback from Kerstin. Resolved issue comments removed. Pickup details removed. 2014-03-19 20:42:21 +11:00
Maikel Linke
9181f0243a added old input fields, enterprises test passing 2014-03-19 20:42:21 +11:00