summerscope
ddde4e9dcb
WIP producers signup page markup
2015-05-02 18:25:23 +10:00
summerscope
3dbe45172d
Registration markup tweak with new icons
2015-05-02 18:24:55 +10:00
summerscope
2db6d5fe65
Registration styling tweak for new look & feel
2015-05-02 18:24:40 +10:00
summerscope
6d904b4700
Adding in styling for signup panes for Producers and Hubs
2015-05-02 18:24:18 +10:00
summerscope
4cb0158b21
Add in link for Regional founders user types - to send back to global site
2015-05-02 18:23:42 +10:00
summerscope
4f145104d2
Update mailer to new logo - should be instance specific (e.g. UK, AUS, etc.)
2015-05-02 17:58:35 +10:00
summerscope
fd90da6868
Shops landing page - adding info pane and copy with Jay.
2015-05-02 16:02:18 +10:00
summerscope
330d23c606
Move alert for 'join now' off global template onto homepage template only.
2015-05-02 15:23:12 +10:00
summerscope
5f193bc9ae
More styling for homepage panes.
2015-05-02 15:20:51 +10:00
summerscope
0086066ea5
WIP on How does it work pane on homepage
2015-05-02 13:58:57 +10:00
summerscope
5198d52f0d
Design assets for new UI
2015-05-02 13:58:47 +10:00
summerscope
7b8b53854e
More WIP on homepage layout etc.
2015-05-01 18:46:39 +10:00
summerscope
03508f98d8
Homepage tagline styling for mobile / responsive
2015-05-01 18:24:07 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
summerscope
d9fd0b284d
WIP on home panes and layout
2015-05-01 14:52:17 +10:00
summerscope
e1beae98ab
WIP on redesign / layout job
...
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
2015-05-01 14:41:48 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
summerscope
ae16589717
New version of logo sliced for OFN Australia
2015-04-30 17:55:18 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
3b61d7a1e0
Add ref for country ISO codoes
2015-04-29 14:12:08 +10:00
Rohan Mitchell
c3f99d7540
Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country
2015-04-29 14:07:58 +10:00
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Rob Harrington
505fd8ff96
Merge branch 'properties' of github.com:openfoodfoundation/openfoodnetwork into properties
2015-04-24 17:20:41 +10:00
Rob Harrington
b1b1bfd8f6
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
2015-04-24 16:05:39 +10:00
Rohan Mitchell
29faa5f3c6
Merge branch 'master' into properties
2015-04-24 15:14:52 +10:00
Rohan Mitchell
8e2c224d4d
cd before sourcing includes
2015-04-24 15:00:49 +10:00
Rohan Mitchell
bb2f2a6f54
Also stop delayed job before loading staging baseline
2015-04-24 15:00:38 +10:00
Rob Harrington
dab3b59f6a
Merge branch 'master' into properties
2015-04-24 14:00:08 +10:00
Rob Harrington
bdf462926d
Ensure that producer properties have a position
2015-04-24 13:05:01 +10:00
Rohan Mitchell
9149276048
Kill any postgres connections before dropping and recreating database
2015-04-24 12:17:39 +10:00
Rob Harrington
c66a7e44b6
Updating product model specs to reflect changes to properties
2015-04-23 15:37:41 +10:00
Rob Harrington
9eb99d1c4a
Merge branch 'master' into properties
2015-04-23 14:18:30 +10:00
Rob Harrington
6cde1f7732
Add tooltip with value for selectors
2015-04-23 14:11:50 +10:00
Rob Harrington
7b83438b5e
Pulling property values into the shopfront
2015-04-23 13:51:49 +10:00
Rob Harrington
e6a98747b4
correction in read only logic for filter selectors
2015-04-23 13:32:56 +10:00
Rob Harrington
ed15b95de0
Adding properties and taxons to producer modal
2015-04-23 12:31:20 +10:00
Rob Harrington
3df2720b31
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
2015-04-23 12:31:06 +10:00
Rohan Mitchell
92e03e208f
Extract load_environment method
2015-04-23 07:23:34 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
1c617994fc
User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from
2015-04-22 21:02:07 +10:00
Rob Harrington
4a4b3da551
Using properties_including_inherited for product properties on the shop page
2015-04-22 21:02:07 +10:00
Rob Harrington
e546388784
Rename properties_h to properties_including_inherited
2015-04-22 21:02:07 +10:00
Rob Harrington
976c24cf4c
properties_h uses inherit_properties flag, and returns property id rather than presentation
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
Rob Harrington
1f293bb787
Adding inherits properties flag to products
2015-04-22 21:02:06 +10:00
Rob Harrington
a4a41ae26a
Refactor properties_h
2015-04-22 21:02:06 +10:00
Rohan Mitchell
7aeeb6d18f
Add script to run JS specs in CI
2015-04-22 16:36:31 +10:00
Rohan Mitchell
7a78f4870a
Use phantomjs for js specs, so we can run them in CI
2015-04-22 16:33:44 +10:00
Rohan Mitchell
28c79cdb50
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
2015-04-22 15:01:22 +10:00
