Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Maikel Linke
d5c4da3bf0
Not using Paperclip's to avoid HTTP calls to S3
2015-12-04 10:37:55 +11:00
Maikel Linke
832f47d6b0
fix i18n typo
2015-09-02 16:58:04 +10:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Rohan Mitchell
5c3a59acab
ng-cloak order cycles selector, tabs and shopfront
2015-05-29 16:39:41 +10:00
Continuous Integration
c14de4e97f
Auto-merge from CI [skip ci]
2015-05-29 14:29:23 +10:00
Maikel Linke
ff2eed7760
Using permalink in URLs pointing to groups
2015-05-28 11:27:40 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
b9f19d5777
Fixing broken specs
2015-04-17 13:00:20 +10:00
summerscope
fc7abd5d02
Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab
2015-02-25 16:20:10 +11:00
Maikel Linke
9798b05a24
TabsCtrl can show tabs that don't toggle
...
toggle: tabs show on first click and hide on second click
select: tabs show on every click, one tab is always active
2015-01-06 22:39:15 +11:00
summerscope
34f47cedae
Fix markup for better layout and getting column padding sitting where it should
2014-10-30 17:03:09 +11:00
summerscope
733b249b12
making tabs break down better for responsive and small devices
2014-10-30 17:03:09 +11:00
Rafael Schouten
e7b847542f
bugfix tab selection
2014-10-08 01:59:56 +11:00
Rafael Schouten
9b6db2bff4
simplify tab selection
2014-10-07 10:49:57 +11:00
Rafael Schouten
6fc36a3e6c
swap redundant producer modal for general enterprise modal
2014-10-07 10:48:04 +11:00
summerscope
d3cfceaf94
Producer tab on shopfront tweaks - add producer icon and better classes for responsive
2014-07-25 17:29:15 +10:00
summerscope
237d5a990e
Remove double-up on URL string for social icons
2014-07-25 17:28:23 +10:00
summerscope
d6a4ae3cbf
Will Marshall will you please read the comment here and help me with all the logix
2014-07-23 16:36:34 +10:00
Will Marshall
8480cf7866
Tab fixes, new tests, reworking modals
2014-06-26 15:32:55 +10:00
Will Marshall
5f242f9232
Fixing groups page anchor scrolling
2014-06-25 10:46:32 +10:00
Will Marshall
c09555e380
Tab fixes, new tests, reworking modals
2014-06-24 17:15:31 +10:00
summerscope
ff344533d9
Remove link for follow links on CONTACT for shopfront mini menu (tabs) - should be icon only
2014-06-24 16:51:58 +10:00
summerscope
a93a1a07cf
Tweak styling for closed shoptfront
2014-06-24 13:50:18 +10:00
summerscope
d0b2f73c5a
Tweak markup for PRODUCERS tab on mini menu
2014-06-24 13:25:45 +10:00
summerscope
e0f5f51f92
Tweak markup for GROUPS tab on mini menu
2014-06-24 13:25:27 +10:00
summerscope
902d896218
Tweak markup for CONTACT tab on mini menu
2014-06-24 13:25:13 +10:00
summerscope
703ee5e566
Tweak markup for ABOUT tab on mini menu
2014-06-24 13:24:56 +10:00
Will Marshall
1ed634239d
Major refactoring
2014-06-20 16:31:49 +10:00
Will Marshall
17521516b4
Patching up some regressions with the tabs
2014-06-20 11:33:30 +10:00
Will Marshall
b0d88c071a
Merge branch 'laura_and_will'
2014-06-20 10:49:31 +10:00
Will Marshall
c97fa711b7
Adding config changes to app.rb, fixing mixing producers links
2014-06-20 10:47:46 +10:00
summerscope
f4fc0beb36
Styling about on hub shopfront page
2014-06-20 10:34:46 +10:00
summerscope
176735544b
Changing class name to remove ofn- from naming convention which call the icon font styling
2014-06-12 12:12:25 +10:00
Will Marshall
75f1bf4f54
Merging in master
2014-06-10 14:53:49 +10:00
Will Marshall
74b9810d22
Removing image from about us
2014-06-06 14:04:47 +10:00
summerscope
0c501b58a5
Adjust layout for 12 column grid for Hub details and order cycle info plus adjust CSS to allow for different break points
2014-06-06 11:19:15 +10:00
Will Marshall
fc02e7857a
Merge branch 'master' into laura_and_will
...
Conflicts:
app/views/shopping_shared/_contact.html.haml
2014-06-04 17:24:30 +10:00
Will Marshall
874afb2d7e
Hiding image if not present
2014-06-04 17:13:18 +10:00
Will Marshall
5bd7485ca6
Restoring the image
2014-06-04 17:13:18 +10:00
Will Marshall
2c43d5960d
Patching up url formatting, still need to normalize this on backend
2014-06-04 17:12:17 +10:00
summerscope
62e8a913fa
Merge branch 'laura_and_will' into icon_font
2014-06-04 11:09:37 +10:00
summerscope
1a39b70a14
Merge branch 'master' into laura_and_will
2014-06-04 11:08:44 +10:00
summerscope
037769bfb1
Adding new icons from icon font
2014-06-03 11:50:17 +10:00
summerscope
8fa053a0a8
Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly.
2014-06-03 10:28:18 +10:00
summerscope
31ae0cf2a9
Tweak logic on contact us address line display
2014-05-30 16:14:40 +10:00
Will Marshall
5f163eef1c
Tweaking the contact thingy
2014-05-30 16:10:45 +10:00
summerscope
ae310ff606
Refactor producers tab content for spacing of string
2014-05-30 16:02:46 +10:00
summerscope
587cf1ac9b
Tabs styling for hub shopfront page
2014-05-30 15:56:40 +10:00
