Matt-Yorkley
23a6e2dd8f
Changed modal redirect behaviour
2017-06-28 14:35:17 +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
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
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
Maikel Linke
a42799dff4
Initialise product.variant_names
...
Not initialising `product.variant_names` causes it to become the string
"undefinedVariant1Variant2" while it should just be "Variant1Variant2".
This mistake did not matter when `variant_names` was just used to search
for a sub-string. A recent change to search only for the beginning of a
word, caused this to fail.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:28:55 +10:00
Maikel Linke
1196cd7df4
Add style guide to the source locale
...
There has been a lack of rules how to structure our locale en.yml. This
is a start to document some guidelines which can evolve over time.
Rules can be discussed in the community forum or in pull requests. Once
there is a strong agreement, we should add it to this guide.
2017-06-14 15:20:01 +10:00
Enrico Stano
3c1eae1f47
Do not blindly clear the whole Rails cache
2017-06-09 10:32:57 +10:00
Matt-Yorkley
ba27d63f9c
Fix logo sizing
2017-06-06 13:59:42 +01:00
Julius Pabrinkis
0083733c4c
#1471 Do no let long producers' name go under icon
2017-06-02 16:29:43 +10:00
Julius Pabrinkis
a1ffc869f3
Refactor code by suggestion to use RegExp and add tests coverage
2017-06-02 15:42:35 +10:00
Rhodri Karim
7a07e8fa16
Issue 1233: product filter should only match if name begins withs search term
2017-06-02 15:42:35 +10:00
enricostano
699da16049
Remove unused spec support method
2017-05-31 15:22:30 +10:00
sseerrggii
18c7b03f3d
Add plurals
2017-05-26 16:51:29 +10:00
Rob Harrington
8b560e6cee
Cleaning up angular variant units controllers a little bit
2017-05-24 15:05:33 +10:00
Matt-Yorkley
7974ac45f2
Add unit description placeholder
2017-05-24 15:05:33 +10:00
Matt-Yorkley
41b5cf10dd
Quick testing update
2017-05-24 15:05:33 +10:00
Matt-Yorkley
b6955cb98c
Updated variant feature spec
2017-05-24 15:05:33 +10:00
Matt-Yorkley
6c36c269c8
Product Edit UX adjustments
2017-05-24 15:05:33 +10:00
Pierre de Lacroix
b879ea5a96
add comments
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
a6ed4a2c6a
fix bad return value
...
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
6972822c49
fix escaping problems on ticket view
2017-05-24 13:35:59 +10:00
Pierre de Lacroix
db63f30a76
cosmetic fixes to the ticket view
2017-05-24 13:35:59 +10:00
Rob Harrington
848193434b
Show item single_display_amount instead of variant price in order details table
...
Also has the effect of taking the inventory price into account (since it is stored against the line item price)
2017-05-19 17:27:04 +10:00
stveep
570f0344da
Remove unused method in wrong controller ^_^
2017-05-19 16:14:22 +10:00
stveep
38c25c412f
Remove duplicated spec, better error message suppression, fix shipping test to wait correctly
2017-05-19 16:14:22 +10:00
stveep
3b4ffe1f70
Suppress line item validation error for newly-created orders
2017-05-19 16:10:06 +10:00
stveep
4699c654fc
Fix feature specs for new 'new admin order' flow
2017-05-19 16:10:06 +10:00
stveep
c1c5d00f45
Add new view to set distribution, ensure the scoped variant single item price is used.
2017-05-19 16:10:06 +10:00
stveep
220693f4e3
Starting alternative flow for new manual order
2017-05-19 16:06:43 +10:00
stveep
fcce858ea4
Fix OC with override factory
2017-05-19 16:06:43 +10:00
stveep
1f9698f7a2
Test to reproduce bug with overridden price not being displayed when an order is added manually
2017-05-19 16:06:43 +10:00
Rob Harrington
1766da9d60
Adding ng-cloak directive to changeable orders banner
2017-05-19 15:54:55 +10:00
