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

Resolving conflicts #1

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

Resolving conflicts #1

wants to merge 34 commits into from

Commits on Oct 9, 2021

  1. preloader added

    @marizvi
    marizvi committed Oct 9, 2021
    Configuration menu
    Copy the full SHA
    e1a4133 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. preloader added

    @marizvi
    marizvi committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    327fecc View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. Merge pull request #56 from marizvi/master 

    Preloader Added
    @shivamm0110
    shivamm0110 committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    958cdfc View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. feat:axios added

    @prathmeshkhandelwal1
    prathmeshkhandelwal1 committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    66521c2 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. improved css of list in homepage

    @ShravaniAK
    ShravaniAK committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    88395cc View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Merge pull request #69 from ShravaniAK/master 

    improved css of list in homepage - ( SMALL CHANGE )
    @rashiyadhruv
    rashiyadhruv committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    7b51b1b View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Update package.json

    @AniModi
    AniModi committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    7003854 View commit details
    Browse the repository at this point in the history

  2. updated package.json

    @AniModi
    AniModi committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    e8f1c0c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #79 from AniModi/master 

    Fixed deployment
    @AniModi
    AniModi committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    f42ed5b View commit details
    Browse the repository at this point in the history

  4. Page in between the github transition

    @SteakFisher
    SteakFisher committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    48f356a View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Delete package-lock.json 

    Tested to be safe as both dependencies already existed within the project
    @SteakFisher
    SteakFisher committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    aff5347 View commit details
    Browse the repository at this point in the history

  2. Setting up vercel

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1bd52bc View commit details
    Browse the repository at this point in the history

  3. Create vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    1457113 View commit details
    Browse the repository at this point in the history

  4. Update vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    946a97c View commit details
    Browse the repository at this point in the history

  5. Update vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    2c56dff View commit details
    Browse the repository at this point in the history

  6. updated vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    4b04840 View commit details
    Browse the repository at this point in the history

  7. Update vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    8af045f View commit details
    Browse the repository at this point in the history

  8. Update vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    2550179 View commit details
    Browse the repository at this point in the history

  9. vercel.yml workflow

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    7226912 View commit details
    Browse the repository at this point in the history

  10. Update vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    4218b84 View commit details
    Browse the repository at this point in the history

  11. Update vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    218a8f5 View commit details
    Browse the repository at this point in the history

  12. Update vercel.yml

    @AniModi
    AniModi committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    eae491b View commit details
    Browse the repository at this point in the history

  13. Delete .github/workflows/vercel.yml

    @aryanargupta
    aryanargupta committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    8c56d31 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #81 from SteakFisher/master 

    Feat: Page in between the github transition
    @AniModi
    AniModi committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    6452c59 View commit details
    Browse the repository at this point in the history

  15. Revert "Feat: Page in between the github transition "

    @AniModi
    AniModi committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    f883969 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #84 from iiitv/revert-81-master 

    Reverting : Build failed on netlify
    @AniModi
    AniModi committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    ee8ef89 View commit details
    Browse the repository at this point in the history

  17. Adding netlify.toml

    @AniModi
    AniModi committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    dd13ba8 View commit details
    Browse the repository at this point in the history

  18. Re: Page in between redirection 

    No modules added whatsoever this time, I apologize for being a moron last time 😆
    @SteakFisher
    SteakFisher committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    874e3e1 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'iiitv:master' into master

    @SteakFisher
    SteakFisher committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    28e44e1 View commit details
    Browse the repository at this point in the history

  20. Update Algorithm.js

    @SteakFisher
    SteakFisher committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    9aa5901 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Merge pull request #86 from SteakFisher/master 

    Re: Page in between redirection
    @AniModi
    AniModi committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    8227432 View commit details
    Browse the repository at this point in the history

  2. feat: add github workflow

    @Alitindrawan24
    Alitindrawan24 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    8e5d189 View commit details
    Browse the repository at this point in the history

  3. feat: add github workflow

    @Alitindrawan24
    Alitindrawan24 committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    b0cd9e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. Merge pull request #90 from Alitindrawan24/master 

    feat: add github workflow
    @aryanargupta
    aryanargupta committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    9e63a96 View commit details
    Browse the repository at this point in the history