Skip to content
This repository has been archived by the owner on Jun 28, 2021. It is now read-only.

Bump lodash.mergewith from 4.6.0 to 4.6.2 #1166

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

Bump lodash.mergewith from 4.6.0 to 4.6.2 #1166

wants to merge 68 commits into from

Commits on May 27, 2017

  1. Limit selection of translations (#718) (#800)

    @azeezolaniran2016 @mmahalwy
    azeezolaniran2016 authored and mmahalwy committed May 27, 2017
    Configuration menu
    Copy the full SHA
    d6d09d9 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2017

  1. Moved font path to cdn, fixed direction for farsi (#809) 

    * moved font path to cdn, fixed direction for farsi

* fixed language name
    @naveed-ahmad @mmahalwy
    naveed-ahmad authored and mmahalwy committed May 30, 2017
    Configuration menu
    Copy the full SHA
    f80ad10 View commit details
    Browse the repository at this point in the history

  2. Reduce audio api calls (#807)

    @mmahalwy @naveed-ahmad
    mmahalwy authored and naveed-ahmad committed May 30, 2017
    Configuration menu
    Copy the full SHA
    d0415e5 View commit details
    Browse the repository at this point in the history

  3. Loader overlay (#750)

    @mmahalwy @naveed-ahmad
    mmahalwy authored and naveed-ahmad committed May 30, 2017
    Configuration menu
    Copy the full SHA
    99645b2 View commit details
    Browse the repository at this point in the history

  4. Change license to reflect other projects (#805) 

    * Change license to reflect other projects

* replace ios with quran.com
    @mmahalwy @naveed-ahmad
    mmahalwy authored and naveed-ahmad committed May 30, 2017
    Configuration menu
    Copy the full SHA
    468ad66 View commit details
    Browse the repository at this point in the history

  5. added content page for tafsir (#799) 

    * added content page for tafsir

* fixed routes and tafsir actions

* added action for tafsir

* finished tafsir modal

* moved foot note into common popup

* fixed foot note action

* enabled wraper class name of popup

* fixed modal wrapper class and size for tafsir

* minor ui fixes

* merge fix

* tafsir id could be string as well
    @naveed-ahmad @mmahalwy
    naveed-ahmad authored and mmahalwy committed May 30, 2017
    Configuration menu
    Copy the full SHA
    5fb9505 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. Create nl.js 

    I have translated the website also to Dutch
    @abdelouali
    abdelouali authored Jun 1, 2017
    Configuration menu
    Copy the full SHA
    52dcd94 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. moved all setting related compontent to settings namespace

    @naveed-ahmad
    naveed-ahmad committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    80ebfca View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. fixed setting

    @naveed-ahmad
    naveed-ahmad committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    3970ed1 View commit details
    Browse the repository at this point in the history

  2. minor changes for tafsir

    @naveed-ahmad
    naveed-ahmad committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    510b113 View commit details
    Browse the repository at this point in the history

  3. added local in setting

    @naveed-ahmad
    naveed-ahmad committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    603536d View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. load setting/options from cookies

    @naveed-ahmad
    naveed-ahmad committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    046fc32 View commit details
    Browse the repository at this point in the history

  2. added reset font size

    @naveed-ahmad
    naveed-ahmad committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    33518d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2017

  1. Simple refactorizations. (#820) 

    * Remove unnecessary qualifiers on 0 values.

* Make key quotations consistent.

* General refactor, see details.

Replace `var` with `const` where necessary.
Remove unnecessary semicolons in some places.
Add semicolons in some places.
General style refactorizations.

* Undo server.*.js changes
    @UmanShahzad @mmahalwy
    UmanShahzad authored and mmahalwy committed Jun 10, 2017
    Configuration menu
    Copy the full SHA
    93cbf77 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2017

  1. Merge branch 'master' of github.com:quran/quran.com-frontend into sav… 

    …e_setting
    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    0cea96a View commit details
    Browse the repository at this point in the history

  2. don't need switch toggle[moved to components]

    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    31501b1 View commit details
    Browse the repository at this point in the history

  3. minor fixes for urdu and rtl languages

    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    58beafb View commit details
    Browse the repository at this point in the history

  4. fixed font size and alignment on rtl languages for translations and f… 

    …oot note
    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    80273a1 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #818 from quran/save_setting 

    Refactor settings
    @naveed-ahmad
    naveed-ahmad authored Jun 11, 2017
    Configuration menu
    Copy the full SHA
    652b852 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into patch-1

    @naveed-ahmad
    naveed-ahmad authored Jun 11, 2017
    Configuration menu
    Copy the full SHA
    968fbe7 View commit details
    Browse the repository at this point in the history

  7. added Dutch language

    @naveed-ahmad
    naveed-ahmad authored Jun 11, 2017
    2 Configuration menu
    Copy the full SHA
    c378d29 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #812 from abdelouali/patch-1 

    Create nl.js
    @naveed-ahmad
    naveed-ahmad authored Jun 11, 2017
    Configuration menu
    Copy the full SHA
    28b30f8 View commit details
    Browse the repository at this point in the history

  9. removed sitemap

    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    6f7d12d View commit details
    Browse the repository at this point in the history

  10. fixed ayat ul kursi

    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    ca3d93e View commit details
    Browse the repository at this point in the history

  11. refacor home to component

    @naveed-ahmad
    naveed-ahmad committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    d26f9ad View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. wip on loading juzs

    @naveed-ahmad
    naveed-ahmad committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    0b8e4ed View commit details
    Browse the repository at this point in the history

  2. added minimal UI for juz

    @naveed-ahmad
    naveed-ahmad committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    84c1ad5 View commit details
    Browse the repository at this point in the history

  3. change default translation to The Clear Quran

    @naveed-ahmad
    naveed-ahmad committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    c3f6d44 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Merge pull request #824 from quran/clear_quran_as_default_trans 

    change default translation to The Clear Quran
    @naveed-ahmad
    naveed-ahmad authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    892c6e3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into move_sitemap_to_api

    @naveed-ahmad
    naveed-ahmad authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    4cd7ca2 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. Merge branch 'master' into filter_by_para

    @naveed-ahmad
    naveed-ahmad authored Jun 21, 2017
    Configuration menu
    Copy the full SHA
    b7f7913 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2017

  1. disable lint

    @naveed-ahmad
    naveed-ahmad committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    2c3dee6 View commit details
    Browse the repository at this point in the history

  2. Fixed an issue that was causing the wrong word to highlight

    @iMoe037
    iMoe037 committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    f0ff1e7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #823 from quran/filter_by_para 

    Filter by para
    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    24598f2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into fix/ayah-highlight

    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    809ddcf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into move_sitemap_to_api

    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    3df7cab View commit details
    Browse the repository at this point in the history

  6. Merge pull request #822 from quran/move_sitemap_to_api 

    Move sitemap to api
    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    214474e View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into fix/ayah-highlight

    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    d626fd2 View commit details
    Browse the repository at this point in the history

  8. Fixed surah dropdown #793

    @naveed-ahmad
    naveed-ahmad committed Jun 24, 2017
    Configuration menu
    Copy the full SHA
    fb0da49 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into switch_surah

    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    d8708c9 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #831 from iMoe037/fix/ayah-highlight 

    Fixed an issue that was causing the wrong word to highlight
    @naveed-ahmad
    naveed-ahmad authored Jun 24, 2017
    Configuration menu
    Copy the full SHA
    040b464 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. Changed the name attribute to fix auto-scrolling

    @iMoe037
    iMoe037 committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    97a0002 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #833 from iMoe037/fix/auto-scroll 

    Changed the name attribute to fix auto-scrolling
    @naveed-ahmad
    naveed-ahmad authored Jun 25, 2017
    Configuration menu
    Copy the full SHA
    d062d2f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into switch_surah

    @naveed-ahmad
    naveed-ahmad authored Jun 25, 2017
    Configuration menu
    Copy the full SHA
    7d0c884 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Fix beginning of surah button not reseting the player (#674) (#821)

    @azeezolaniran2016 @mmahalwy
    azeezolaniran2016 authored and mmahalwy committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    f517d5e View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2017

  1. Bug fix for issue #835

    @ikandars
    ikandars committed Jun 28, 2017
    Configuration menu
    Copy the full SHA
    fd55a6b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into master

    @naveed-ahmad
    naveed-ahmad authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    77b7fec View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into switch_surah

    @naveed-ahmad
    naveed-ahmad authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    89b2966 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #836 from ikandars/master 

    Bug fix for issue #835
    @naveed-ahmad
    naveed-ahmad authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    723e36a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into switch_surah

    @naveed-ahmad
    naveed-ahmad authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    06a31b5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #832 from quran/switch_surah 

    Fixed surah dropdown #793
    @naveed-ahmad
    naveed-ahmad authored Jun 28, 2017
    Configuration menu
    Copy the full SHA
    ae47deb View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2017

  1. Refactorizations. 

    Ensure consistent JSON-style maps.
Add HTML corrections & reorganize a little.
Correct href keys.
    Uman Shahzad committed Jul 2, 2017
    Configuration menu
    Copy the full SHA
    37f4008 View commit details
    Browse the repository at this point in the history

  2. Refactorizations. 

    HTML fixes and what not.
Tiny changes and one surprising typo.
    Uman Shahzad committed Jul 2, 2017
    Configuration menu
    Copy the full SHA
    d0ef11b View commit details
    Browse the repository at this point in the history

  3. update prettier to support scss formatting

    @thabti
    thabti committed Jul 2, 2017
    Configuration menu
    Copy the full SHA
    248a3f2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #841 from quran/feature/update-prettier 

    update prettier to support scss formatting
    @naveed-ahmad
    naveed-ahmad authored Jul 2, 2017
    Configuration menu
    Copy the full SHA
    b848576 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into refactor_2

    @naveed-ahmad
    naveed-ahmad authored Jul 2, 2017
    Configuration menu
    Copy the full SHA
    0cc5aea View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into refactor

    @naveed-ahmad
    naveed-ahmad authored Jul 2, 2017
    Configuration menu
    Copy the full SHA
    919fdb9 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #838 from UmanShahzad/refactor 

    Simple refactorizations (v2).
    @naveed-ahmad
    naveed-ahmad authored Jul 2, 2017
    Configuration menu
    Copy the full SHA
    be9f0a7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into refactor_2

    @naveed-ahmad
    naveed-ahmad authored Jul 2, 2017
    Configuration menu
    Copy the full SHA
    93dd5cc View commit details
    Browse the repository at this point in the history

  9. Merge pull request #839 from UmanShahzad/refactor_2 

    Simple refactorizations (v3).
    @naveed-ahmad
    naveed-ahmad authored Jul 2, 2017
    Configuration menu
    Copy the full SHA
    4c1a3c6 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2017

  1. fixes Arabic surah alignment

    Abdullah Alger committed Jul 4, 2017
    Configuration menu
    Copy the full SHA
    ef06792 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #842 from ajalger/fix/arabic-align-homepage 

    Fixes Arabic Surah Alignment Issue 828
    @naveed-ahmad
    naveed-ahmad authored Jul 4, 2017
    Configuration menu
    Copy the full SHA
    0c57fa9 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2017

  1. Adding Styled components instead of style.scss (#829) 

    * eslint fix

* styled-components in readme

* bump quran components

* remove underline
    @mmahalwy
    mmahalwy authored Jul 11, 2017
    Configuration menu
    Copy the full SHA
    2935ac5 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2017

  1. keep the date current (#844)

    @nur-azhar @mmahalwy
    nur-azhar authored and mmahalwy committed Jul 13, 2017
    Configuration menu
    Copy the full SHA
    4e8677f View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2017

  1. Dynamic Footer Year

    @korabh
    korabh committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    1c08440 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #848 from korabh/master 

    Dynamic Footer Year
    @naveed-ahmad
    naveed-ahmad authored Jul 21, 2017
    Configuration menu
    Copy the full SHA
    7789bf5 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2017

  1. Merge branch 'master' into production

    @ahmedre
    ahmedre committed Jul 29, 2017
    Configuration menu
    Copy the full SHA
    28cb16d View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Bump lodash.mergewith from 4.6.0 to 4.6.2 

    Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.0 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Jul 27, 2020
    Configuration menu
    Copy the full SHA
    75e6325 View commit details
    Browse the repository at this point in the history