raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,944 Commits 21 Branches 450 Tags
ef488133e8d4bf8bbb64b75bdde87cd11e81e2bc
Commit Graph

7944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius Pabrinkis
ef488133e8 Add missing translations from files list. 2017-07-21 12:17:12 +10:00
clairezed
5c66a2fc9d Fix wrong key replacement for producer_shop_description_text 2017-07-21 11:15:03 +10:00
clairezed
5f8890e963 update producers pack translation key from sell_description_text to producer_shop_description_text 2017-07-21 11:15:03 +10:00
clairezed
58c463497a #1541 fixing wrong translation key in producers packs 2017-07-21 11:15:03 +10:00
Rob Harrington
3bb6d68adf Exclude node_modules from rubocop analysis 
I don't need to see offences for node modules when I run rubocop locally
 2017-07-21 11:06:16 +10:00
Duende13
705295049e Improved test for variant serializer 2017-07-21 10:18:55 +10:00
Duende13
a07fd854f6 New test for variant serializer 2017-07-21 10:18:55 +10:00
Duende13
b2bae242d9 Sorting variants by name_to_display and unit_value. Issue 1604. 2017-07-21 10:18:55 +10:00
Maikel Linke
1a57a0b3ca Revert changes in fr.yml 2017-07-19 09:46:23 +10:00
François Turbelin
a0595bc45a Add missing translations on views 2017-07-19 09:45:11 +10:00
Enrico Stano
8853340fa1 Merge pull request #1655 from oeoeaio/update-eventmachine 
Bump eventmachine version to resolve openssl issue on macOS
 2017-07-13 13:04:28 +02:00
Enrico Stano
bde3fa4ce6 Merge pull request #1671 from coopdevs/multiline-method-calls 
Use indented style for multiline method calls
 2017-07-12 18:40:34 +02:00
Pau Perez
cee24dcca7 Use indented style for multiline method calls 
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:

  orders = Spree::Order
    .an_scope
    .another_scope
    .where(id: list_of_ids)

It also autofixes the current violations and updates the
rubocop_todo.yml
 2017-07-12 10:40:53 +02:00
Maikel
6fbf902562 Merge pull request #1680 from mkllnk/entreprise-typo 
Correct typo raised by Sergi
 2017-07-12 15:14:06 +10:00
Maikel Linke
dc0da6f7b7 Correct typo raised by Sergi 2017-07-12 14:40:44 +10:00
Pau Perez
385847d7da Doc why FinalizeAccount uses order objects 
Read the top-level class documentation for the details.
 2017-07-12 11:49:04 +10:00
Rob Harrington
9d7f63db42 Bump eventmachine version to resolve openssl issue on macOS 2017-07-12 11:42:15 +10:00
Pau Perez
d0c6292e9d Add github template for pull requests 2017-07-07 13:56:12 +10:00
Matt-Yorkley
994023ec10 Update codeclimate version 2017-07-06 18:15:24 +10:00
Pau Perez
1028b49719 Stop using Order#shipment as it will be deprecated 
Spree 2.0 adds a deprecation warning to it and Spree 2.1 removes it.
 2017-07-05 16:33:04 +10:00
Maikel Linke
b7f99c3185 Merge branch 'transifex' v1.8.12 2017-06-30 16:28:08 +10:00
Rob Harrington
ce85027b79 Update rubocop_todo.yml using rubocop 0.49.1 2017-06-29 10:47:56 +10:00
Rob Harrington
94b6a61665 Bump rubocop to latest version (0.49.1) 2017-06-29 10:47:56 +10:00
Rob Harrington
f84acf44f3 Disable scss-lint for CodeClimate 
Until we can tweak #1393 to work with CodeClimate
 2017-06-28 18:09:03 +10:00
Diogo Matsubara
386d651678 Fix #1611 (Rephrase error message for people logging in with an existing user email) 
update test to use new rspec syntax
 2017-06-28 15:35:21 +10:00
