2064 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	33cf05ab83	Manually bringing over the login links for checkout	2014-04-11 12:37:32 +10:00
Will Marshall	cf3681b934	Moving over the new checkout authentication	2014-04-11 12:26:36 +10:00
Rob H	e114aecfd0	Merge branch 'master' into bom	2014-04-10 16:30:13 +10:00
Rob H	e64bfe8ba3	Fix failing API Orders spec	2014-04-10 16:26:24 +10:00
Rob H	6228cc0c55	BOM: Add order cycle column	2014-04-10 15:34:23 +10:00
Rob H	5c7d36ba9b	BOM: interface cleanup and adding 'Clear All' button for filters	2014-04-10 15:29:09 +10:00
Rob H	645b6d5a8f	BOM: change datetimepickers to datepickers	2014-04-10 10:51:55 +10:00
Rob H	c5d5f5a9e6	BOM: view information about max quantities ordered	2014-04-10 10:33:57 +10:00
Will Marshall	35d590c926	Fixing a bug uploading promo images	2014-04-09 15:53:39 +10:00
Will Marshall	093004a460	Clearing the cart when order cycle is changed	2014-04-09 15:40:41 +10:00
Rohan Mitchell	2bfbce65d8	Use domain instead of IP for Jenkins badge in README	2014-04-09 15:02:41 +10:00
Rohan Mitchell	3d0b24cc97	Add missing foreign key indexes	2014-04-09 15:02:41 +10:00
Rohan Mitchell	a91ea933cc	Destroy adjustment metadata when adjustment is destroyed	2014-04-09 15:02:41 +10:00
Rohan Mitchell	e792107d7b	Make order cycle specs more robust	2014-04-09 15:02:40 +10:00
Rohan Mitchell	19ca8e142a	Do not show deleted products on shopfront	2014-04-09 15:02:40 +10:00
Will Marshall	87a43fc36e	Fixing the build! Some minor bugs due to mailer changes	2014-04-09 12:19:52 +10:00
Rohan Mitchell	511938e41b	Merge pull request #227 from folklabs/tools ... Add CodeClimate and Jenkins badges to readme	2014-04-09 11:58:52 +10:00
Will Marshall	fcb04481c4	Fixing a nil chain bug	2014-04-08 17:55:09 +10:00
Will Marshall	4447730505	Removing nothing special text and patching change password form slightly more	2014-04-07 14:52:01 +10:00
Will Marshall	1e04a3b5f7	Changing the confirm email text a little bit	2014-04-07 14:31:02 +10:00
Will Marshall	6ae51eabe3	Adding a helpful comment	2014-04-07 14:29:42 +10:00
Will Marshall	902eefa8bb	Patching one test and simplifying the modifications to order cycle tooltip	2014-04-07 14:15:15 +10:00
Will Marshall	1c22a2c848	Getting in notification to select order cycle	2014-04-07 13:14:32 +10:00
Rob H	aad5ad4bc0	BOM interface cleanup	2014-04-06 19:22:17 +10:00
Rob H	0a6230088d	Make BOM bulk action dropdown pretty	2014-04-06 17:39:53 +10:00
Rob H	5cec4feb7e	Remove search boxes from filter BPE filter boxes	2014-04-05 10:17:21 +11:00
Rob H	366555d9a7	Remove old column toggle from BOM	2014-04-05 10:08:37 +11:00
Rob H	b1c7f06779	Add dropdown.js.coffee to karma config to stop tests failing	2014-04-05 10:06:58 +11:00
Rob H	980797493d	Create dropdown list for toggling columns	2014-04-04 19:36:06 +11:00
Will Marshall	5c999fd9cf	Adding a signup confirmation email	2014-04-04 12:36:33 +13:00
Will Marshall	44049da3cb	Text change	2014-04-04 12:36:12 +13:00
Rob H	8e54bf1e2e	Enterprise users are aurthorised to view BOM	2014-04-04 09:11:56 +11:00
Will Marshall	718e295f3f	Some more minor test fiddling	2014-04-03 10:34:04 +13:00
Rohan Mitchell	32ffd05ba0	Order cycle can have the same enterprise participating as supplier, coordinator and distributor	2014-04-02 11:54:28 +11:00
Rohan Mitchell	98d599e5f7	Fix order cycle failing to save after a failing submit to server	2014-04-02 11:38:59 +11:00
Rohan Mitchell	9e74a72985	Fix silent fail when order cycle coordinator not filled out	2014-04-02 10:35:16 +11:00
Rohan Mitchell	e2fb593baf	Fix deployment issue: sass-rails needs to be in default group for application.rb config, and in assets group so that it's required.	2014-04-02 08:55:25 +11:00
Will Marshall	d9e86ae395	Some more minor refactoring	2014-04-01 16:58:50 +11:00
Will Marshall	bd4623bc71	Reworking the tests a little more for FASTER	2014-04-01 14:11:48 +11:00
Will Marshall	749abd82e8	Undoing previous change: no performance fix	2014-04-01 14:02:25 +11:00
Will Marshall	da479b7534	Fast version of OC selection	2014-04-01 14:01:57 +11:00
Will Marshall	5153c44aa0	Refactoring checkout specs some more	2014-04-01 13:53:37 +11:00
Will Marshall	f8f37abe32	Reworking the checkout spec slightly	2014-04-01 13:44:36 +11:00
Will Marshall	02fd21d99e	gs	2014-04-01 13:29:35 +11:00
Will Marshall	a4e19ddc98	Tweaking the change hub text	2014-04-01 13:12:16 +11:00
Will Marshall	403ad797ac	Tidying up the cart	2014-04-01 12:42:42 +11:00
Will Marshall	e51f1b508d	Fixing the empty cart button	2014-04-01 12:39:47 +11:00
Will Marshall	e203d811b9	Adding some links to account sidebar	2014-04-01 12:31:02 +11:00
Will Marshall	1b69087a1c	Loading indicator	2014-04-01 12:01:51 +11:00
Will Marshall	11a6470d6d	Patching modals	2014-04-01 11:39:08 +11:00