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: pythonindia/junction
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f866be3
Choose a base ref
...
head repository: pythonindia/junction
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b20a1d
Choose a head ref
  • 20 commits
  • 93 files changed
  • 16 contributors

Commits on Jun 7, 2020

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

Commits on Jun 12, 2020

  1. Use the default python3 version for nox in development (#694)

    Co-authored-by: Pradyun Gedam <pradyunsg@gmail.com>
    ananyo2012 and pradyunsg authored Jun 12, 2020
    Configuration menu
    Copy the full SHA
    bea2a15 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

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

Commits on Jun 17, 2020

  1. Add missing migrations related to video URL

    Related to #668
    
    Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
    palnabarun committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    d84f748 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. Add labels to the fields in ProposalForm

    Django's default label generation doesn't suffice in some cases.
    One of them being acronyms.
    
    Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
    palnabarun committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    dd5ec2c View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

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

Commits on Jul 31, 2020

  1. Upgrade pytest-django to 3.6 in the test environment

    Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
    palnabarun committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    ac9d951 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. Added First Time Speaker field to the create proposal page (#710)

    * Add `First Time Speaker` field in create proposal page
    
    - Add `is_first_time_speaker` field in proposal form & model
    - Update proposals/views.py
    - Add first time speaker checkbox field in proposals/detail/base.html
    - Add migration for Proposal model
    
    * Update help_text parameter of is_first_time_speaker field in proposal/forms.py
    
    * Fix linting error
    
    * Update proposal base.html for first time speaker
    
    * Update proposal form's help text for is_first_time_speaker field
    
    * Update base.html & forms.py of proposal page
    
    - Show first time speaker label on proposal page only to author & reviewer
    - Reorder first time speaker checkbox in proposal form
    
    * Remove unwanted characters & extra lines
    abhishekmishragithub authored Aug 3, 2020
    Configuration menu
    Copy the full SHA
    4c522c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. Update view url for Dashboard breadcrumb name under user profile (#718

    )
    
    - Update dashboard.html & userprofile.html for user profile for breadcrumb
    
    Signed-off-by: Abhishek Mishra <geekabhi@outlook.com>
    abhishekmishragithub authored Aug 5, 2020
    Configuration menu
    Copy the full SHA
    c968452 View commit details
    Browse the repository at this point in the history
  2. Add functionality to make content url's private

    The content url if set to private can only be viewed by the author or
    the reviewer.
    
    Fixes #713
    
    Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
    palnabarun committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    3fa2076 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2020

  1. Fix bug with first time speaker view template

    There was an issue with the proposal detail view which incorrectly
    displayed first_time_speaker=false as being an First Time Speaker.
    
    Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
    palnabarun committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    e47ba02 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2020

  1. Fix the publicly viewable Draft proposal bug using slug URL

    The proposals in Draft status will return 404 when accessed by
    anyone other than the author.
    
    Fixes #720
    
    Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
    palnabarun committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    5b2d1f6 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2020

  1. Update LICENSE

    palnabarun committed Aug 18, 2020
    Configuration menu
    Copy the full SHA
    69afa7a View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Upgrade to Django 3.2 LTS and Dockerize junction (#757)

    * Upgrade Junction to Python 3.10 & Django 3.2 along with Social Login Fix (#744)
    
    * Upgrade Python Version to 3.10 and Django Version 3.2
    
    * Fix Github and Google Login/Signup
    
    * new package added to the requirements file
    
    * using f-strings
    
    Co-authored-by: @rohitchopra-epam
    
    * Fix unit tests add gunicorn (#748)
    
    * Fix failing tests, Add gunicorn
    
    Added nox method for running gunicorn
    
    * Pin dependencies
    
    ---------
    
    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    
    * Dockerize Junction (#749)
    
    * Initial commit for Dockerization
    
    * Fix review comments and dockerignore
    
    * Update dev.py.sample with runsslserver
    
    * Fixes for using default settings module
    
    * Remove Dockerfile.celery and use image from junction web image
    
    * Update docker-compose.test.yml to not depend on postgres db
    
    * Add static asset compilation in Docker image
    
    * Add docker-compose.prod.yml and update server port configuration in application
    
    * Add social oauth env vars
    
    ---------
    
    Co-authored-by: Sanchit Balchandani <balchandani.sanchit@gmail.com>
    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    
    * Add SITE_PREFIX env variable for site url prefix
    
    * Fix smtp setup for sending verification emails
    
    * Fix conference moderator filter
    
    * Fix template params fro absolute_url and is_proposal_reviewer
    
    * Add Django streamhandler logging with DEBUG (#763)
    
    * Fix proposal comment template parameters
    
    Fix userprofile dashboard url
    
    * Add restart:always to containers
    
    * Fix comment creation error caused sparingly
    
    Add review_comments=False for default comment view for logged in user
    
    * Add password for Redis DB
    
    * Fixes #765
    
    Sort ProposalSection in descending order of creation date
    in ProposalSectionReviewer Add form
    
    * Add autocomplete_field for Proposal Reviewer to enable searcheable dropdown in add form
    
    * Update DEFAULT_FROM_EMAIL
    
    * Update common.py
    
    * Added username field in edit profile form (Issue-769) (#771)
    
    Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>
    
    * Update Devlopment setup docs (#773)
    
    * Update Devlopment setup docs
    
    * Instructions for setting up junction using Docker post junction upgrade. (#761)
    
    * Added instructions in the ReadMe file for setting up junction using Docker post junction upgrade.
    
    * Updated the psycopg version to resolve - SCRAM authentication requires libpq version 10 issue.
    
    ---------
    
    Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>
    
    ---------
    
    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    Co-authored-by: Rajat Rajdeep <46029666+RajatRajdeep@users.noreply.github.com>
    Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>
    
    * Rename travis yml
    
    * Remove status badges from README
    
    ---------
    
    Co-authored-by: Bhandari423 <69859505+Bhandari423@users.noreply.github.com>
    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    Co-authored-by: Sanchit Balchandani <balchandani.sanchit@gmail.com>
    Co-authored-by: Rajat Rajdeep <46029666+RajatRajdeep@users.noreply.github.com>
    Co-authored-by: Rajat Rajdeep <rajat.rajdeep@avasant.com>
    6 people authored Jun 15, 2023
    Configuration menu
    Copy the full SHA
    c4d8ba3 View commit details
    Browse the repository at this point in the history
  2. Remove setup instructions from README (#774)

    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    ananyo2012 and Ananya Maiti authored Jun 15, 2023
    Configuration menu
    Copy the full SHA
    22e5e50 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Enable test reporting (#777)

    Add test reporting flags for pytest
    Mount temp docker volume for running tests
    
    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    ananyo2012 and Ananya Maiti authored Jun 21, 2023
    Configuration menu
    Copy the full SHA
    e154cc7 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Bug: Fix issue related to Proposal End Date (#782)

    Fixes #781
    
    Co-authored-by: Ananya Maiti <Ananya_Maiti@epam.com>
    ananyo2012 and Ananya Maiti authored Aug 10, 2023
    Configuration menu
    Copy the full SHA
    208d175 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Export CSV for proposal Model in the Admin Panel (#787)

    * Export CSV for proposal
    
    * removed spaces
    
    * removed spaces
    cricketkid authored Oct 9, 2023
    Configuration menu
    Copy the full SHA
    b3a113f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Bugfix/accessibility issues (#788)

    * fix homepage color contrast issues
    
    * fix color contrast issues for proposals page
    
    * add accessible colors, override variables
    bhansa authored Oct 13, 2023
    Configuration menu
    Copy the full SHA
    2394f85 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Use Grid layout for Conference listing (#793)

    * added cards
    
    * removed html tag associated stylling
    
    * removed link to style sheet
    
    * removed black spaves and converted em,rem to px
    
    ---------
    
    Co-authored-by: sriranga mannar <sriranga_mannar@epam.com>
    mannar-1 and mannar9 authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    6b20a1d View commit details
    Browse the repository at this point in the history
Loading