Rafael Schouten
|
47dc001735
|
merge has_shopfront and is_distibutor
|
2014-10-01 20:27:53 +10:00 |
|
summerscope
|
237d129710
|
Changing the markup to give a class where is a producer
|
2014-09-26 15:01:23 +10:00 |
|
summerscope
|
5e4e939087
|
Return template markup which was accidentally removed in Rafs merge
|
2014-09-19 17:47:49 +10:00 |
|
Rafael Schouten
|
559d3b0e4b
|
fixup the header but needs some styling
|
2014-09-19 17:24:41 +10:00 |
|
Rafael Schouten
|
883e5f1095
|
Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend
Conflicts:
app/assets/javascripts/templates/partials/enterprise_header.html.haml
|
2014-09-19 17:22:29 +10:00 |
|
Rafael Schouten
|
abc5a215a2
|
add map modals, profile filters and bugfixes
|
2014-09-19 17:07:07 +10:00 |
|
summerscope
|
5a7175e75d
|
Tweak markup to make modals fit headers nicely across small sizes
|
2014-09-19 16:43:31 +10:00 |
|
summerscope
|
4c7fa4eb9f
|
Fix markup so that text is not nested inside icon markup
|
2014-09-19 15:19:47 +10:00 |
|
Rafael Schouten
|
0d5106d571
|
refactor enterprise type logic and fix icons
|
2014-09-18 18:15:28 +10:00 |
|
Rafael Schouten
|
bd922085c4
|
icons and entity category logic
|
2014-09-18 15:14:55 +10:00 |
|
summerscope
|
7f6a7b4254
|
Adding underlines to links on modals for map view etc to try and make these more intuitive and usable
|
2014-08-15 11:02:21 +10:00 |
|
Rohan Mitchell
|
f8c71ced45
|
Fix display of state_name, after attribute was renamed in serializer
|
2014-08-07 16:46:57 +10:00 |
|
Will Marshall
|
c4f7c1af60
|
Lots of small bug fixes, changing image sizes
|
2014-07-29 11:33:25 +10:00 |
|
summerscope
|
3d472bc57e
|
Make the header styles consistent for the modals
|
2014-07-28 16:14:01 +10:00 |
|
Will Marshall
|
4f3d468db6
|
Dereferencing groups and adding modals to page
|
2014-06-24 17:15:31 +10:00 |
|
Will Marshall
|
c09555e380
|
Tab fixes, new tests, reworking modals
|
2014-06-24 17:15:31 +10:00 |
|