raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,857 Commits 16 Branches 454 Tags
478dd6807293fc361ab5833cc96c2a64485e6ed8
Commit Graph

9857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
478dd68072 In cookies policy helper, added string interpolation to variable to avoid variable (Spree::Config entry) to break the concatenation. Added unit test to validate the error case 2018-09-12 18:30:24 +01:00
luisramos0
409f084bd4 Added matomo opt out iframe to cookies policy page 2018-09-12 18:30:24 +01:00
Pau Pérez Fabregat
3f5c799166 Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page 
Fix ask anonymous users to login for order page
 2018-09-12 16:17:34 +02:00
Pau Pérez Fabregat
e474271698 Merge pull request #2637 from Vadlusk/remove_css_splitter 
Remove duplicate css_splitter references, delete split css file.
 2018-09-12 13:07:15 +02:00
Pau Pérez Fabregat
64e71a1ee7 Merge pull request #2544 from kristinalim/fix-scrolling_in_modals 
Fix top position, height, and scrolling with modals
 2018-09-12 13:05:20 +02:00
Maikel
5e0997d03e Merge pull request #2635 from apoc64/timezone_comments 
Adds comments for setting up timezone in application.yml
 2018-09-08 15:55:16 +10:00
Maikel
62f5228f1f Merge pull request #2643 from luisramos0/transifex_manual 
Fetched latest translations from transifex with tx pull --force
v1.19.0 		2018-09-07 16:46:24 +10:00
Maikel
3e0c74494d Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug 
Pi/updating variants bug
 2018-09-07 15:10:18 +10:00
Maikel
937da277f7 Merge pull request #2628 from openfoodfoundation/dependabot/bundler/rubyzip-1.2.2 
[Security] Bump rubyzip from 1.2.1 to 1.2.2
 2018-09-07 10:51:41 +10:00
Kristina Lim
f9533f8fb8 Refactor redirecting back after requiring login 2018-09-06 19:46:17 +10:00
Kristina Lim
cd41498da9 Ask to login when not authenticated for order page 
Redirect the user to the login page, instead of responding with HTTP
401.
 2018-09-06 16:26:48 +08:00
Kristina Lim
3bf9e95511 Add specs for existing behaviour in order page 2018-09-06 16:26:45 +08:00
Kristina Lim
28d2bb3d47 Wrap controller specs for viewing cart 2018-09-06 15:04:11 +08:00
Kristina Lim
339ea6fa91 Clean up SCSS as suggested by scss-lint 2018-09-06 04:21:35 +10:00
Kristina Lim
9258e8c464 Remove height limit for modals in small screens 2018-09-05 23:58:26 +08:00
Kristina Lim
169aa752d8 Enlarge potential size of modals for large screens 
Change modals for large screens from 10% position from top and 80% max
height, to 5% position from top and 90% max height.

This is to accommodate the taller cookies policy modal.

It seems that it is not easy to apply a custom position and height to a
specific modal only. This doesn't seem to be supported by the modal
library currently being used.

Before the recent changes, most modals were rendering at 10px top
position (not the originally planned 10%), so changing this to 5%
doesn't seem to be much of a compromise.
 2018-09-05 23:58:26 +08:00
Kristina Lim
f4725198e8 Move some CSS to pages/ subdirectory. 2018-09-05 23:58:26 +08:00
Kristina Lim
f03eb02269 Keep height of modal, dialog within screen height 2018-09-05 23:58:25 +08:00
Kristina Lim
a37e9f1b87 Use v0.9.0-20180826174721 in kristinalim fork of angular-foundation 
There is a bug in the handling of % values for the "top" CSS property of
the modals. See details here:

https://github.com/kristinalim/angular-foundation/pull/1

A PR to the original repository has also been submitted, but the project
doesn't seem to be active anymore:

https://github.com/yalabot/angular-foundation/pull/319

And to another fork of the repository:

https://github.com/cwadrupldijjit/angular-foundation/pull/1

The bug was causing the 10% "top" CSS property for the modal to be
treated as 10px.
 2018-09-05 23:58:25 +08:00
Kristina Lim
34adf7cf6c Lower the start point for sliding of modals 
Occasionally, the page scrolls up while the modal is being opened. This
was causing the final position of the modal to be at the wrong location
relative to the viewport.

This was happening because of a race condition between the animation
that slides the modal from above the viewport to the middle, and focus()
which the modal does:

https://github.com/yalabot/angular-foundation/blob/0.8.0/src/modal/modal.js#L109

The final vertical position of the modal is at 10%, so the animation
which translates the modal -25% vertically was starting -15% above the
viewport. The focus() was then causing vertical scroll.

This lowers the starting point of the animation, so there will no longer
be scrolling.

Additionally, the animation would only happen on large screens. The CSS
property "top" is 0 for smaller screens.
 2018-09-05 23:58:25 +08:00
