Commits · master · UCC / uccportal

18 Aug, 2019 6 commits
- Merge branch 'devops/21-use-test-ad' into 'master' · e3a2e62b
  Zack Wong authored Aug 18, 2019
```
Devops/21 use test ad

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

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

See merge request frekk/uccportal!9
```
  9c4a92e1
- fix the bugs that were supposed to be already fixed · d8bb6890
  Felix von Perger authored Mar 04, 2019
  
  d8bb6890
- Merge branch 'frekk-testing' into 'master' · 61008f4a
  Felix von Perger authored Mar 04, 2019
```
Frekk testing

See merge request frekk/uccportal!8
```
  61008f4a
- add more filters to membership and member admin list pages · 1c95e4a2
  Felix von Perger authored Mar 04, 2019
  
  1c95e4a2
- fix bugs breaking the cokelog sync function · dab37d8a
  Felix von Perger authored Mar 04, 2019
  
  dab37d8a
- Merge branch 'frekk-testing' into 'master' · 340b7b39
  Felix von Perger authored Mar 04, 2019
```
Bug fixes & features

See merge request frekk/uccportal!7
```
  340b7b39
- add list filter option for membership renewal year · 8aab44da
  Felix von Perger authored Mar 04, 2019
```
also thanks django by making filtering by child attributes so easy. it's
amazing!
```
  8aab44da
- fix creating duplicate records on OldMember import · d1b18c40
  Felix von Perger authored Mar 04, 2019
  
  d1b18c40
03 Mar, 2019 5 commits
- Merge remote-tracking branch 'origin/master' into frekk-testing · c46628bd
  Felix von Perger authored Mar 03, 2019
  
  c46628bd
- add testing for cokelog stuff · 8bf82864
  Felix von Perger authored Mar 03, 2019
  
  8bf82864
- Merge branch 'frekk-testing' of ssh://gitlab.ucc.asn.au/frekk/uccportal into frekk-testing · 8a064a04
  Felix von Perger authored Mar 03, 2019
  
  8a064a04
- remove bad cokelog sync code · 2710a986
  Felix von Perger authored Mar 03, 2019
  
  2710a986
- add cokelog parsing and bulk "refresh payment status" admin action · 3816e0ed
  Felix von Perger authored Mar 03, 2019
  
  3816e0ed
26 Feb, 2019 6 commits
- fix card payments · bf5def24
  Felix von Perger authored Feb 26, 2019
  
  bf5def24
- fixed breaking bugs, still doesn't work · abcde291
  root authored Feb 26, 2019
  
  abcde291
- check if membership paid in dispense automatically on renew form submission · 6150dbb4
  Felix von Perger authored Feb 26, 2019
  
  6150dbb4
- add dispense paid checking script · b9f345c5
  Felix von Perger authored Feb 26, 2019
  
  b9f345c5
- remove unnecessary debug message · 08abffcf
  Felix von Perger authored Feb 26, 2019
  
  08abffcf
- don't redirect to admin site from renewal form · 906b7ca8
  Felix von Perger authored Feb 26, 2019
  
  906b7ca8