raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-14 04:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,963 Commits 16 Branches 456 Tags
fd77f48aca239f1ba07c6af8b355d345bfb341ce
Commit Graph

12963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maikel Linke
599f1a966b Use embedded shops example for tests 2018-07-13 16:36:19 +10:00
Kristina Lim
4ebcf4e3c3 Add internationalisation info to CONTRIBUTING.md 2018-07-13 14:26:27 +08:00
Maikel Linke
66980b247a Fix test of opening shops in new windows 
The test case had some hard-coded enterprise name that didn't match
anything. It then confirmed that all found links (none) would open a new
window. So it wasn't confirming anything.
 2018-07-13 15:37:19 +10:00
Maikel Linke
6f737d8d1e Unclutter spec setup 2018-07-13 15:37:19 +10:00
Maikel Linke
ed747ec612 Use embedded groups example for tests 2018-07-13 15:37:19 +10:00
Maikel Linke
185cf9a312 Remove code duplication 2018-07-13 15:37:18 +10:00
luisramos0
dfb510debe admin page fetcher is now receiving a onLastPageComplete function that is used to show "no results" messages only after the last page is fetched 2018-07-13 15:01:43 +10: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
Maikel Linke
23dd09a8fa Convert Spree view from erb to haml 2018-07-13 09:04:41 +10:00
Maikel Linke
652cc6e677 Import admin user edit view from spree_auth_devise 
We would like to do some customisations and importing the whole file is
simpler and less error prone than using Spree's overrides.
 2018-07-13 09:04:40 +10:00
Maikel Linke
97d1b5d7fe Add spec for creating users 2018-07-13 09:04:40 +10:00
Maikel
b65578fdc5 Merge pull request #2408 from mkllnk/cleanup-route 
Remove impossible route
 2018-07-13 09:01:33 +10:00
Maikel
0bd40f498a Merge pull request #2447 from mkllnk/update-translation-documentation 
Move i18n locale doc to wiki and reference that
 2018-07-12 10:07:39 +10:00
Maikel Linke
86f2d7a344 Remove impossible route 
Hash fragments are not part of the http request and not sent to the
server. So the routes will never see a hash fragment which means that
this route is never used.
 2018-07-12 10:05:08 +10:00
luisramos0
b302a1d03d added Enterprise registration exit message and moved step TYPE translations to a new structure on en.yml (test if transifex picks up the existing translations) 2018-07-12 08:53:06 +10:00
Pau Pérez Fabregat
8cec9d5723 Merge pull request #2451 from Matt-Yorkley/pr_categories 
Add changelog category to PR template
 2018-07-11 22:40:52 +02:00
Matt-Yorkley
056df62359 Add changelog category to PR template 2018-07-11 18:03:45 +01:00
Pau Pérez Fabregat
79b86a4885 Merge pull request #2448 from kristinalim/fix-broken_great_pr_link_in_contributing 
Fix broken "making a great pull request" link in CONTRIBUTING.md
v1.16.0 		2018-07-11 13:19:17 +02:00
Kristina Lim
5508c6741f Fix broken "great-pr" link in CONTRIBUTING.md 2018-07-11 14:10:20 +08:00
Maikel Linke
24f77184cf Move i18n locale doc to wiki and reference that 2018-07-11 11:31:27 +10:00
Maikel Linke
2334f0854c Less invasive modifying the checkout state machine 2018-07-11 10:55:12 +10:00
Pau Pérez Fabregat
deb04c3075 Merge pull request #2444 from openfoodfoundation/transifex 
Transifex
 2018-07-10 12:12:05 +02:00
Maikel Linke
459057a7db Revert accidental copy and paste 2018-07-10 10:31:51 +10:00
Maikel
26c23887e2 Merge pull request #2276 from oeoeaio/subs-use-default-card 
Subs: Use Default Card for Subscriptions
 2018-07-10 10:22:58 +10:00
Maikel Linke
f9a3338755 Simplify serialiser with delegate 2018-07-10 10:01:18 +10:00
Maikel Linke
b478ef9fd0 Make admin serialiser specs runnable on their own 2018-07-10 09:59:00 +10:00
Transifex-Openfoodnetwork
15db5e1d50 Updating translations for config/locales/en_GB.yml 2018-07-09 20:23:01 +10:00
Rob Harrington
3dacd06b6b Reload order before sending emails to ensure state is up to date 2018-07-05 19:26:12 +10:00
Rob Harrington
0afa9fae8e Check authorisation before attempting to charge credit cards on order cycle close 2018-07-05 19:26:12 +10:00
Rob Harrington
4fd333bbaf Remove obsolete reference to credit_card from subscription serializer 2018-07-05 19:26:12 +10:00
Rob Harrington
a902af42a3 Update attribute that errors are added to from credit_card to payment_method 2018-07-05 19:26:12 +10:00
Rob Harrington
edde929ced Replace uses of #stub with #allow in Admin::CustomersController 2018-07-05 19:26:12 +10:00