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.

Sign up for GitHub

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

Jump to bottom

DEVELOP TO MASTER #287

Merged
merged 94 commits into from
Feb 15, 2024
Merged

DEVELOP TO MASTER #287

merged 94 commits into from
Feb 15, 2024

Commits on Oct 14, 2023

  1. Update to python 3.9+ and fix vulnerabilities

    jmiarons committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    d6fc104 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. Removed phone, repeated funct, added discover, 

    modified lenny
    @EncryptEx
    EncryptEx committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    b7d9f40 View commit details
    Browse the repository at this point in the history

  2. fix travel

    @EncryptEx
    EncryptEx committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    79c11b0 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Add env to gitignore

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    89e6514 View commit details
    Browse the repository at this point in the history

  2. Add dockerfile and docker compose

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    3930749 View commit details
    Browse the repository at this point in the history

  3. Add dockerignore file

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    32bd3d6 View commit details
    Browse the repository at this point in the history

  4. Add template with necessary variables for docker

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    7d16406 View commit details
    Browse the repository at this point in the history

  5. Add cronjob to use in docker

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    6ae45e4 View commit details
    Browse the repository at this point in the history

  6. Serve static files in production mode using whitenoise

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    8bf9ec5 View commit details
    Browse the repository at this point in the history

  7. Change env variables to connect to database

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    05298e2 View commit details
    Browse the repository at this point in the history

  8. Fix vulnerabilities in dependencies

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    ccdc08b View commit details
    Browse the repository at this point in the history

  9. Add default env values

    @jmiarons
    jmiarons committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    d1af4d4 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. translated (td: fix errors and validations)

    @aacraf
    aacraf committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    3a2006a View commit details
    Browse the repository at this point in the history

  2. works.td: test all cases

    @aacraf
    aacraf committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    0f863b7 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. fix some validation error. td: translate templates?

    @aacraf
    aacraf committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    e8e0c3d View commit details
    Browse the repository at this point in the history

  2. Clean dockerfile + prepare to deploy

    @jmiarons
    jmiarons committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    5647d7f View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. merge changes

    @jmiarons
    jmiarons committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    662e469 View commit details
    Browse the repository at this point in the history

  2. Disable google wallet + add env

    @jmiarons
    jmiarons committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    8936416 View commit details
    Browse the repository at this point in the history

  3. Updated stable version

    @EncryptEx
    EncryptEx committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    e30ecd4 View commit details
    Browse the repository at this point in the history

  4. Added migrations to graduation_year

    @EncryptEx
    EncryptEx committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    10f5c69 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Canvis mentors, falten probar

    @AdriMM26
    AdriMM26 committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a2448ac View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge branch 'canvis_mentors' of https://github.com/hackupc/myhackupc … 

    …into canvis_volunteers
    @aacraf
    aacraf committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c206459 View commit details
    Browse the repository at this point in the history

  2. Remove hardware module dependency and git from docker

    @jmiarons
    jmiarons committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    c8b80ed View commit details
    Browse the repository at this point in the history

  3. Merge

    @jmiarons
    jmiarons committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    b295aef View commit details
    Browse the repository at this point in the history

  4. Canvis mentors

    @AdriMM26
    AdriMM26 committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    09caf51 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. errors ortografics. merci Adri :)

    @aacraf
    aacraf committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    770d9f1 View commit details
    Browse the repository at this point in the history

  2. added local suggesitons

    @EncryptEx
    EncryptEx committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    e398fd5 View commit details
    Browse the repository at this point in the history

  3. fix clean logic

    @EncryptEx
    EncryptEx committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a0bdf5e View commit details
    Browse the repository at this point in the history

  4. fixed more errors. thanks Jaume :)

    @aacraf
    aacraf committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    621e0d7 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #266 from hackupc/canvis_mentors 

    Canvis mentors
    @AdriMM26
    AdriMM26 authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    9abcda2 View commit details
    Browse the repository at this point in the history

  6. Fix cron not starting properly

    @jmiarons
    jmiarons committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    fa3bed8 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'development' into canvis_volunteers

    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ff8ac0f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #265 from hackupc/canvis_volunteers 

    Canvis volunteers
    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    cf62f5b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'development' into FEAT/Add-where-did-you-met-us-field

    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    6f63d99 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #269 from hackupc/FEAT/Add-where-did-you-met-us-field 

    Canvis application Hacker
    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    1a5c5b0 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'development' into docker

    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    56ee61a View commit details
    Browse the repository at this point in the history

  12. Merge pull request #267 from hackupc/docker 

    Docker
    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7a15d1b View commit details
    Browse the repository at this point in the history

  13. Change cronjob to absolute path

    @jmiarons
    jmiarons committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0ab2bf2 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'development' into docker

    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    7d2f5aa View commit details
    Browse the repository at this point in the history

  15. Merge pull request #270 from hackupc/docker 

    Change cronjob to absolute path
    @jmiarons
    jmiarons authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    bac90b4 View commit details
    Browse the repository at this point in the history

  16. Merge migrations

    @jmiarons
    jmiarons committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a014f27 View commit details
    Browse the repository at this point in the history

  17. Fix migrations v2

    @jmiarons
    jmiarons committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    65c5ea9 View commit details
    Browse the repository at this point in the history

  18. Update night_shift_question

    @AdriMM26
    AdriMM26 authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a0534f1 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2024

  1. Removed travel

    @EncryptEx
    EncryptEx committed Jan 27, 2024
    Configuration menu
    Copy the full SHA
    08f73d5 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. fixed other_gender clean

    @EncryptEx
    EncryptEx committed Jan 28, 2024
    1 Configuration menu
    Copy the full SHA
    9671264 View commit details
    Browse the repository at this point in the history

  2. Add python 3.10 template and remove old versions

    @jmiarons
    jmiarons committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    a79f8d1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #272 from hackupc/FIX/Remove-travel 

    FIX: Removed travel and fixed green form bug - hacker application
    @EncryptEx
    EncryptEx authored Jan 28, 2024
    Configuration menu
    Copy the full SHA
    d23b924 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #275 from hackupc/ci-update 

    Add python 3.10 template and remove old versions
    @jmiarons
    jmiarons authored Jan 28, 2024
    Configuration menu
    Copy the full SHA
    7009778 View commit details
    Browse the repository at this point in the history

  5. Fix cron (#274) 

    * Add django_crontab to fix cron issues
    @jmiarons
    jmiarons authored Jan 28, 2024
    Configuration menu
    Copy the full SHA
    1446ba1 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. fix which_hack error

    @aacraf
    aacraf committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    84cc956 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. Add 2023 edition+erase no pork diet (#273) 

    * 2023 Edition added and No pork erased

* Typo vegetarian

* Canvi constant typo

* remove redundant info since we have updated

* Add migration file

---------

Co-authored-by: EncryptEx <[email protected]>
Co-authored-by: EncryptEx <[email protected]>
Co-authored-by: jmiarons <[email protected]>
    @AdriMM26 @EncryptEx @jmiarons
    4 people authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    8ccda7f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fix_which_hacj

    @jmiarons
    jmiarons authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    ae246a4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #277 from hackupc/fix_which_hacj 

    fix which_hack error
    @jmiarons
    jmiarons authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    36a33a1 View commit details
    Browse the repository at this point in the history

  4. Fix/mentor+change gradutation time line (#276) 

    * 2023 Edition added and No pork erased

* Typo vegetarian

* Canvi constant typo

* Canvis mandatory university and change timeline graduation year

---------

Co-authored-by: EncryptEx <[email protected]>
Co-authored-by: Joel <[email protected]>
    @AdriMM26 @EncryptEx @jmiarons
    3 people authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    3978788 View commit details
    Browse the repository at this point in the history

  5. Add migration file

    @jmiarons
    jmiarons committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    87cd6ec View commit details
    Browse the repository at this point in the history

  6. Merge pull request #280 from hackupc/migration-fix 

    Add migration file
    @jmiarons
    jmiarons authored Feb 2, 2024
    Configuration menu
    Copy the full SHA
    e5ae166 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. Added text to clarify how teams work

    @jmiarons
    jmiarons committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    503f725 View commit details
    Browse the repository at this point in the history

  2. Fix night shift voluntees

    @jmiarons
    jmiarons committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    9746976 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #282 from hackupc/volunteers-night 

    Fix night shift voluntees
    @AdriMM26
    AdriMM26 authored Feb 4, 2024
    Configuration menu
    Copy the full SHA
    284631b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into teams-rules

    @AdriMM26
    AdriMM26 authored Feb 4, 2024
    Configuration menu
    Copy the full SHA
    f483f0e View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge pull request #281 from hackupc/teams-rules

    @EncryptEx
    EncryptEx authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    35b297e View commit details
    Browse the repository at this point in the history

  2. Add phone number to hacker

    @jmiarons
    jmiarons committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    8797150 View commit details
    Browse the repository at this point in the history

  3. other diets to Otras dietas

    @aacraf
    aacraf committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    848fd1b View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Merge branch 'develop' of https://github.com/hackupc/myhackupc into d… 

    …evelop
    @aacraf
    aacraf committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    1dbc62a View commit details
    Browse the repository at this point in the history

  2. texts, labels and under_age default option

    @aacraf
    aacraf committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    8895e05 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #283 from hackupc/dietsandtext 

    Dietsandtext
    @jmiarons
    jmiarons authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    cd9f375 View commit details
    Browse the repository at this point in the history

  4. Add phone number helper to base

    @jmiarons
    jmiarons committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    8646071 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Added 2024 colors and background

    @gerardm27
    gerardm27 committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    4d7fddd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #285 from hackupc/2024-styles 

    Added 2024 colors and background
    @EncryptEx
    EncryptEx authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    b8335f6 View commit details
    Browse the repository at this point in the history

  3. Added workflow

    @EncryptEx
    EncryptEx committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    ac54b2d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into hacker-phone

    @EncryptEx
    EncryptEx authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    6f2eca7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into CD/Added-provisional-CD

    @EncryptEx
    EncryptEx authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    f239c18 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #286 from hackupc/CD/Added-provisional-CD 

    CD: Added temporary betatest continious deployment
    @EncryptEx
    EncryptEx authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    a3b7e74 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into hacker-phone

    @AdriMM26
    AdriMM26 authored Feb 9, 2024
    Configuration menu
    Copy the full SHA
    97db49b View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. changed dates

    @EncryptEx
    EncryptEx committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    a3fa265 View commit details
    Browse the repository at this point in the history

  2. Canvis applications hackers

    @AdriMM26
    AdriMM26 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    4b0ddbf View commit details
    Browse the repository at this point in the history

  3. Recaptcha fallito tontorron

    @AdriMM26
    AdriMM26 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    1e9e8ba View commit details
    Browse the repository at this point in the history

  4. Fallito tontorron

    @AdriMM26
    AdriMM26 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    c4f5a88 View commit details
    Browse the repository at this point in the history

  5. Fixed blank pdf view

    @AdriMM26
    AdriMM26 committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    f449772 View commit details
    Browse the repository at this point in the history

  6. Delete app/hackathon_variables.py

    @AdriMM26
    AdriMM26 authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    105949f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #288 from hackupc/FIX/change-dates 

    FIX: changed dates
    @gerardm27
    gerardm27 authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    78de7da View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Added default option and fixed clean discover 

    Co-authored-by: AwaKT <[email protected]>
    @EncryptEx @gerardm27
    EncryptEx and gerardm27 committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    74e5497 View commit details
    Browse the repository at this point in the history

  2. Revert "Delete app/hackathon_variables.py" 

    This reverts commit 105949f.
    @EncryptEx
    EncryptEx committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    1acd97b View commit details
    Browse the repository at this point in the history

  3. revert hackathon_variables

    @EncryptEx
    EncryptEx committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    a116607 View commit details
    Browse the repository at this point in the history

  4. add endline

    @EncryptEx
    EncryptEx committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    9b0e2b8 View commit details
    Browse the repository at this point in the history

  5. Wip urlvalidator with custom msg

    @EncryptEx
    EncryptEx committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    4bcd757 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Merge pull request #290 from hackupc/FIX--add-default-optn-discover 

    FIX: Added default option and fixed clean discover
    @gerardm27
    gerardm27 authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    458d4d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into FIX/pdf_view

    @EncryptEx
    EncryptEx authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    f3dd243 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. remove "Please" msg to unify media form error

    @EncryptEx
    EncryptEx committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    516d312 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #289 from hackupc/FIX/pdf_view 

    FIx: PDF, Phone hacker, checkbox order
    @EncryptEx
    EncryptEx authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    f045b47 View commit details
    Browse the repository at this point in the history

  3. Changed color to mails buttons and links [Missing 2024 Banner] (#291) 

    * Changed color to mails buttons and links

* Changed mail closing link from FB to IG

* Added travel closing message only to relevant emails

* Added new mail header

---------

Co-authored-by: Adri <[email protected]>
    @gerardm27 @AdriMM26
    gerardm27 and AdriMM26 authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    41e7f80 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Augment max login tries

    @EncryptEx
    EncryptEx authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    edc1227 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into EncryptEx-patch-1

    @EncryptEx
    EncryptEx authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    af1b67f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #292 from hackupc/EncryptEx-patch-1 

    FIX: Augment max login tries
    @AdriMM26
    AdriMM26 authored Feb 15, 2024
    Configuration menu
    Copy the full SHA
    730f468 View commit details
    Browse the repository at this point in the history