945 Commits

Author	SHA1	Message	Date
Rob Harrington	cc0e205f50	Merge master into onbaording	2014-10-24 15:36:59 +11:00
Rob Harrington	b182c6afc8	Merge in remote changes	2014-10-24 13:02:26 +11:00
summerscope	b172c4fd4f	Search query make empty string rather than undefined	2014-10-24 12:53:04 +11:00
Rob Harrington	900ef4ddcc	Change type form is aware of existing state of enterprise	2014-10-24 11:12:54 +11:00
Rob Harrington	f03c7ba02d	Rename sellCtrl to changeTypeFormCtrl	2014-10-24 11:02:16 +11:00
Rob Harrington	46ab424655	Moving welcomeCrtl to enterprise module as sellsCtrl	2014-10-24 09:10:45 +11:00
Rob Harrington	e1cf5ceb57	Can set producer_profile_only using welcome page	2014-10-23 16:42:00 +11:00
Rohan Mitchell	f09698be47	Select all works on simple order cycles edit interface	2014-10-23 15:54:52 +11:00
Rob Harrington	77c0e36ed6	Adding input validation to welcome page	2014-10-23 14:23:50 +11:00
Rohan Mitchell	bf61d12bfa	Merge branch 'simple-order-cycles' ... Conflicts: app/views/admin/order_cycles/_row.html.haml	2014-10-23 12:11:34 +11:00
Rohan Mitchell	ab76c66b68	Admin can update order cycles with simple interface	2014-10-23 11:38:15 +11:00
Rohan Mitchell	f7c1340f99	Admin can view an order cycle in the simple edit form	2014-10-23 11:08:27 +11:00
Rohan Mitchell	56ebe688dc	Fix file naming	2014-10-23 10:22:03 +11:00
Rohan Mitchell	8b616e7d17	Add unit spec for order cycles simple create controller	2014-10-23 10:21:19 +11:00
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
Rob Harrington	262972a911	Adding basic angular to welcome form	2014-10-22 19:02:39 +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
Rafael Schouten	96ff387d1f	fix navigation check on submission	2014-10-22 15:34:31 +11:00
Rafael Schouten	175e430a2b	uss oop for nav check	2014-10-22 14:51:17 +11:00
Rafael Schouten	89ce4ba632	Merge branch 'master' into bugfix ... Conflicts: app/models/enterprise.rb	2014-10-21 08:51:23 +11:00
Rafael Schouten	08cd273be3	Merge branch 'migrate_ent_types' into bugfix ... Conflicts: app/models/spree/ability_decorator.rb	2014-10-18 07:37:41 +11:00
Rafael Schouten	577cb06371	make navCallback actually versatile	2014-10-18 01:42:29 +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	078d2bac11	Extract factories from order cycles admin angular	2014-10-17 16:50:16 +11:00
Rohan Mitchell	f060da9c8d	Rename angular app order_cycle -> admin.order_cycles	2014-10-17 14:13:27 +11:00
Rob Harrington	e9a3f8ce91	Require user to choose producer or not	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
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
Rafael Schouten	9536b3e764	add navigation directive default	2014-10-17 07:58:08 +11:00
Rafael Schouten	245c1eb305	use a directive for navigation check to attach it to the page instead of the controller	2014-10-17 07:40:08 +11:00
Rafael Schouten	f0a3296e52	change enterprise category name ans use symbols instead of strings	2014-10-16 16:26:49 +11:00
Rob Harrington	a6480e6831	Merge in enterprise confirmation	2014-10-16 11:52:10 +11:00
Rob Harrington	e0e8ba814f	Show explanation of confirm process on final page of registration	2014-10-15 16:20:45 +11:00
Rafael Schouten	5e41865871	add utils angular module and navigation check factory	2014-10-14 00:26:04 +11:00
Rafael Schouten	9a6958573a	Merge branch 'master' into bugfix ... Conflicts: app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee	2014-10-12 21:19:02 +11:00
summerscope	a4e72f6fbc	Making the header more semantically meaningful for HTML5. Add in row to make spacing consistent. Steps bar moves to top	2014-10-10 18:20:38 +11:00
summerscope	89a51bf1da	Adjustments to layout, responsive logic, simplify column structure	2014-10-10 18:19:42 +11:00
Rob Harrington	9b275cc5f0	WIP: Shuffling around order of cards in registration	2014-10-09 17:26:31 +11:00
Rob Harrington	d1e3f74c03	Add loading gif to image uploaders	2014-10-09 15:56:54 +11:00
Rob Harrington	fc3a132c12	Closing auth dialog on pages other than home returns the user to home	2014-10-09 13:46:32 +11:00
Rob Harrington	31c4aad9e1	JS for closing alerts works	2014-10-09 13:21:30 +11:00
Rob Harrington	83f9867632	Move registration login into own folder, reinstate ofn-inline-alert	2014-10-09 13:15:19 +11:00