Commits · master · UCC / uccportal

Mar 13, 2025
- Merge branch 'zixty-master-patch-3e99' into 'master' · 9d4f84d6
  Gary O'Donovan authored 2 months ago
```
Update file models.py

See merge request !15
```
  9d4f84d6
- Update file models.py · 33281752
  Gary O'Donovan authored 2 months ago
  
  33281752
- Merge branch 'zixty-master-patch-b755' into 'master' · 13136971
  Gary O'Donovan authored 2 months ago
```
Add golden tickets to payment options

See merge request !14
```
  13136971
- Update file models.py · abb3dbcf
  Gary O'Donovan authored 2 months ago
  
  abb3dbcf
May 22, 2023
- Merge branch 'bird-enhancements' into 'master' · 735eb323
  bird authored 2 years ago
```
feat: allow searching on approver field on admin inline form

See merge request !13
```
  735eb323
- feat: allow searching on approver field on admin inline form · 587a034c
  bird authored 2 years ago
  
  587a034c
May 15, 2023
- fix: pull square.js from correct URL · 7e129d07
  bird authored 2 years ago and James Arcus committed 2 years ago
  
  7e129d07
- Merge branch 'square-payments-api' into 'master' · 3ed22d39
  James Arcus authored 2 years ago
```
Integrate new Square Payments API

Closes #25

See merge request !12
```
  3ed22d39
- fix: initialise client for production instead of sandbox · ee63af0f
  bird authored 2 years ago
  
  ee63af0f
May 11, 2023
- chore: cleanup payment form · fe431c85
  bird authored 2 years ago
  
  fe431c85
- fix: only lock payment button once client side error checking passes · 78bcbd1b
  bird authored 2 years ago
  
  78bcbd1b
- chore: clean up unused css on payment form · abc8c1e0
  bird authored 2 years ago
  
  abc8c1e0
May 04, 2023
- feat: Integrate the new Square Payments API · d21ba784
  bird authored 2 years ago
  
  d21ba784
- chore: Remove obsolete squareconnect SDK · fe1ba0fc
  bird authored 2 years ago
  
  fe1ba0fc
- fix: syntax error fix in payment form · f7d95ec3
  bird authored 2 years ago
  
  f7d95ec3
- chore: install new square SDK · dfc8bb3e
  bird authored 2 years ago
  
  dfc8bb3e
Aug 18, 2019
- Merge branch 'devops/21-use-test-ad' into 'master' · e3a2e62b
  Zack Wong authored 5 years ago
```
Devops/21 use test ad

See merge request frekk/uccportal!11
```
  e3a2e62b
- Update .gitlab-ci.yml · 191b59a8
  Zack Wong authored 5 years ago
  
  191b59a8
- restrict CI to testing branches · a3ae04e7
  coffee authored 5 years ago
  
  a3ae04e7
- Fix typo · f760d798
  coffee authored 5 years ago
  
  f760d798
- Add pipeline status · 05c9f86d
  coffee authored 5 years ago
  
  05c9f86d
- Retarget nonprod to test domain · 31598aa2
  coffee authored 5 years ago
  
  31598aa2
May 29, 2019
- Merge branch 'frekk-testing' into 'master' · 2da3dade
  frekk authored 6 years ago
```
Add features & fix bugs

See merge request frekk/uccportal!10
```
  2da3dade
- change MEMBERSHIP_TYPES to list to stay in the same order · f9019af3
  frekk authored 6 years ago
  
  f9019af3
May 28, 2019
- update settings example to be more functional · 3235a328
  frekk authored 6 years ago
  
  3235a328
- updated & corrected README from portal.v.ucc.asn.au installation · b75a626a
  frekk authored 6 years ago
  
  b75a626a
May 27, 2019
- Merge branch 'frekk-testing' of ssh://gitlab.ucc.asn.au/frekk/uccportal into frekk-testing · ae7c453c
  frekk authored 6 years ago
  
  ae7c453c
- remove bad squarepay migrations · 215adda6
  Test Portal authored 6 years ago
  
  215adda6
May 06, 2019
- Merge branch 'master' of ssh://gitlab.ucc.asn.au/frekk/uccportal into frekk-testing · 5e62cb29
  frekk authored 6 years ago
  
  5e62cb29
- logger definition for memberdb, separate django loglevel, updated example config · de94d982
  frekk authored 6 years ago
  
  de94d982
- update note on member homepage · e59454d3
  frekk authored 6 years ago
  
  e59454d3
- add log messages for incorrect dispenses · c611d2e7
  frekk authored 6 years ago
  
  c611d2e7
Apr 23, 2019
- add username and groups widget · 4a39e225
  frekk authored 6 years ago
  
  4a39e225
- use existing django_auth_ldap config values where possible · 306803c3
  frekk authored 6 years ago
  
  306803c3
- fix CSS for admin override, broken by django upgrade · fbba663b
  frekk authored 6 years ago
  
  fbba663b
- update python packages · 266d48fa
  frekk authored 6 years ago
  
  266d48fa
- Merge from coffee-testing · dc902933
  frekk authored 6 years ago
  
  dc902933
Mar 04, 2019
- Merge branch 'frekk-testing' into 'master' · 9c4a92e1
  frekk authored 6 years ago
```
fix the bugs that were supposed to be already fixed

See merge request frekk/uccportal!9
```
  v1.0.0-release
  
  9c4a92e1
- fix the bugs that were supposed to be already fixed · d8bb6890
  frekk authored 6 years ago
  
  d8bb6890
- Merge branch 'frekk-testing' into 'master' · 61008f4a
  frekk authored 6 years ago
```
Frekk testing

See merge request frekk/uccportal!8
```
  61008f4a

Admin message