4164 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	94e1995469	Merge branch 'master' into simple-order-cycles	2014-10-23 09:36:03 +11:00
Rohan Mitchell	f74ec03cef	Rename	2014-10-23 09:26:55 +11:00
Rohan Mitchell	66e13d40f4	Select all works on simple order cycles interface	2014-10-22 19:17:28 +11:00
Rohan Mitchell	d47db903fb	Add basic styling to simple order cycle interface	2014-10-22 19:12:51 +11:00
Rohan Mitchell	3e61aa7267	Simple interface remove coordinator fee	2014-10-22 17:26:22 +11:00
Rohan Mitchell	28352be729	Save pickup time and instructions	2014-10-22 17:17:05 +11:00
Rohan Mitchell	549ef4b79d	When saving an OC from the simple interface, include outgoing variants	2014-10-22 17:08:16 +11:00
Rohan Mitchell	8fb95769bf	Fix tested values in spec	2014-10-22 17:07:45 +11:00
Rohan Mitchell	b75af8d9ff	Fix sells column coming out all 'none'	2014-10-22 10:49:23 +11:00
Rohan Mitchell	4308f7d09c	Revert "use sql for migration" ... This reverts commit fec8f08966.	2014-10-22 09:43:10 +11:00
Rafael Schouten	fec8f08966	use sql for migration	2014-10-18 16:17:29 +11:00
Rafael Schouten	78b0e02ffe	Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork	2014-10-18 16:03:04 +11:00
Rob Harrington	361116a9ec	Explicitly set confirmed_at for unconfirmed enterprise	2014-10-17 18:31:35 +11:00
Rob Harrington	cae8d566df	Explicit confirmed_at to ensure that confirmation emails are sent	2014-10-17 17:49:18 +11:00
Rob Harrington	f499cc375b	Adding confirmed_at to enterprise factory	2014-10-17 17:32:27 +11:00
Rob Harrington	338ba74652	Only show enterprise partial when no enterprises exist	2014-10-17 17:15:49 +11:00
Rob Harrington	5b3ff9160d	Fix Registration spec	2014-10-17 17:15:16 +11:00
Rohan Mitchell	deedafde9a	WIP: Simple order cycle form loads and displays correct info	2014-10-17 16:55:55 +11:00
Rohan Mitchell	d8b648d531	Extract name and timing form from order cycles	2014-10-17 16:51:03 +11:00
Rohan Mitchell	078d2bac11	Extract factories from order cycles admin angular	2014-10-17 16:50:16 +11:00
Rob Harrington	e24a774d54	Adding schema	2014-10-17 16:16:17 +11:00
Rob Harrington	4d078feea2	Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise)	2014-10-17 16:12:51 +11:00
Rohan Mitchell	f060da9c8d	Rename angular app order_cycle -> admin.order_cycles	2014-10-17 14:13:27 +11:00
Rob Harrington	b2565991e6	Merge branch 'master' into reg_and_ent_types	2014-10-17 12:33:21 +11:00
Rob Harrington	eda0b16a5f	Make state abbreviations upper case	2014-10-17 12:29:51 +11:00
Rob Harrington	e9a3f8ce91	Require user to choose producer or not	2014-10-17 12:29:51 +11:00
Rob Harrington	a6bc9e66f6	Only send one enterprise creation confirmation email	2014-10-17 12:29:51 +11:00
summerscope	b671543a95	Style and make pretty the finished step of profile creation	2014-10-17 12:25:04 +11:00
summerscope	4abc59f66d	Change styling on the enterprise name because we dont know what type it is yet	2014-10-17 12:02:21 +11:00
summerscope	4aa2aa5aee	Tweaking layout, text, styling for registration box	2014-10-17 11:56:25 +11:00
summerscope	2c5208ce6b	Change ent type page, simplify!	2014-10-17 11:17:53 +11:00
Rob Harrington	81715aaf5d	Remove unrequired store registration action	2014-10-17 11:01:39 +11:00
Rob Harrington	c4d47ccc20	Change enterprise attributes defined in reg controller	2014-10-17 11:01:38 +11:00
Rohan Mitchell	694dd0c329	Enterprise user selling own produce only sees simple order cycle listing	2014-10-17 10:52:36 +11:00
summerscope	4884734ab5	Align Continue buttons right consistently	2014-10-17 10:43:19 +11:00
Rob Harrington	28807d4f4d	Merge migrate_ent_types into reg	2014-10-17 10:20:48 +11:00
Rob Harrington	6a6f603754	Correct syntax for update column	2014-10-17 10:03:34 +11:00
Rafael Schouten	2e3cb171a3	don't remove indexes after you remove one of their columns!	2014-10-17 08:22:52 +11:00
Rafael Schouten	b853f908d3	bugfix email dummy	2014-10-17 08:08:10 +11:00
Rafael Schouten	1a40c83a48	update chema with indexes	2014-10-17 07:59:51 +11:00
Rafael Schouten	bda1eafcec	add migrating for dummy emails	2014-10-17 06:37:22 +11:00
Rafael Schouten	dd3101f27a	remove some bangs	2014-10-17 06:14:39 +11:00
Rafael Schouten	4defb38cf4	update karma config	2014-10-17 04:01:36 +11:00
Rafael Schouten	1150e69500	fix visible bug	2014-10-17 03:59:48 +11:00
Rob Harrington	c7145f8dcd	Merge branch 'reg' of github.com:openfoodfoundation/openfoodnetwork into reg	2014-10-16 16:53:34 +11:00
Rafael Schouten	6fd9741daf	use build instead of create, and reorganise code	2014-10-16 16:51:09 +11:00
Rafael Schouten	a1d74649f3	rename spec and clear todo	2014-10-16 16:50:19 +11:00
Rafael Schouten	f145db46f1	use self.x	2014-10-16 16:49:49 +11:00
Rafael Schouten	1b0000a1de	use bangs	2014-10-16 16:48:01 +11:00
summerscope	8d01bb7ebf	Pretty responsive email template!!!!!!!!	2014-10-16 16:45:15 +11:00