Commit Graph

2373 Commits

Author SHA1 Message Date
Rob H
05e01d02c4 Merge branch 'master' into ent-makeover 2014-05-09 15:58:17 +10:00
Rob H
a0d54a4318 Fix failing BOM ng-spec 2014-05-09 15:51:22 +10:00
Rob H
01c5822fcc Add basic dashboard to admin section 2014-05-09 15:48:58 +10:00
Rohan Mitchell
b801480024 Increase capybara default_wait_time to 30 s, now we know it's not the primary cause of spec slowdown 2014-05-09 15:09:00 +10:00
Rohan Mitchell
8bf9921eef Turn off enforce_available_locales, working around performance regression https://github.com/svenfuchs/i18n/issues/230 2014-05-09 14:39:12 +10:00
Rohan Mitchell
87179669a6 Change to new production hostname: openfoodnetwork.org.au 2014-05-09 11:34:52 +10:00
Will Marshall
0df2eabf95 Moving useless assets 2014-05-09 10:32:39 +10:00
Rohan Mitchell
4ebc22f438 Remove capybara-screenshot, which appears to have been slowing down the build dramatically 2014-05-09 08:56:10 +10:00
Rohan Mitchell
87b605b604 Remove specific default_wait_time setting in BOM - this value is globally increased in spec_helper 2014-05-09 08:55:44 +10:00
Rohan Mitchell
34c18b522c Fix incorrect admin path 2014-05-09 08:33:26 +10:00
Rohan Mitchell
967d4c81ab Cache expensive options_text call 2014-05-08 20:55:43 +10:00
summerscope
64c94793e4 Menu styling for mobile menu 2014-05-08 16:41:18 +10:00
summerscope
f2be0746bf Make padding top responsive depending on big or mobile menu top-bar 2014-05-08 16:01:34 +10:00
summerscope
daaa2760a0 Restyling active nodes for producer and hub 2014-05-08 15:55:36 +10:00
summerscope
e7a3b48274 Styling for producers page and content in active table 2014-05-08 15:34:43 +10:00
Will Marshall
4e2326eaa2 Making the offcanvas not position fixed 2014-05-08 13:19:44 +10:00
Will Marshall
50f5a1c46f Hash toggling 2014-05-08 13:19:44 +10:00
summerscope
967f2827bf Make label consistent for Log in 2014-05-08 12:57:04 +10:00
summerscope
df87c9d715 Adding in github link to footer 2014-05-08 12:55:02 +10:00
summerscope
e41de9be36 Styling up login modal 2014-05-08 12:51:09 +10:00
Will Marshall
6a2c68701e Adding small class 2014-05-08 12:50:42 +10:00
Will Marshall
de369d938f Starting to work on anchor scrolling 2014-05-08 12:34:16 +10:00
Will Marshall
2563576f86 Adding a class to the login modal 2014-05-08 12:26:37 +10:00
Will Marshall
09f239ddfe Merging 2014-05-08 12:20:26 +10:00
Will Marshall
ff20837f50 Fixing a path issue 2014-05-08 11:50:57 +10:00
Will Marshall
d5648bd993 Removing some garbage, adding admin link 2014-05-08 11:50:57 +10:00
summerscope
a7ef1295e4 Tweak styles to adjust break point for menu 2014-05-08 11:48:12 +10:00
Will Marshall
eb5dbd0654 Fixing a regression 2014-05-08 11:18:53 +10:00
summerscope
c5376f3862 Reset to head 2014-05-08 11:08:47 +10:00
Rob H
169d5669f1 Amend specs 2014-05-07 13:34:47 +10:00
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