Maikel Linke
143c005f0a
Merge remote-tracking branch 'origin/i18n-replace-strings-in-views' into i18n-replace-strings-in-js
2015-10-01 11:15:01 +10:00
Maikel Linke
ae96541112
Internationalisation of Javascript views
2015-10-01 11:13:45 +10:00
Maikel
4f05b9c28d
Changing en: to fr: in French locale file
2015-09-18 09:38:21 +10:00
Maikel
aa4f1f1dec
Fixing syntax typo in Norwegian language file
2015-09-18 09:37:35 +10:00
sigmundpetersen
b8e40d799b
Added translations
2015-09-17 14:18:09 +02:00
Continuous Integration
205a7f1673
Auto-merge from CI [skip ci]
2015-09-17 09:16:20 +10: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
2488411b94
JS feature specs completing before cleaning db
...
Some specs ran into a deadlock when the Database::Cleaner tried to do
its job while AJAX requests were still triggering other actions.
2015-09-16 15:38:09 +10:00
Myriam
11892ffe21
creation of the french translation file
2015-09-14 14:42:37 +02:00
Myriam
3e53decd85
Delete fr.yml
2015-09-04 15:25:53 +02:00
Myriam
4f0e75893e
Create fr.yml
2015-09-04 15:22:19 +02:00
sigmundpetersen
e61abb92d2
Create no.yml
2015-09-03 12:16:58 +02: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
5ccae9cfab
Redirecting /products/:id to /
2015-08-21 15:18:31 +10:00
Rohan Mitchell
ec908fce92
Make TOS URL configurable
2015-07-31 14:51:17 +10:00
Rohan Mitchell
5fd3dc1d28
Customise footer logo
2015-07-17 16:24:07 +10:00
Rohan Mitchell
bb3a4170f5
Add dimensions to image upload
2015-07-17 16:06:50 +10:00
Rohan Mitchell
372b17703a
Remove unused content fields and partial
2015-07-17 16:06:49 +10:00
Rohan Mitchell
5de9a5eb54
Add config setting to enable/disable stats on home page
2015-07-17 16:06:49 +10:00
Lynne Davis
dc95167f15
Adding bits missed from the last commit.
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-07-15 14:44:49 +10:00
Rohan Mitchell
73b90dba10
Shift legacy redirect further down routes to avoid stomping /enterprises/check_permalink
2015-07-10 09:42:09 +10:00
Rohan Mitchell
d67b34c2bd
Remove deprecated about_us page and add redirect
2015-07-10 09:42:09 +10:00
Rohan Mitchell
4f2389e257
Remove legacy enterprises views - index, suppliers, distributors, show
2015-07-10 09:42:09 +10:00
Rohan Mitchell
fc4cd517fd
Redirect legacy enterprise path to home #571
2015-07-10 09:42:09 +10:00
Rohan Mitchell
213242627e
Merge branch 'master' into redesign-phase-2
...
Conflicts:
app/views/home/_hubs.html.haml
2015-07-01 15:44:36 +10:00
Rohan Mitchell
b991f6c228
Add angular-slideables to js test include
2015-06-26 16:07:23 +10:00
Rohan Mitchell
bc11140a40
Make config reset for all tests more robust. Add cache isolation for parallel specs.
2015-06-24 14:02:45 +10:00
Rohan Mitchell
bf953f8987
Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets.
2015-06-16 18:25:44 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rohan Mitchell
b540f645c3
Split CSS to overcome IE9's 4096 rule limit
2015-06-16 11:57:50 +10:00
Maikel Linke
80bf6e61ad
redirect /t/products/:id to /
2015-06-13 11:59:52 +10:00
Maikel Linke
f44ac5b27b
Merge branch 'url-redirects' into e2e-links
2015-06-12 17:03:31 +10:00
Maikel Linke
d61073f08d
redirect /enterprises to /
2015-06-12 10:47:50 +10:00
Maikel Linke
2fb8f9f8a3
Redirect /products to /
...
GitHub issue #571
2015-06-12 10:47:50 +10:00
Rohan Mitchell
4f311543ae
Merge branch 'master' into enterprise-index-revamp
2015-06-12 10:26:11 +10:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rohan Mitchell
6dea3fa19d
Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:32 +10:00
Maikel Linke
a8b6f2942a
Releasing Assets Version 1.1
...
The uglifier update affects only re-compiled assets. In order to replace
the broken assets (e.g. #396 ) with re-compiled assets, we change the
assets version number.
2015-06-11 10:54:30 +10: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
a0fd91dc57
Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting.
2015-06-10 17:03:56 +10:00
Maikel Linke
f88f42283a
Session stored in ActiveRecored instead of Cookies
...
The cookie store is not big enough in some cases. In order to solve a
CookieOverflow error and maybe track down the underlying issue this
patch uses the database instead of cookies to store session data.
2015-06-10 13:49:24 +10:00
Maikel Linke
ffa960b02e
Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:24 +10:00
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +10:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Maikel Linke
d2a61dc096
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 16:37:25 +10:00
Rohan Mitchell
db47c01784
Initial config for parallel spec running
2015-06-03 14:29:38 +10:00
Maikel Linke
bf935623dc
changing default mailer url in development from test.com to 0.0.0.0:3000
2015-05-29 15:24:17 +10:00
Maikel Linke
678b591c18
Explain how to disable delayed jobs to send emails again
2015-05-29 15:24:16 +10:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Rob Harrington
7f80c02c0e
Adding route for managed route for admin orders
2015-05-20 11:45:05 +10:00
