Rob H
|
d17a316387
|
remove naughty pry
|
2014-05-15 22:43:08 +10:00 |
|
Rob H
|
fd6f4d04df
|
Merge branch 'master' into ent-makeover
|
2014-05-15 17:05:05 +10:00 |
|
Rob H
|
c1c92d62e4
|
Adjust admin enterprise edit to improve scanning
|
2014-05-15 17:03:47 +10:00 |
|
Will Marshall
|
da95df5ab3
|
patching one dud spec
|
2014-05-15 15:41:01 +10:00 |
|
Rob H
|
7cdfb4bab2
|
Add methods and fees to sidebar on enterprise edit page
|
2014-05-15 14:52:19 +10:00 |
|
Will Marshall
|
c0ba560fa6
|
Moving empties cart to a magic directive
|
2014-05-15 14:47:16 +10:00 |
|
Will Marshall
|
eae12da24a
|
Adding distributors display to producers page
|
2014-05-15 12:20:17 +10:00 |
|
Will Marshall
|
575ce9fe01
|
Adding producers to home and distributors to producers
|
2014-05-15 12:02:58 +10:00 |
|
Will Marshall
|
234d4de7ed
|
Forcing everything to be SSL
|
2014-05-14 15:55:19 +10:00 |
|
summerscope
|
ffd7f3c134
|
Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff.
|
2014-05-14 15:55:19 +10:00 |
|
summerscope
|
dd89dad5b6
|
Add new font into buttons
|
2014-05-14 15:55:19 +10:00 |
|
summerscope
|
8238cbe0ee
|
Merge changes
|
2014-05-14 15:55:18 +10:00 |
|
summerscope
|
d462f34e75
|
Refactor friday - tidying up and commenting css
|
2014-05-14 15:55:18 +10:00 |
|
summerscope
|
9886166750
|
Add in script for google font Open Sans
|
2014-05-14 15:55:18 +10:00 |
|
Rohan Mitchell
|
a2205d3f93
|
Make order cycles spec consistent
|
2014-05-14 15:50:25 +10:00 |
|
Rohan Mitchell
|
6c5172c567
|
Add EnterpriseRelationship. An Enterprise can find its relatives.
|
2014-05-14 15:50:25 +10:00 |
|
Will Marshall
|
5f712a8984
|
Removing code
|
2014-05-14 15:16:29 +10:00 |
|
Will Marshall
|
151702d685
|
Catching order cycle expiry and redirecting
|
2014-05-14 11:51:25 +10:00 |
|
Rob H
|
31334be615
|
Tidy up of new dashboard, add 'CREATE NEW' button at top right
|
2014-05-14 11:31:42 +10:00 |
|
Will Marshall
|
1c98f10c20
|
Adding indexing by user id
|
2014-05-14 11:08:21 +10:00 |
|
Will Marshall
|
a3b5ba2257
|
Adding a spec for visiblity filtering
|
2014-05-13 16:38:52 +10:00 |
|
Will Marshall
|
f574d8a65b
|
Restricting to visible
|
2014-05-13 16:34:20 +10:00 |
|
Rob H
|
c98d2e71d8
|
Add scroll pane to admin dashboard
|
2014-05-09 17:20:53 +10:00 |
|
Will Marshall
|
afffa6fc39
|
Merge branch 'master' into checkout
|
2014-05-09 16:45:58 +10:00 |
|
Will Marshall
|
5b2e9e9c30
|
Final set of regression issues
|
2014-05-09 16:43:57 +10:00 |
|
Will Marshall
|
573d479e08
|
Fixing test regressions
|
2014-05-09 16:43:57 +10:00 |
|
Will Marshall
|
631bef223c
|
Refactoring checkout test
|
2014-05-09 16:42:51 +10:00 |
|
Will Marshall
|
f25617dde7
|
Tweaks for laura, reworking authentication workflow, tidying up checkout
|
2014-05-09 16:42:51 +10:00 |
|
Rohan Mitchell
|
5a0cc1b6db
|
Increase capybara default_wait_time to 30 s, now we know it's not the primary cause of spec slowdown
|
2014-05-09 16:39:39 +10:00 |
|
Rohan Mitchell
|
d96274ddbe
|
Turn off enforce_available_locales, working around performance regression https://github.com/svenfuchs/i18n/issues/230
|
2014-05-09 16:39:39 +10:00 |
|
Rohan Mitchell
|
04379101e1
|
Change to new production hostname: openfoodnetwork.org.au
|
2014-05-09 16:39:39 +10:00 |
|
summerscope
|
7bf969ca1b
|
Removing empty containers and adding classes for padding required
|
2014-05-09 16:27:28 +10:00 |
|
Rob H
|
05e01d02c4
|
Merge branch 'master' into ent-makeover
|
2014-05-09 15:58:17 +10:00 |
|
Rob H
|
5b54f220a0
|
Fix failing BOM ng-spec
|
2014-05-09 15:56:29 +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 |
|
summerscope
|
76d3fa902f
|
Rejigging footer columns for responsive styling
|
2014-05-09 15:46:35 +10:00 |
|
summerscope
|
461d30e006
|
Tweak stylign to show large menu visibility class for large + up
|
2014-05-09 15:39:09 +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 |
|
summerscope
|
a3e12ae1f3
|
Tweak label and order of fields
|
2014-05-09 15:05:51 +10:00 |
|
summerscope
|
7e96181f07
|
Add style classification to distinguish between pane and full page for #id
|
2014-05-09 14:54:47 +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 |
|
summerscope
|
3d2d6fa33c
|
Styling for checkout page and the hubs heading above shopping section
|
2014-05-09 14:34:42 +10:00 |
|
summerscope
|
e8a5a4984b
|
Styling work on the checkout page WIP
|
2014-05-09 14:34:42 +10:00 |
|
summerscope
|
961a32816c
|
Remove variables sass - double up of branding
|
2014-05-09 14:34:42 +10:00 |
|
summerscope
|
eff4c5f309
|
Make small size generic not specific to footer
|
2014-05-09 14:34:42 +10:00 |
|
summerscope
|
f89667ffe4
|
Refactor content in footer, add in link for creative commons, only thing missing is T&Cs!
|
2014-05-09 14:34:41 +10:00 |
|
Will Marshall
|
9903e42811
|
Adding reset password stuff
|
2014-05-09 14:26:07 +10:00 |
|
Will Marshall
|
1297520051
|
Authentication steps test
|
2014-05-09 14:13:39 +10:00 |
|
Will Marshall
|
9241178fe2
|
Making modal medium man
|
2014-05-09 12:23:34 +10:00 |
|