Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
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
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Maikel Linke
d5aea1b00d
Taxon filter for group producers
2016-01-20 13:32:08 +11:00
stveep
da0810382b
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
2015-12-21 22:19:00 +00:00
Maikel Linke
4eed222f18
Fixed several i18n issues reported by Myriam
2015-10-29 14:55:38 +11:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +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
Maikel Linke
1a96ef88bc
Hiding invisible hubs in producer modal
2015-08-28 10:49:36 +10:00
Continuous Integration
14900655df
Auto-merge from CI [skip ci]
2015-08-05 12:18:31 +10:00
Rohan Mitchell
5688cfd1dd
WIP: Rename ofnEmptiesCart to ofnChangeHub
2015-07-31 16:56:08 +10:00
Rohan Mitchell
d353906bb8
Content manage producer signup page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
9f8fa575b3
Scroll past header on shops page if user is logged in
2015-06-26 15:54:25 +10:00
Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Rohan Mitchell
02d68c662b
Add titles to all darkswarm pages
2015-06-16 15:31:35 +10:00
Rob Harrington
92082ce95c
Adding filter back on producers page
2015-06-15 16:35:41 +08:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
17d123db63
ng-cloak producers page
2015-06-03 16:28:43 +10:00
Rohan Mitchell
7f73a4cc9b
Fix column/row mixup
2015-05-29 15:19:35 +10:00
Rohan Mitchell
8a79741c0e
Update pricing tables and detail formatting
2015-05-28 14:58:46 +10:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Rohan Mitchell
1cf62e01e9
Edit case study text
2015-05-28 14:27:36 +10:00
Rohan Mitchell
acc976f44a
Add hub case studies
2015-05-28 14:00:04 +10:00
Rohan Mitchell
31caf278d7
Add producer case studies
2015-05-28 12:39:40 +10:00
Rohan Mitchell
e81a955827
Add detail to hubs and producers signup pages
2015-05-28 12:21:25 +10:00
Rohan Mitchell
92805b5442
Style producers signup page CTA pane
2015-05-13 12:46:11 +10:00
Rohan Mitchell
1f75974e1c
Unify case studies styling
2015-05-13 12:26:37 +10:00
Rohan Mitchell
fb400df662
Update basic copy and layout on producers signup page
2015-05-13 11:45:25 +10:00
Rohan Mitchell
eac22df200
Merge branch 'master' into redesign
...
Conflicts:
app/assets/javascripts/templates/product_modal.html.haml
2015-05-13 09:53:20 +10:00
Rohan Mitchell
845509b0c0
Style shops signup page
2015-05-12 13:51:31 +10:00
Rick Giner
62ae38372e
#541 add "show more" link to producers lists in hub on home page
2015-05-11 20:31:24 +10:00
summerscope
ae221f0416
Remove clashing padding classes
2015-05-04 23:02:33 +10:00
summerscope
0510fa27e6
More design tweaks for homepage and conversion pages
2015-05-04 18:23:04 +10:00
summerscope
41fb44c19b
More styling on pricing table
...
Remove middle column
2015-05-04 14:33:03 +10:00
summerscope
3091b365ec
Adding in logos for case studies
...
More styling on signup pages
2015-05-04 13:15:18 +10:00
Rick Giner
a3664d4448
Added bindonce and ng-if improvements to Producers templates
2015-05-03 12:51:59 +10:00
summerscope
36838ed457
Hubs signup page WIP styling
2015-05-02 21:49:01 +10:00
summerscope
1090328a3c
Adding padding class and apply to templates to have required padding for new footer.
2015-05-02 20:12:33 +10:00
summerscope
ddde4e9dcb
WIP producers signup page markup
2015-05-02 18:25:23 +10:00
summerscope
fd90da6868
Shops landing page - adding info pane and copy with Jay.
2015-05-02 16:02:18 +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
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
067b814daa
Making legacy filters work properly with filter-selector directive
2015-03-05 18:29:12 +11:00
Rob Harrington
e7854bcd8e
Moving single line selectors to template, making sure other users of taxons-selector still work
2015-03-05 16:38:21 +11:00
Maikel Linke
0fdf313424
Fixing img display of producers if no logo present
2015-02-12 10:31:13 +11:00
summerscope
f36c881f52
Add clear filters feature to Producers page
2014-12-19 13:02:07 +11:00