Matt-Yorkley
23a6e2dd8f Changed modal redirect behaviour 2017-06-28 14:35:17 +10:00
Transifex-Openfoodnetwork
6c69eebcbf Updating translations for config/locales/nb.yml [skip ci] v1.8.11-translated 2017-06-27 05:41:31 +10:00
Rob Harrington
d8a158c56d Rubocop: Update comment on Rails/DynamicFindBy, justifying Enabled: false 2017-06-24 13:37:47 +10:00
Rob Harrington
dfda30f4cb Rubocop: Regenerate rubocop_todo.yml using --exclude-limit 100 2017-06-24 13:33:57 +10:00
Rob Harrington
d26970d04c Rubocop: Move Style/ClassAndModuleChildren back to rubocop_todo.yml 2017-06-24 12:59:03 +10:00
Transifex-Openfoodnetwork
63e453e2c7 Updating translations for config/locales/fr.yml [skip ci] 2017-06-23 18:09:39 +10:00
Rob Harrington
c7ed27286a Rubocop: Correct Lint/ParenthesesAsGroupedExpression offences 2017-06-23 17:02:20 +10:00
Rob Harrington
e5340cb53a Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config 2017-06-23 16:49:08 +10:00
Rob Harrington
7079952f6b Add rubocop to development group in gemfile 2017-06-23 16:49:08 +10:00
Rob Harrington
f79dcaba15 Rubocop: Add Rails cops to config and todo 2017-06-23 16:49:08 +10:00
Rob Harrington
33a1d97d5e Rubocop: Disable Style/ClassAndModuleChildren in main config 2017-06-23 16:49:08 +10:00
Rob Harrington
28ea23965b Rubocop: Correct Lint/AmbiguousOperator offences 2017-06-23 16:49:08 +10:00
Rob Harrington
fbdbbb980f Rubocop: Disable Lint/AmbiguousBlockAssociation in main config 2017-06-23 16:49:08 +10:00
Rob Harrington
fc5b339e2a Rubocop: Correct Lint/DuplicateMethods offences 2017-06-23 16:49:08 +10:00
Rob Harrington
4acb3f1962 Rubocop: Use Relaxed.Ruby.Style as starting point for settings 
Updated .rubocop_todo.yml
 2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences 2017-06-23 16:49:08 +10:00
Rob Harrington
b277ff03ea Rubocop: Auto-correct Style/TrailingBlankLines offences 2017-06-23 16:49:07 +10:00
Rob Harrington
5061d0c4cd Rubocop: Tweak config, and add todo file 2017-06-23 16:49:07 +10:00
Continuous Integration
931a5be162 Merge remote-tracking branch 'origin/master' into HEAD 2017-06-22 13:19:25 +10:00
Maikel Linke
e437cba155 Make style flexible for all sizes of logos 
Trying to support logos that are big. But logos that are too small
should not be stretched either, better small than ugly.

Remove static size declaration from HTML template since it doesn't
reflect the logo size.

Unfortunately, there are other CSS files that are in conflict. The file
mail/email.css.scss defines this globally:

    img {
      max-width: 100%;
    }
 2017-06-16 16:49:43 +10:00
Maikel Linke
ec53d9df7a Merge tag 'v1.8.11' into transifex 2017-06-15 09:59:59 +10:00
Maikel Linke
3330e9b219 Init registration form with default country 2017-06-14 16:47:02 +10:00
Maikel Linke
884743ce97 Filter countries without states for registration 2017-06-14 16:47:01 +10:00
Maikel Linke
b482d1e57c Spec current behaviour of country selector 
The enterprise sign-up form shows invalid countries without states and
does not choose the default country. See:

https://github.com/openfoodfoundation/openfoodnetwork/issues/1330
 2017-06-14 16:47:01 +10:00
Maikel Linke
78f5002be5 Separate variant names by spaces 
To enable the search for the beginning of a variant name, they need to
be separated.

See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
 2017-06-14 16:37:46 +10:00