raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,608 Commits 18 Branches 454 Tags
d952276e2aaa8a04ad6b7b4543f3f00fd8b84bf4
Commit Graph

9608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Margaret Williford
d952276e2a move footer logo sizing from html to css 2018-07-20 14:00:06 +10:00
Maikel
23964b2542 Merge pull request #2422 from luisramos0/1667_email_validation_fix 
1667 manage validations emails
 2018-07-20 12:19:23 +10:00
Maikel
1b571e9835 Merge pull request #2379 from Matt-Yorkley/uk/guest_label 
Add guest label to admin customers index
 2018-07-20 08:53:26 +10:00
luisramos0
8246893652 Added notice for unexpected mail in confirmation instructions mail (HugsDaniel) 2018-07-19 09:26:29 +10:00
Maikel
1dbd265b30 Merge pull request #2384 from luisramos0/open_new_tab 
added directive to make links open in new tab by default in textangul…
v1.17.0 		2018-07-19 09:17:09 +10:00
Matt-Yorkley
e3162b0a14 Change import method to fix missing variable error on asset precompilation 2018-07-18 23:00:50 +01:00
Matt-Yorkley
456e05d5d2 Include subfolders in scss import 2018-07-18 22:56:10 +01:00
Matt-Yorkley
24ff5555be Create admin SCSS colour palette 2018-07-18 22:56:10 +01:00
Matt-Yorkley
75e52a7a91 CSS tweaks fo guest flag 2018-07-18 22:56:10 +01:00
Matt-Yorkley
583f16b38d Add guest label to admin customers index 2018-07-18 22:56:10 +01:00
Pau Pérez Fabregat
4fe1e1fc9f Merge pull request #2482 from Matt-Yorkley/uk/mail_config 
Allow preferred_mails_from and preferred_mail_bcc to be set from configs
 2018-07-18 19:20:55 +02:00
Pau Pérez Fabregat
4f215da735 Merge pull request #2467 from mkllnk/ci-output-test 
Use progress formatter on Travis to avoid timeout
 2018-07-18 19:19:40 +02:00
Pau Pérez Fabregat
37e2d76a39 Merge pull request #2477 from mkllnk/2465-use-right-subscriptions-translation 
Reference existing translation: closed order cycle
 2018-07-18 16:47:35 +02:00
Pau Pérez Fabregat
fac8e26d8b Merge pull request #2475 from Matt-Yorkley/pi/landing_page 
PI: landing page
 2018-07-18 16:47:17 +02:00
Matt-Yorkley
23cbcda0c3 Allow preferred_mails_from and preferred_mail_bcc to be set from configs 2018-07-18 15:43:02 +01:00
Matt-Yorkley
5737c9803d Add unit_type field to inventory template 2018-07-18 12:59:52 +01:00
Matt-Yorkley
c7deae4253 Remove category field from inventory specs 2018-07-18 12:59:19 +01:00
Pau Pérez Fabregat
8ae5d5f52e Merge pull request #2415 from oeoeaio/update-readme 
Update README.md and add GETTING_STARTED.md
 2018-07-18 11:19:33 +02:00
Pau Pérez Fabregat
d56698e4a6 Merge branch 'master' into update-readme 2018-07-18 10:59:20 +02:00
Pau Pérez Fabregat
7bf27ec6b3 Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors 
2013 Remove dead code for Spree upgrade
 2018-07-18 10:38:19 +02:00
Pau Pérez Fabregat
bd05af5a29 Merge pull request #2442 from kristinalim/translations-enterprise_relationships_to_enterprise_permissions 
Change "Enterprise Relationships" to "Enterprise Permissions"
 2018-07-17 14:48:08 +02:00
Kristina Lim
c16f4203f9 Rename enterprise "Relationships" to "Permissions" 
This only updates en* translations, and does not affect URLs and other
back-end references.
 2018-07-17 16:03:48 +10:00
Pau Pérez Fabregat
0fd57ee7bd Merge pull request #2390 from luisramos0/buk_prod_edit_rounding_issue 
fixed number rounding issue in product bulk edit
 2018-07-16 16:44:59 +02:00
