Commits · 9c4a92e1bbfb9ca7325b7d064575f7627140866c · UCC / uccportal

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
- add more filters to membership and member admin list pages · 1c95e4a2
  frekk authored 6 years ago
  
  1c95e4a2
- fix bugs breaking the cokelog sync function · dab37d8a
  frekk authored 6 years ago
  
  dab37d8a
- Merge branch 'frekk-testing' into 'master' · 340b7b39
  frekk authored 6 years ago
```
Bug fixes & features

See merge request frekk/uccportal!7
```
  340b7b39
- add list filter option for membership renewal year · 8aab44da
  frekk authored 6 years ago
```
also thanks django by making filtering by child attributes so easy. it's
amazing!
```
  8aab44da
- fix creating duplicate records on OldMember import · d1b18c40
  frekk authored 6 years ago
  
  d1b18c40
Mar 03, 2019
- Merge remote-tracking branch 'origin/master' into frekk-testing · c46628bd
  frekk authored 6 years ago
  
  c46628bd
- add testing for cokelog stuff · 8bf82864
  frekk authored 6 years ago
  
  8bf82864
- Merge branch 'frekk-testing' of ssh://gitlab.ucc.asn.au/frekk/uccportal into frekk-testing · 8a064a04
  frekk authored 6 years ago
  
  8a064a04
- remove bad cokelog sync code · 2710a986
  frekk authored 6 years ago
  
  2710a986
- add cokelog parsing and bulk "refresh payment status" admin action · 3816e0ed
  frekk authored 6 years ago
  
  3816e0ed
Feb 26, 2019
- fix card payments · bf5def24
  Felix von Perger authored 6 years ago
  
  bf5def24
- fixed breaking bugs, still doesn't work · abcde291
  root authored 6 years ago
  
  abcde291
- check if membership paid in dispense automatically on renew form submission · 6150dbb4
  frekk authored 6 years ago
  
  6150dbb4
- add dispense paid checking script · b9f345c5
  Felix von Perger authored 6 years ago
  
  b9f345c5
- remove unnecessary debug message · 08abffcf
  frekk authored 6 years ago
  
  08abffcf
- don't redirect to admin site from renewal form · 906b7ca8
  frekk authored 6 years ago
  
  906b7ca8
- move comment to correct file · d6e451ef
  frekk authored 6 years ago
  
  d6e451ef
- fix icons on status messages · b1117fa1
  frekk authored 6 years ago
  
  b1117fa1
- make approval form respect already-paid memberships · 0cb5f718
  frekk authored 6 years ago
  
  0cb5f718
- renewals: update existing member details without creating multiple membership records per year · 81cc295d
  frekk authored 6 years ago
  
  81cc295d
Feb 25, 2019
- moved make_pending_membership to register.py · 9e9387fb
  frekk authored 6 years ago
  
  9e9387fb
- Merge branch 'master' into frekk-testing · 05920eef
  frekk authored 6 years ago
  
  05920eef
- move todo list to gitlab issues · 09dbcd6b
  frekk authored 6 years ago
  
  09dbcd6b
- remov trailing slash from ad uri · 8aa4409e
  zack authored 6 years ago
  
  8aa4409e
Feb 24, 2019
- Merge branch 'coffee-testing' into 'master' · 29e9cd2b
  Zack Wong authored 6 years ago
```
Coffee testing

See merge request frekk/uccportal!6
```
  29e9cd2b
- Merge branch 'master' into 'coffee-testing' · ab27586a
  Zack Wong authored 6 years ago
```
# Conflicts:
#   .gitlab-ci.yml
```
  ab27586a
- change watermark position · d6613604
  Zack Wong authored 6 years ago
  
  d6613604
- fix tabs to spaces · 57d48fe4
  Zack Wong authored 6 years ago
  
  57d48fe4
- added environment watermark · 0e5f40d1
  Zack Wong authored 6 years ago
  
  0e5f40d1
- Merge branch 'master' of gitlab.ucc.asn.au:frekk/uccportal · f7eae603
  Zack Wong authored 6 years ago
  
  f7eae603
- fix stage url · 89955efc
  Zack Wong authored 6 years ago
  
  89955efc
- Merge branch 'coffee-testing' into 'master' · 68ec132a
  Zack Wong authored 6 years ago
```
set permissions on config

See merge request frekk/uccportal!5
```
  68ec132a
- set permissions on config · 24eb3ce4
  Zack Wong authored 6 years ago
  
  24eb3ce4
- Update .gitlab-ci.yml · 54e3e668
  Zack Wong authored 6 years ago
  
  54e3e668
- Update .gitlab-ci.yml · 4cea170d
  Zack Wong authored 6 years ago
  
  4cea170d
- make stage more prod like · 0944a8f7
  Zack Wong authored 6 years ago
  
  0944a8f7
- Merge branch 'coffee-testing' into 'master' · a99227c9
  Zack Wong authored 6 years ago
```
Coffee testing

See merge request frekk/uccportal!4
```
  a99227c9

Admin message