raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,343 Commits 18 Branches 452 Tags
dcf048d631603b1fc3d785c8a9d94970ff9bc397
Commit Graph

2343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob H
dcf048d631 Merge branch 'temp' into ng-cleanup 2014-05-07 13:08:13 +10:00
Rob H
fe5d015778 Merging in master 2014-05-07 13:07:11 +10:00
Rob H
2e7cf612d6 Fix broken BOM spec 2014-05-07 12:30:06 +10:00
Rob H
d7b232aefd Split dirtyProducts out into its own service 2014-05-07 11:25:09 +10:00
Rohan Mitchell
607045f858 Fix inconsistent spec fail - sorting 2014-05-07 09:27:08 +10:00
Will Marshall
1823dac694 Patching to trigger 2014-05-06 18:35:04 +10:00
Will Marshall
6af314a075 Patching unmerged path 2014-05-06 18:31:20 +10:00
Will Marshall
549b41d6fe Patching a spec issue with occlusion 2014-05-06 18:28:55 +10:00
Will Marshall
7835343273 Switching out colour schemes 2014-05-06 18:28:55 +10:00
Will Marshall
1756479c85 Patching a regression bug with login on checkout 2014-05-06 18:28:20 +10:00
Will Marshall
3542799349 Removing pointless foundation crud, reworking the login 2014-05-06 18:28:20 +10:00
summerscope
1c926c49bc Styling for producer node + add link for producers into footer 2014-05-06 18:27:17 +10:00
summerscope
e84ee91184 Styling for producers page and new pretty bg picture 2014-05-06 18:24:30 +10:00
summerscope
1d9a1aa8ce Add stylesheet for producers 2014-05-06 18:04:17 +10:00
summerscope
779bf6b096 Renaming ID to make it more generic to table search rather than Hub 2014-05-06 17:55:38 +10:00
summerscope
c4cd15423c Add email link with reverse 2014-05-06 17:40:02 +10:00
summerscope
6cb186ffe3 Styling for footer and further work for top nav 2014-05-06 17:32:22 +10:00
summerscope
93f095d976 Adding a menu style and styling around the new top nav 2014-05-06 16:10:02 +10:00
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