Kristina Lim
6e55e5b1c7 Use maximum of 80% for modals in large screens 
When there is enough content in the modal, the height of the modal plus
its top margin could exceed the height of the viewport.

Considering a top position of 10%, a max height of 80% renders a tall
modal vertically centered, with 10% remaining space at the bottom.
 2018-09-05 23:58:22 +08:00
luisramos0
138fa41b8d Fetched latest translations from transifex with tx pull --force 2018-09-05 14:02:51 +01:00
Pau Pérez Fabregat
0a05e6944e Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise 
Rename "entreprise" in i18n keys to "enterprise"
 2018-09-05 13:23:02 +02:00
Maikel
0d2fa3dc40 Merge pull request #2611 from luisramos0/cookies_banner_font_size 
[Cookies] Increased cookies banner font size for med/large screens to improve readability
 2018-09-04 11:35:32 +10:00
VadLusk
8efbe0e6d2 Delete _split2.css from application.rb assets precompile array. 2018-09-03 11:08:38 -06:00
Pau Pérez Fabregat
7dbbc3e9d8 Merge pull request #2610 from luisramos0/cookies_banner_bug 
[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
 2018-09-03 17:23:17 +02:00
apoc64
fbce828305 Breaks comment into multiple lines 2018-09-03 08:56:42 -06:00
Pau Pérez Fabregat
903d70090e Merge pull request #2636 from luisramos0/heroku_dead_code 
Removed old files that were used with, now unsupported, heroku
 2018-09-03 12:49:19 +02:00
Maikel
129e2c915e Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0 
Bump angular-rails-templates from 0.2.0 to 0.3.0
 2018-09-03 14:39:21 +10:00
Maikel
1b264403e0 Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user 
Subscription emails for customer should not link to order page if customer has no user account
 2018-09-03 14:38:56 +10:00
Maikel
3fadd06dc7 Merge pull request #2613 from luisramos0/cookies_better_policy_page 
[Cookies] Updated cookies policy page text
 2018-09-03 11:49:14 +10:00
Maikel
42afd426d5 Merge pull request #2620 from openfoodfoundation/dependabot/bundler/foreigner-1.7.4 
Bump foreigner from 1.6.1 to 1.7.4
 2018-09-03 11:48:48 +10:00
Maikel
11ab875b9a Merge pull request #2623 from openfoodfoundation/dependabot/bundler/eventmachine-1.2.7 
Bump eventmachine from 1.2.3 to 1.2.7
 2018-09-03 11:48:34 +10:00
VadLusk
f74a6e47d5 Remove css_splitter references, delete all_split2.css. #1361 #2633 2018-09-03 09:20:26 +10:00
luisramos0
512577768c Removed old files that were used with, now unsuported, heroku 2018-09-02 22:13:42 +01:00
apoc64
e62a755ddb Adds comments for setting up timezone in application.yml 2018-09-02 11:08:27 -06:00
luisramos0
59f8dd4458 Improved cookies spec by keeping global config values as they were before the test 2018-09-01 20:35:07 +01:00
Kristina Lim
f844236b9c Remove order link in non-user order cancellation email 2018-09-01 23:46:12 +08:00
Kristina Lim
5f2c3a1955 Remove order link in non-user failed payment email 2018-09-01 23:46:12 +08:00
Kristina Lim
f8244a400a Custom subscription placement email if non-user 
The order link should not be provided if the order does not have an
associated user account.
 2018-09-01 23:46:11 +08:00
Kristina Lim
ad8b120e48 Extract format for order cycle closing in emails 
Using a helper for this, but this can be changed to look up a
translation key.
 2018-09-01 23:46:08 +08:00
Matt-Yorkley
9d05e5c97a Remove duplicate line in spec 2018-09-01 14:09:07 +01:00
Kristina Lim
dc4037474d Test order links in subscription placement emails 2018-09-01 15:40:36 +08:00
Matt-Yorkley
d8bbcdc54b Decrease batch size to reduce chance of timeouts 2018-08-31 22:52:44 +01:00
Matt-Yorkley
4dfbbd60d4 Fix occasional StaleObjectError on variant updates 2018-08-31 19:47:08 +01:00
dependabot[bot]
4557bfbc17 [Security] Bump rubyzip from 1.2.1 to 1.2.2 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-31 17:49:12 +00:00
Matt-Yorkley
75a9ea5bfa Prefer .flat_map(&foo) over .map(&foo).flatten 2018-08-31 15:38:38 +01:00
Matt-Yorkley
04d50d4555 Fix filter results bug in validation section 2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6 Rename "entreprise" in i18n keys to "enterprise" 2018-08-31 15:26:30 +08:00
Maikel
a9c8c033c7 Merge pull request #2566 from openfoodfoundation/dependabot/bundler/daemons-1.2.6 
Bump daemons from 1.2.2 to 1.2.6
 2018-08-31 14:54:53 +10:00