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

Abhay #101

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

Abhay #101

wants to merge 17 commits into from

Conversation

Abhay3333
Copy link

@Abhay3333 Abhay3333 commented Oct 10, 2024

Issue solved

asiyani and others added 17 commits May 31, 2017 21:18
* git auth support and user routes added

* login/logout button added

* failed login page added

* link bug fixed

* change GET /user/logout to POST user/logout

* fixed gitignore error

* deleted .dev.env form css folder

* removed my client_ID and secret from this file.

* added .dev.env to .gitignore

* bug fix with access token

* changed login alert - now it will ask for login
* Run eslint on every file, fix issues

* adding prettier and format all files

* fix tests
@Abhay3333
Copy link
Author

Fix: Resolve merge conflicts and update files

This commit resolves conflicts in the following files:

  • README.md
  • emoji/emoji.js
  • index.html
  • js/infinite-scroll.js
  • js/main.js
  • js/usernameSelection.js
  • js/usernames.js
  • package.json
  • yarn.lock

Updated the code to ensure compatibility with the latest changes from the main branch.

Resolves: #123
image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants