Commits · 220f226a4e10ae99eaf83cdd305bba54b7c3965e · OATS-CADC / ac · GitLab

Nov 26, 2015
- small tweaks and fixes to get integration tests to pass; removed support for... · 220f226a
  Patrick Dowler authored Nov 26, 2015
```
small tweaks and fixes to get integration tests to pass; removed support for querying for other user memberships in GMSClient API
```
  220f226a
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2-aci · cdfc7378
  Patrick Dowler authored Nov 25, 2015
  
  cdfc7378
- Merge branch 'release_candidate' · 9d0e4e40
  CADC Software Admin authored Nov 25, 2015
  
  9d0e4e40
Nov 25, 2015
- pulled GroupMemberships out of GMSClient · 557f5ec7
  Patrick Dowler authored Nov 25, 2015
  
  557f5ec7
- resolve merge conflict · 26d92ab7
  Patrick Dowler authored Nov 25, 2015
  
  26d92ab7
Nov 24, 2015
- ac2 - catch lookup exception on first jndi call for pools · 3556eb1a
  Brian Major authored Nov 24, 2015
  
  3556eb1a
Nov 23, 2015
- fix json output for cadcAccessControl library · fd3ce950
  Patrick Dowler authored Nov 23, 2015
  
  fd3ce950
Nov 20, 2015
- ac2 - JNDI unbind in a finally block, JNDI bind re-init if lookup failure · af78ac22
  Brian Major authored Nov 20, 2015
  
  af78ac22
Nov 17, 2015
- ac2: updated modifyGroup to replace both groups and admin groups with the updated attributes · 2196c8d7
  Jeff Burke authored Nov 17, 2015
  
  2196c8d7
Nov 16, 2015
- ac2 - fixed comparison of user admins on group modify · fbd085c6
  Brian Major authored Nov 16, 2015
  
  fbd085c6
Nov 13, 2015
- perform encoding of userID in path for USerClient and /users resource · 8cdb6ab9
  Patrick Dowler authored Nov 13, 2015
  
  8cdb6ab9
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 8a35284e
  Patrick Dowler authored Nov 13, 2015
  
  8a35284e
- added ugly workaround for very poor detail implementation in GetUserAction · 88c626cd
  Patrick Dowler authored Nov 13, 2015
  
  88c626cd
- changed User to add the userID in the identities list in constructor; changed... · 1992c904
  Patrick Dowler authored Nov 13, 2015
```
changed User to add the userID in the identities list in constructor; changed xml output to skip redundant userID when writing the identities list
```
  1992c904
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · c6e9c13a
  Patrick Dowler authored Nov 12, 2015
  
  c6e9c13a
- implemented --add-admin and --remove-admin in gms command-line client · 46ee86cc
  Patrick Dowler authored Nov 12, 2015
  
  46ee86cc
Nov 12, 2015
- ac2 - on connection.borrow(), do a test query to reset any authorization state on the connection · a712bfec
  Brian Major authored Nov 12, 2015
  
  a712bfec
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 23f950be
  Patrick Dowler authored Nov 12, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
```
  23f950be
- added --add-admin and --remove-admin options · 88eb972c
  Patrick Dowler authored Nov 12, 2015
  
  88eb972c
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 0ad63805
  Patrick Dowler authored Nov 12, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
```
  0ad63805
- AC2: Fix for encoding on member removal. · 71db15aa
  Dustin Jenkins authored Nov 12, 2015
  
  71db15aa
Nov 02, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · baf91966
  Jeff Burke authored Nov 02, 2015
  
  baf91966
- ac2: remove nsaccountlock from some query filters · 0091b0b7
  Jeff Burke authored Nov 02, 2015
  
  0091b0b7
Oct 27, 2015
- AC2: Test fixes for Jenkins. · e526583e
  Dustin Jenkins authored Oct 27, 2015
  
  e526583e
Oct 23, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 98c966ef
  Jeff Burke authored Oct 23, 2015
  
  98c966ef
- s1848: bug fixes and setting unit tests logging to info · 45866f20
  Jeff Burke authored Oct 23, 2015
  
  45866f20
Oct 22, 2015
- Story 1484: Modify test to not rely on list order. · c466ebfe
  Dustin Jenkins authored Oct 22, 2015
  
  c466ebfe
Oct 21, 2015
- Story 1848: Rework for JSON and fix removing Administrators. · 54e650f7
  Dustin Jenkins authored Oct 21, 2015
  
  54e650f7
- Story 1848: JSON fixes for inputter. · 70c7ea2b
  Dustin Jenkins authored Oct 21, 2015
  
  70c7ea2b
- Merge branch 's1848' into ac2 · 5fe594dd
  Dustin Jenkins authored Oct 21, 2015
  
  5fe594dd
- Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · a4e0d379
  Dustin Jenkins authored Oct 21, 2015
  
  a4e0d379
Oct 16, 2015
- Story 1848: JsonInputter change to accomodate new array handling. · b79e900e
  Dustin Jenkins authored Oct 16, 2015
  
  b79e900e
- Story 1848: Fix for tests and updated JSON Output. · b4687045
  Dustin Jenkins authored Oct 16, 2015
  
  b4687045
Oct 15, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · f7e386e3
  Jeff Burke authored Oct 15, 2015
  
  f7e386e3
- s1848: match the same principal types when removing a user member from a group. · d0d4e77e
  Jeff Burke authored Oct 15, 2015
  
  d0d4e77e
- ac2 - merged in CDP changes · 006f07b7
  Brian Major authored Oct 15, 2015
  
  006f07b7
Oct 14, 2015
- ac2 - Throw error upon LoginServlet initialization · b52469a9
  Brian Major authored Oct 14, 2015
  
  b52469a9
- ac2 - fixed group dao test · 8c1e16d7
  Brian Major authored Oct 14, 2015
  
  8c1e16d7
- use HttpPrincipal, for current user id to avoid CookiePrincipal -> idType mapping fail · 0f0274f4
  Patrick Dowler authored Oct 14, 2015
  
  0f0274f4
- Story 1848: Fix for WhoAmIServlet. · efcaed3d
  Dustin Jenkins authored Oct 14, 2015
  
  efcaed3d