15608 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	12dfcd0de9	Fixing auth workflowsg	2014-05-22 10:43:26 +10:00
Will Marshall	250b76ec79	Merge branch 'master' into new_shop	2014-05-22 10:43:02 +10:00
Will Marshall	f997026796	Reworking the JS specs	2014-05-22 10:42:44 +10:00
Will Marshall	67e72f4504	Setting up after_login redirects	2014-05-22 10:42:44 +10:00
Will Marshall	2d0a42b2c2	Adding working modals	2014-05-22 10:42:44 +10:00
Rohan Mitchell	48a7b9c3f8	Fix specs from 'X permits Y' table format change	2014-05-22 08:50:52 +10:00
Rohan Mitchell	d8fa30ea6f	Add a sequence to option type position, prevents inconsistent ordering in specs	2014-05-21 16:54:26 +10:00
Rohan Mitchell	a049266732	Replace enterprise relationship parent/child concepts with 'X permits Y'	2014-05-21 16:28:27 +10:00
Rohan Mitchell	0c647841a6	Add dynamic filter to enterprise relationships	2014-05-21 16:18:07 +10:00
Rohan Mitchell	76d1754c32	Reorder helper method at bottom	2014-05-21 15:11:14 +10:00
Rohan Mitchell	92292c853d	Extract partials from enterprise relationships admin page	2014-05-21 15:03:29 +10:00
Rob H	3bf21d42dd	WIP: removing all payment methods from enterprise edit page	2014-05-21 15:02:59 +10:00
Rohan Mitchell	6026a74c73	Table matcher have_table_row does not wait for full duration on should_not	2014-05-21 14:59:24 +10:00
Rohan Mitchell	18886c931f	Extract create EnterpriseRelationship to service	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa965e3752	Show a CSS3 animation when a row is added	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f1df021091	Show enterprise relationships tab as selected	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	e40843bccb	Allow error messages without attribute name. Improve enterprise relationship error message.	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	3cb55062cc	Split enterprise_relationships rabl into show and index	2014-05-21 11:29:11 +10:00
Rohan Mitchell	ba7e29074f	have_table_row waits	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	61af8204d9	Add spec matcher have_table_row	2014-05-21 11:29:11 +10:00
Rohan Mitchell	6414ae2972	Output enterprise relationships as JSON	2014-05-21 11:29:11 +10:00
Rohan Mitchell	1a854b89ec	Sort enterprise relationships by enterprise name	2014-05-21 11:29:11 +10:00
Rohan Mitchell	f7de504d89	Add stub angular controller for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	aa53d82386	Add stub page for managing enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	4f1b8d06e7	Construct enterprise relationships with a factory	2014-05-21 11:29:11 +10:00
Will Marshall	391b1da04c	adding session token to order test	2014-05-21 10:46:03 +10:00
summerscope	d874855aa1	Update styling on empty cart	2014-05-20 16:40:23 +10:00
Will Marshall	c1a55de40e	Merge branch 'new_shop'	2014-05-20 16:09:31 +10:00
Will Marshall	ef91f8d17f	Redirecting if cart is empty and activating the empty cart link	2014-05-20 16:05:28 +10:00
Will Marshall	36aba8049f	Starting to rework login behaviour when hitting /admin	2014-05-20 16:05:28 +10:00
Will Marshall	da69167b4c	Putting error messages on checkout into error flash for easier debugging	2014-05-20 16:05:28 +10:00
Will Marshall	0b595e21d2	Showing admin for enterprise or admin user	2014-05-20 16:05:28 +10:00
summerscope	601281ced7	Add button style to shop page	2014-05-20 16:04:26 +10:00
summerscope	0957edee5d	Styling for shopping cart page	2014-05-20 15:50:03 +10:00
Will Marshall	03de82eb3c	Merge branch 'new_shop' ... Conflicts: app/controllers/checkout_controller.rb	2014-05-20 15:47:32 +10:00
Will Marshall	df82627bd1	Starting to rework login behaviour when hitting /admin	2014-05-20 15:47:00 +10:00
Will Marshall	2fc45d635d	Putting error messages on checkout into error flash for easier debugging	2014-05-20 15:16:52 +10:00
Will Marshall	4e463e7087	Showing admin for enterprise or admin user	2014-05-20 15:16:52 +10:00
summerscope	52345d9bb3	Improvements to shoptfront page styling	2014-05-20 14:11:41 +10:00
Will Marshall	3eb6f98c70	Putting error messages on checkout into error flash for easier debugging	2014-05-20 12:39:22 +10:00
Will Marshall	9557d69f71	Showing admin for enterprise or admin user	2014-05-20 12:33:29 +10:00
Will Marshall	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18:28 +10:00
Will Marshall	e7f6a9badf	Adding data to groups page	2014-05-20 12:18:28 +10:00
Will Marshall	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Will Marshall	4e4667c33d	Adding groups	2014-05-20 12:18:27 +10:00