luisramos0
4a44454210 fixed number rounding issue in product bulk edit 2018-07-16 13:13:58 +10:00
Maikel Linke
4d68723fe3 Reference existing translation: closed order cycle 
https://github.com/openfoodfoundation/openfoodnetwork/issues/2465

Viewing a customers subscription could display a translation missing
error.
 2018-07-16 09:24:32 +10:00
Matt-Yorkley
c4af50e95c Add sidebar to Import index page 2018-07-15 23:12:26 +01:00
Matt-Yorkley
632b991952 Add downloadable templates 2018-07-15 21:25:42 +01:00
Matt-Yorkley
f344b7893d Remove Product Import guide page 2018-07-15 20:49:55 +01:00
Pau Pérez Fabregat
da344adbcd Merge pull request #2466 from kristinalim/doc-notes_about_i18n_in_contributing 
Add section about internationalisation to CONTRIBUTING.md
 2018-07-13 19:43:52 +02:00
Pau Pérez Fabregat
c2d9b094d3 Merge pull request #2419 from frank-west-iii/issue-2412-duplicate-menu 
Remove spree product navigation override
 2018-07-13 19:43:07 +02:00
Maikel Linke
622517501c Make spec robust on slow computers 
This spec just failed in an unrelated pull request.
https://travis-ci.org/openfoodfoundation/openfoodnetwork/jobs/403435522

This change should fix it even on very slow computers.
 2018-07-13 19:10:06 +10:00
Frank West
e3b7e050a0 Remove spree product navigation override 
This was here to override the original spree products navigation link,
but since moving back to the index action this had the side effect of
adding an additional navigation item instead. We can simply remove this
override to get rid of the additional menu item.
 2018-07-13 16:58:57 +10:00
Maikel Linke
8e90488117 Use progress formatter on Travis to avoid timeout 
We had a few Travis builds lately that timed out, because no output was
received. Even though our standard formatter Fuubar should detect Travis
and print the right output, nothing was visible in our builds.
https://github.com/travis-ci/travis-ci/issues/1337

In this patch, I tell Travis to use Rspec's default formatter to print
dots for every passed test.
 2018-07-13 16:51:56 +10:00
Kristina Lim
4ebcf4e3c3 Add internationalisation info to CONTRIBUTING.md 2018-07-13 14:26:27 +08:00
Maikel Linke
d5d1eae715 Improve spec description 2018-07-13 09:04:42 +10:00
Maikel Linke
43883d1ab4 Simplify email confirmation directive 
Making better use of Angular features.
Adding a spec for this functionality.
 2018-07-13 09:04:42 +10:00
Maikel Linke
fbe2f7ab4c Remove unused variable from mailer 
The second variable passed by Devise is actually a hash, not a token.
 2018-07-13 09:04:41 +10:00
Maikel Linke
a531135804 Remove unused data-hooks 2018-07-13 09:04:41 +10:00
Maikel Linke
e37213f6a5 Remove redundant edit action 2018-07-13 09:04:41 +10:00
Maikel Linke
28c2ad7160 Move override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
a347837044 Move override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
ab9975cb6c Move override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
339b04a044 Convert spree admin user list to haml 2018-07-13 09:04:41 +10:00
Maikel Linke
9020e7ddd9 Import admin user list from Spree 2018-07-13 09:04:41 +10:00
Maikel Linke
60b66540df Add resend email button to admin user form 
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
 2018-07-13 09:04:41 +10:00
Maikel Linke
6a58deb436 Add message about unconfirmed email to user form 2018-07-13 09:04:41 +10:00
Maikel Linke
8157897f76 Remove unused data hooks 2018-07-13 09:04:41 +10:00
Maikel Linke
9050a52cc2 Move admin user form override into view 2018-07-13 09:04:41 +10:00
Maikel Linke
2032ed6328 Convert admin user edit form to haml 2018-07-13 09:04:41 +10:00
Maikel Linke
cb1dc6e657 Import admin user edit form from spree_auth_devise 2018-07-13 09:04:41 +10:00