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.

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

Sync main with develop #205

Merged
merged 37 commits into from
Jan 2, 2022
Merged

Sync main with develop #205

merged 37 commits into from
Jan 2, 2022

Commits on Oct 16, 2021

  1. add link for a particular FAQ (#188)

    * added a link for a particular FAQ
    
    * removed inline style to class
    
    * renamed the class
    
    * renamed the class
    
    * renamed the class
    
    * formatted with prettier
    
    * simplified js code
    
    * modified js code
    
    * simplified js code
    
    * removed unnecessary console logs
    
    * modified js code
    
    * modified js code
    
    * button content is made empty and set using css
    
    * removed the inner loop which was used to handle the button inner content
    
    * added pseudo selectors on button
    
    * removed the unused id
    
    * added the vairable for expand button icon
    Manie-oss committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    872f695 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2021

  1. Implement the top part of the new design of homepage

    * changes to my owm repo
    
    * responsive welcome website
    
    * JS file modified
    
    * Conflicts resolved
    
    * final changes to CSS made
    
    * changes to CSS made
    
    * changes to my owm repo
    
    * responsive welcome website
    
    * JS file modified
    
    * Conflicts resolved
    
    * final changes to CSS made
    
    * changes to CSS made
    
    * files changed
    
    * pictures added
    
    * changes to my owm repo
    
    * merge conflicts resolved
    
    * Conflicts resolved
    
    * changes to CSS made
    
    * pictures added
    
    * renamed files
    
    * deleted unwanted pic folder
    
    * corrected backward slashes
    
    * unutilized classes removed
    
    * Js variable names changed
    
    * added ref
    
    * removed target
    
    * added target to navbar
    
    * spelling changes made
    ghosharnab969 committed Oct 24, 2021
    Configuration menu
    Copy the full SHA
    d50f969 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. redesign second screen (#178)

    * merged first and second screen
    
    * added shorthand css properties
    
    * added class to h3
    
    * merged first and second screen
    Ishikabaid committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    259b3e2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2021

  1. Configuration menu
    Copy the full SHA
    8041818 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2021

  1. Added changes for resdesign of welcome site (#177)

    * re-designed header and nav bar
    
    * final changes for header and navbar made
    
    * requested changes made
    
    * Added changes for resdesign of welcome site
    
    * Added prettier  changes for all html files
    
    * Added rem for font-size
    
    * made requested changes to he code
    
    * commented code removed
    
    * navbar contens styling enhanced
    
    * hover effect given to nav contents
    
    * unwanted file removed
    
    * added link to new-feeds container
    
    * Revert "re-designed header and nav bar"
    
    * Added requested changes
    
    * Delete .DS_Store
    
    * Delete .DS_Store
    
    * add link for a particular FAQ (#188)
    
    * added a link for a particular FAQ
    
    * removed inline style to class
    
    * renamed the class
    
    * renamed the class
    
    * renamed the class
    
    * formatted with prettier
    
    * simplified js code
    
    * modified js code
    
    * simplified js code
    
    * removed unnecessary console logs
    
    * modified js code
    
    * modified js code
    
    * button content is made empty and set using css
    
    * removed the inner loop which was used to handle the button inner content
    
    * added pseudo selectors on button
    
    * removed the unused id
    
    * added the vairable for expand button icon
    
    * Implement the top part of the new design of homepage
    
    * changes to my owm repo
    
    * responsive welcome website
    
    * JS file modified
    
    * Conflicts resolved
    
    * final changes to CSS made
    
    * changes to CSS made
    
    * changes to my owm repo
    
    * responsive welcome website
    
    * JS file modified
    
    * Conflicts resolved
    
    * final changes to CSS made
    
    * changes to CSS made
    
    * files changed
    
    * pictures added
    
    * changes to my owm repo
    
    * merge conflicts resolved
    
    * Conflicts resolved
    
    * changes to CSS made
    
    * pictures added
    
    * renamed files
    
    * deleted unwanted pic folder
    
    * corrected backward slashes
    
    * unutilized classes removed
    
    * Js variable names changed
    
    * added ref
    
    * removed target
    
    * added target to navbar
    
    * spelling changes made
    
    * redesign second screen (#178)
    
    * merged first and second screen
    
    * added shorthand css properties
    
    * added class to h3
    
    * merged first and second screen
    
    * Added changes for resdesign of welcome site
    
    * Added changes for resdesign of welcome site
    
    * Added prettier  changes for all html files
    
    * Delete .DS_Store
    
    * Delete .DS_Store
    
    * Added prettier for modified files
    
    * Added css and html changes
    
    * Added css changes
    
    * Modified css changes
    
    * Modified css changes
    
    Co-authored-by: ghosharnab969 <ghosharnab969@gmail.com>
    Co-authored-by: Pujarini Jena <pujarinijena@Pujarini-MacBook-Pro.local>
    Co-authored-by: Rucha Patil <66248039+Rucha1499@users.noreply.github.com>
    Co-authored-by: Mansi Patel <53491434+Manie-oss@users.noreply.github.com>
    Co-authored-by: ARNAB GHOSH <66074296+ghosharnab969@users.noreply.github.com>
    Co-authored-by: Ishika Baid <59817624+Ishikabaid@users.noreply.github.com>
    7 people committed Nov 21, 2021
    Configuration menu
    Copy the full SHA
    54158fa View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2021

  1. Configuration menu
    Copy the full SHA
    3ec5497 View commit details
    Browse the repository at this point in the history
  2. fixed project formatting style

    ican8 committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    76ae48f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55f1292 View commit details
    Browse the repository at this point in the history
  4. fixed formatting

    ican8 committed Nov 25, 2021
    Configuration menu
    Copy the full SHA
    86f9294 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. Revert "fix conflict in css/pages/main.css"

    This reverts commit 3ec5497.
    ican8 committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    4df98af View commit details
    Browse the repository at this point in the history
  2. refactored changes

    ican8 committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    fe496b2 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2021

  1. Merge pull request #191 from ican8/fix/faq-css

    fix for faq page css on develop branch
    Ishikabaid committed Dec 2, 2021
    Configuration menu
    Copy the full SHA
    b49be0f View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2021

  1. Configuration menu
    Copy the full SHA
    41aa673 View commit details
    Browse the repository at this point in the history
  2. Revert "replaced staging login link (#198)" (#199)

    This reverts commit 41aa673.
    swarajpure committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    bda18cf View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2021

  1. Configuration menu
    Copy the full SHA
    86deca8 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2021

  1. Configuration menu
    Copy the full SHA
    382b97c View commit details
    Browse the repository at this point in the history
  2. format the code

    Rucha1499 committed Dec 26, 2021
    Configuration menu
    Copy the full SHA
    c958390 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #200 from Real-Dev-Squad/fix/refactor-welcome-site

    fix and refactor welcome site
    Rucha1499 committed Dec 26, 2021
    Configuration menu
    Copy the full SHA
    f1a4901 View commit details
    Browse the repository at this point in the history
  4. Refactored css and html for desktop view

    user.name: "Rohan Raj Gupta committed Dec 26, 2021
    Configuration menu
    Copy the full SHA
    8fe3976 View commit details
    Browse the repository at this point in the history
  5. Refactored the css and html for welcome-site

    user.name: "Rohan Raj Gupta committed Dec 26, 2021
    Configuration menu
    Copy the full SHA
    d1abe7f View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2021

  1. fixed formatting

    user.name: "Rohan Raj Gupta committed Dec 27, 2021
    Configuration menu
    Copy the full SHA
    108612e View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2021

  1. fixed the mobile view

    user.name: "Rohan Raj Gupta committed Dec 29, 2021
    Configuration menu
    Copy the full SHA
    e33a031 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2021

  1. Fixed separators and added margin at some points

    user.name: "Rohan Raj Gupta committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    21f3a95 View commit details
    Browse the repository at this point in the history
  2. fixed font size of video text

    user.name: "Rohan Raj Gupta committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    6990b26 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #201 from Real-Dev-Squad/fix/css-section-one

    Refactoring css and html files
    Rucha1499 committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    90c6873 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    56c9b90 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #202 from Real-Dev-Squad/fix/link-correct-css-files

    Link renamed css files to discord, coc and faq pages
    Rucha1499 committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    c6b7056 View commit details
    Browse the repository at this point in the history
  6. Refactored linked pages and Image folder

    user.name: "Rohan Raj Gupta committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    0c4cebc View commit details
    Browse the repository at this point in the history
  7. Merge pull request #203 from Real-Dev-Squad/fix/linked-pages

    Refactored linked pages and Image folder
    Ishikabaid committed Dec 30, 2021
    Configuration menu
    Copy the full SHA
    66d2428 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2021

  1. Configuration menu
    Copy the full SHA
    9f09fff View commit details
    Browse the repository at this point in the history
  2. fixed margins

    Ishikabaid committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    dd2c4a8 View commit details
    Browse the repository at this point in the history
  3. fixed alignment issues

    Ishikabaid committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    f2ae5e7 View commit details
    Browse the repository at this point in the history
  4. fixed typo and headings

    Ishikabaid committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    8804935 View commit details
    Browse the repository at this point in the history
  5. fixed mobile headings

    Ishikabaid committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    bceea5c View commit details
    Browse the repository at this point in the history
  6. fixed headings

    Ishikabaid committed Dec 31, 2021
    Configuration menu
    Copy the full SHA
    1c83ae1 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2022

  1. fixed horizontal scroll

    Ishikabaid committed Jan 1, 2022
    Configuration menu
    Copy the full SHA
    daa3d93 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2022

  1. Merge pull request #204 from Ishikabaid/refactorDiscord

    fixed and refactored discord page
    Rucha1499 committed Jan 2, 2022
    Configuration menu
    Copy the full SHA
    2c830c7 View commit details
    Browse the repository at this point in the history