Merge branch 'frekk-testing' into 'master' (340b7b39) · Commits · UCC / uccportal · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

uccportal
- Activity
- Members
- Labels
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

UCC
uccportal
Commits
340b7b39

Commit 340b7b39 authored 6 years ago by

frekk

Downloads
- Plain Diff

Merge branch 'frekk-testing' into 'master'

Bug fixes & features

See merge request frekk/uccportal!7

parents bf5def24 8aab44da

1 merge request!7Bug fixes & features

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/gms/settings_local.example.py 4 additions, 0 deletions

src/gms/settings_local.example.py
src/import_members/actions.py 11 additions, 4 deletions

src/import_members/actions.py
src/memberdb/actions.py 21 additions, 0 deletions

src/memberdb/actions.py
src/memberdb/admin.py 43 additions, 19 deletions

src/memberdb/admin.py
src/memberdb/has_paid_dispense.sh 0 additions, 16 deletions

src/memberdb/has_paid_dispense.sh
src/memberdb/register.py 8 additions, 1 deletion

src/memberdb/register.py
src/squarepay/cokelog.py 116 additions, 0 deletions

src/squarepay/cokelog.py
src/squarepay/tests.py 27 additions, 1 deletion

src/squarepay/tests.py

with 230 additions and 41 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment