34725 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	1a396429fe	Re-ordering stuff for Laura	2014-05-06 12:27:21 +10:00
Will Marshall	5b962cc3e4	Merge branch 'darkswarm_home'	2014-05-06 11:41:37 +10:00
Will Marshall	25de2f920a	Merge branch 'master' into reworking_menu ... Conflicts: app/views/layouts/darkswarm.html.haml	2014-05-06 11:16:20 +10:00
Will Marshall	010025798d	Removing a redundant 'in'	2014-05-05 16:29:33 +10:00
Will Marshall	9db602f031	Patching the visible flag in admin	2014-05-05 16:26:03 +10:00
Will Marshall	dcd2e39f2c	Tweaking for a moved partial	2014-05-05 15:57:16 +10:00
Will Marshall	dd25bfd345	Starting to rework menu	2014-05-05 15:52:48 +10:00
Will Marshall	1774bc1e19	Adding producers filtering and more Angular magic	2014-05-05 15:43:11 +10:00
Will Marshall	27728d6f0e	Adding our first request spec	2014-05-05 12:10:14 +10:00
Rob H	6ba0d6c5f9	WIP: Split out admin angularjs	2014-05-02 21:38:39 +10:00
Will Marshall	1e7e1a3127	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork ... Conflicts: spec/features/consumer/shopping/checkout_spec.rb	2014-05-02 16:12:41 +10:00
Rob H	5a2a43a060	Create angularjs admin module	2014-05-02 15:56:20 +10:00
Rohan Mitchell	901c9abe38	Increase wait time for failing spec	2014-05-02 15:39:17 +10:00
Will Marshall	bbb70342b3	Merging	2014-05-02 15:35:43 +10:00
Will Marshall	23fa1c7b7b	Patching a couple more issues	2014-05-02 15:17:44 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rohan Mitchell	db653682b1	Add capybara-screenshot - automatic screenshots for test fails	2014-05-02 14:25:32 +10:00
Rohan Mitchell	1d5f0042d4	Remove sleeps - these should be covered by increased capybara wait time now	2014-05-02 14:25:32 +10:00
Rohan Mitchell	930bc2b7ce	Set increased Capybara.default_wait_time globally	2014-05-02 14:25:32 +10:00
Rohan Mitchell	4480c75494	Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway	2014-05-02 14:25:32 +10:00
Rohan Mitchell	c9aefa507a	Remove chili	2014-05-02 14:25:32 +10:00
Rohan Mitchell	d707624525	Fix warnings - faker clash with ffaker, i18n enforce_available_locales	2014-05-02 14:25:32 +10:00
Will Marshall	9fb4b2f9d8	Ctrl-C now cancels karma	2014-05-02 14:19:52 +10:00
Will Marshall	dfd1dd609d	Re-engaging checkout spec	2014-05-02 14:13:00 +10:00
Will Marshall	d74265e44d	Ctrl-C now cancels karma	2014-05-02 14:04:43 +10:00
Will Marshall	3d06caf1e3	Merging in master	2014-05-02 13:10:31 +10:00
Will Marshall	123bd7963d	Adding tests for hub filter	2014-05-02 13:07:46 +10:00
Will Marshall	19137ce309	Adding state to home page filtering	2014-05-02 12:57:33 +10:00
Will Marshall	9bd76df116	That wasn't actually a bug! Sorry	2014-05-02 12:52:51 +10:00
Will Marshall	794d7b69ae	Restoring our toggle option	2014-05-02 12:50:32 +10:00
Will Marshall	705e247eb8	Tweaking the bulk order management spec again	2014-05-02 12:41:04 +10:00
Will Marshall	8c319334db	Cleaning out the spree auth stuff	2014-05-02 12:34:19 +10:00
Rob H	de369ae32b	WIP: Can manage taxons in BPE	2014-05-02 10:28:33 +10:00
Will Marshall	34f170d4f7	Bugged thing in the shop spec	2014-05-02 10:18:57 +10:00
Will Marshall	b755733812	Removing chili spec	2014-05-01 17:47:16 +10:00
Will Marshall	c5e6b24779	Removing specs that accidentally got in here	2014-05-01 17:46:00 +10:00
Will Marshall	1703f7503b	Removing dead weight	2014-05-01 17:43:02 +10:00
Will Marshall	2d536e01e7	Patching some deadlocks	2014-05-01 17:21:46 +10:00
Will Marshall	59d2bc908e	Adding quick login, more test refactoring	2014-05-01 17:11:56 +10:00
Will Marshall	0956aa2532	Patching a bug in order cycle partial	2014-05-01 17:08:15 +10:00
Will Marshall	6ad30d901d	Tidying down shop/checkout test	2014-05-01 16:22:11 +10:00
Will Marshall	e65924c50f	Removing a dud reference to active'	2014-05-01 15:52:27 +10:00
Will Marshall	2ff2d3dcbd	Starting to work on test format	2014-05-01 15:51:40 +10:00
Rob H	56204d4ea6	Upgrade Admin AngularJS	2014-05-01 13:01:52 +10:00
summerscope	c1ab0c0f0b	Renaming sass files for relevance. Style tweaks for large input to fix firefox bug.	2014-04-30 16:12:39 +10:00
Will Marshall	8a5b93ace9	Adding a couple of basic feature tests for the sake of demonstration	2014-04-30 16:10:02 +10:00
summerscope	4ed81da022	Updates to styling homepage and active table	2014-04-30 15:36:42 +10:00
summerscope	dcacf01c1d	Tweaking copy for food hubs modals.	2014-04-30 15:05:41 +10:00
Will Marshall	e901f3439a	Starting to partialize and test the RABL partials	2014-04-30 13:52:06 +10:00