-
Notifications
You must be signed in to change notification settings - Fork 2
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
add updates to deploy #118
Open
ArshMalik02
wants to merge
25
commits into
deploy
Choose a base branch
from
master
base: deploy
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add redux devtools * fix yarn
…yarn install in the image (#95)
* adds temp makefile * necessary changes to deply on prod Co-authored-by: Nikhil Kansal <[email protected]>
This reverts commit 74f78b5.
This reverts commit 9ab807b.
This reverts commit 45ca6ac.
* Google SSO Button * Remove signIn and signUp components and styles. * Remove ResetPassword components. * Add pretty Google sign in button. * Move styles for sign in button. * Remove reducers. * Recklessly delete register components we no longer need. * Fix createHistory warning. * Remove register container. * Remove extra line. * Remove register route. * Remove password update from profile. * Progress on adding new registration for major and year. * Proper register flow behavior. * Require auth for register page. * Update config. * Work on new registration. * Revert to longer website name for official link per UCLA Policy 110. * Add self as contributor : ) * Fix onChange and add comments. * Work on registration. * Fix reducers and route fpr registration. * Iron out last bugs to pto properly redirect; refresh token and initialize isRegistered with existing token. * Fix last redirect bug. * Fix leaderboard modal. * Clean up pass 1. * Add design and teachla to event analytics options. * More specific third-party cookies error message. Co-authored-by: Ellie Cheng <[email protected]>
Co-authored-by: Dylon Tjanaka <[email protected]> Co-authored-by: Nikhil Kansal <[email protected]>
* Start control panel changes. * Work on admins modal. * just keep swimming * additional auth stuff * progress. * Add admin stuff to user reducer. * Work on modal and password reset. * Password reset bar. * Clean up control panel and move everything to modals. * Prettier. * Super Admin title on sidebar. * Feeling prettier. * Misc + config. * ? * Plugging things in. * Add note. * Prettier. * Work on modals. * More work on modals. * Only cleanup and API plugging left. * Switch positions of buttons. * Work on reducers. * Work on auth. * Oops. * Earmarking this for future changes. * Intermediate work. * Delete more. * One-click reducer. * Work on admins reducer. * Reducers and hide broken image icon. * Prettier. * All admins stuff seemingly works; need to fix propTypes warnings and finish one click password. * Prettier. * Clean up some clutter. * Clean up one click reducer. * Add props. * Will move status message to banner. * Should be done except for PropType warnings.
Co-authored-by: Dylon Tjanaka <[email protected]>
Administrative merge commit.
…g names (#112) * fix modal and top users styling for long names * Remove commented HTML in leaderboardModal.jsx
NOTE: work in progress, need to resolve issues with deploying before merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Transfer recent updates from master branch to deploy branch to fire the Jenkins pipeline for deployment