Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

InspireHome #12

Merged
merged 28 commits into from
Jul 24, 2020
Merged

InspireHome #12

merged 28 commits into from
Jul 24, 2020

Commits on Jul 19, 2020

  1. desktop view ready inshallah

    @bahaadabbagh
    bahaadabbagh committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    4d33385 View commit details
    Browse the repository at this point in the history

  2. added Media Query

    @bahaadabbagh
    bahaadabbagh committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    850a2dc View commit details
    Browse the repository at this point in the history

  3. after installing i18n

    @bahaadabbagh
    bahaadabbagh committed Jul 19, 2020
    Configuration menu
    Copy the full SHA
    cb469c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2020

  1. added test file and configured translations from props

    @bahaadabbagh
    bahaadabbagh committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    26eaf00 View commit details
    Browse the repository at this point in the history

  2. deleted media queries + px=>rem

    @bahaadabbagh
    bahaadabbagh committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    baa2e16 View commit details
    Browse the repository at this point in the history

  3. ran prettier

    @bahaadabbagh
    bahaadabbagh committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    67b6cf2 View commit details
    Browse the repository at this point in the history

  4. Normalize all the line endings

    @bahaadabbagh
    bahaadabbagh committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    5755b92 View commit details
    Browse the repository at this point in the history

  5. fixed prettier issue

    @bahaadabbagh
    bahaadabbagh committed Jul 20, 2020
    Configuration menu
    Copy the full SHA
    4d7e5ef View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. deleted bootstrap link in .html

    @bahaadabbagh
    bahaadabbagh committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    a25a13c View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. resolved conflict and added circleCI

    @bahaadabbagh
    bahaadabbagh committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    586fb2d View commit details
    Browse the repository at this point in the history

  2. after tests of CircleCI and megring with dev

    @bahaadabbagh
    bahaadabbagh committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    c8f9c0e View commit details
    Browse the repository at this point in the history

  3. fixed classNames and fixed line breaks to be reponsive instead of <br/>

    @bahaadabbagh
    bahaadabbagh committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    c0ff5af View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. remved font family and added a snapshot test

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    e2dbf2b View commit details
    Browse the repository at this point in the history

  2. fixed tests to be snapshot and removed an extra line

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    ced3f95 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into inspire_home

    @bahaadabbagh
    bahaadabbagh authored Jul 23, 2020
    Configuration menu
    Copy the full SHA
    a08b730 View commit details
    Browse the repository at this point in the history

  4. resolved conflicts and deleted extra space

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    b9eddbd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'inspire_home' of https://github.com/ReCoded-Org/capston… 

    …e-istanbul-dijitalWorld into inspire_home
    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    e4497c5 View commit details
    Browse the repository at this point in the history

  6. fixed issue in package.json because test was failing in circleci

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    4570b16 View commit details
    Browse the repository at this point in the history

  7. deleted extra test

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    50b0295 View commit details
    Browse the repository at this point in the history

  8. deleted one extra space after button

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    c5f3b5c View commit details
    Browse the repository at this point in the history

  9. fixed snapshot

    @bahaadabbagh
    bahaadabbagh committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    b2df6ca View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2020

  1. fixed .prettierrc and added command to script to process snapshot

    @bahaadabbagh
    bahaadabbagh committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    4923269 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into inspire_home

    @bahaadabbagh
    bahaadabbagh authored Jul 24, 2020
    Configuration menu
    Copy the full SHA
    2642dd0 View commit details
    Browse the repository at this point in the history

  3. fixed file name Home.jsx

    @bahaadabbagh
    bahaadabbagh committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    2dbd1c0 View commit details
    Browse the repository at this point in the history

  4. a step of fixing conflicts

    @bahaadabbagh
    bahaadabbagh committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    8f89651 View commit details
    Browse the repository at this point in the history

  5. Saving files before refreshing line endings

    @bahaadabbagh
    bahaadabbagh committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    cda56fc View commit details
    Browse the repository at this point in the history

  6. fixed merge conflicts inshallah

    @bahaadabbagh
    bahaadabbagh committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    769c16f View commit details
    Browse the repository at this point in the history

  7. fixing circle ci test

    @bahaadabbagh
    bahaadabbagh committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    cb6b2f9 View commit details
    Browse the repository at this point in the history