Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CESNET/NERD
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CESNET/NERD
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: user_management
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 17 files changed
  • 3 contributors

Commits on Sep 15, 2021

  1. NERDweb: Reworks user managament 

    Adds registration of local user, email verification for locally
registered user. User passwords are now stored directly in
the database.
    @Aisik00
    Aisik00 committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    80acb7b View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. NERDweb: Middle of Google OAuth

    @Aisik00
    Aisik00 committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    d088581 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2021

  1. new user mgmt: various fixes and todo notes

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

  2. Merge branch 'user_management' of https://github.com/CESNET/NERD into… 

    … user_management
    @vaclavbartos
    vaclavbartos committed Oct 14, 2021
    Configuration menu
    Copy the full SHA
    b05c8c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2022

  1. Merge branch 'master' 

    Conflicts:
	NERDweb/nerd_main.py
    @Oltis17
    Oltis17 committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    726ee6a View commit details
    Browse the repository at this point in the history

  2. Default Google Credentials temp placeholder 

    New pip dependencies: email-validator, flask-dance, bcrypt
    @Oltis17
    Oltis17 committed Jul 21, 2022
    Configuration menu
    Copy the full SHA
    ff265d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

  1. Google OAuth 

    Several user related pages are redesigned, Google OAuth works in testing phase
    @Oltis17
    Oltis17 committed Jul 22, 2022
    Configuration menu
    Copy the full SHA
    6924ca2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2022

  1. GitHub and Twitter OAuth 

    the client ids and secrets are ommited
    @Oltis17
    Oltis17 committed Aug 5, 2022
    Configuration menu
    Copy the full SHA
    d277c43 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. OAuth optimization

    @Oltis17
    Oltis17 committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    bd7d191 View commit details
    Browse the repository at this point in the history
Loading