Commits · a95c2d5b8c00100cf9dc0c5a4e7f4280aa15993c · OATS-CADC / ac

Sep 10, 2015
- s1840: added approvePendingUser method. · a95c2d5b
  Jeff Burke authored Sep 10, 2015
  
  a95c2d5b
Sep 09, 2015
- s1840: remove nsaccountlock from getUsers search filter. · 371d72ad
  Jeff Burke authored Sep 09, 2015
  
  371d72ad
- s1840: remove nsaccountlock from getUsers search filter. · 9f710dfa
  Jeff Burke authored Sep 09, 2015
  
  9f710dfa
- s1840: add missing UserPersistence methods. · 234fb7c2
  Jeff Burke authored Sep 09, 2015
  
  234fb7c2
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 6928a0c9
  Jeff Burke authored Sep 09, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
```
  6928a0c9
- Merge branch 's1832' into ac2 · 5e43495d
  Adrian Damian authored Sep 09, 2015
  
  5e43495d
- Merge branch 's1832' of /srv/cadc/git/wopencadc into s1832 · ed00ce7d
  Adrian Damian authored Sep 09, 2015
  
  ed00ce7d
- Changes after code review + merge with ac2 · bda36f07
  Adrian Damian authored Sep 09, 2015
  
  bda36f07
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · ff42612e
  Adrian Damian authored Sep 09, 2015
  
  ff42612e
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 56805173
  Jeff Burke authored Sep 09, 2015
  
  56805173
- s1840, delete user support, getPendingUsers, normalize userDAO api a bit, updated unit tests. · 318d6732
  Jeff Burke authored Sep 09, 2015
  
  318d6732
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · ba183879
  Alinga Yeung authored Sep 08, 2015
  
  ba183879
- Story 1840. Initial setup of this module with the command line framework. The... · 6f94cc68
  Alinga Yeung authored Sep 08, 2015
```
Story 1840. Initial setup of this module with the command line framework. The 'List' command appears to work.
```
  6f94cc68
Sep 08, 2015
- Merge branch 'ac2' into s1832 · dbe9e244
  Adrian Damian authored Sep 08, 2015
  
  dbe9e244
- Changes after code review · 0a9cb74b
  Adrian Damian authored Sep 08, 2015
  
  0a9cb74b
Sep 04, 2015
- s1728: WhoAmIServlet fixes. · 0245eee6
  Jeff Burke authored Sep 04, 2015
  
  0245eee6
- Merge branch 's1832' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1832 · 1ca469a9
  Dustin Jenkins authored Sep 04, 2015
  
  1ca469a9
- s1728: move WhoAmIServlet from ac_ws to cadcAccessControl-Server, put all... · 773fa9a3
  Jeff Burke authored Sep 04, 2015
```
s1728: move WhoAmIServlet from ac_ws to cadcAccessControl-Server, put all servlets in the same package, fix unit tests.
```
  773fa9a3
Sep 03, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · e5791a3e
  Brian Major authored Sep 03, 2015
  
  e5791a3e
- ac2 - createUser in the DAO no longer returns the User · acf82791
  Brian Major authored Sep 03, 2015
  
  acf82791
- Accommodate the use of DNPrincipal in proxy user login · e00017cd
  Adrian Damian authored Sep 03, 2015
  
  e00017cd
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · 5336a1cc
  Adrian Damian authored Sep 03, 2015
  
  5336a1cc
- Added support for proxy User (superuser) authentication · 6e249e7c
  Adrian Damian authored Sep 03, 2015
  
  6e249e7c
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 9fcb2c8e
  Alinga Yeung authored Sep 03, 2015
  
  9fcb2c8e
- Story 1657 rework. Updated test code to catch unexpected exceptions. · 0c2b3533
  Alinga Yeung authored Sep 03, 2015
  
  0c2b3533
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 1c53e20e
  Jeff Burke authored Sep 03, 2015
  
  1c53e20e
- s1728: removed some debug messages · 8489a462
  Jeff Burke authored Sep 03, 2015
  
  8489a462
- ac2 - user details applied on both user trees · 27289f15
  Brian Major authored Sep 03, 2015
  
  27289f15
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 340bcb14
  Brian Major authored Sep 03, 2015
  
  340bcb14
- ac2 - fixed some augment subject problems · 49421dd6
  Brian Major authored Sep 03, 2015
  
  49421dd6
- Story 1657 rework. Added a test case for unsupported principal. · c2829de2
  Alinga Yeung authored Sep 03, 2015
  
  c2829de2
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · e6ec0673
  Alinga Yeung authored Sep 03, 2015
  
  e6ec0673
- Story 1657 rework. Added test cases for a subject with no principal and a... · ebdf965e
  Alinga Yeung authored Sep 03, 2015
```
Story 1657 rework. Added test cases for a subject with no principal and a subject with more than one principal.
```
  ebdf965e
- s1728: fixed unit tests. · 9af3038e
  Jeff Burke authored Sep 03, 2015
  
  9af3038e
Sep 02, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 4661da62
  Jeff Burke authored Sep 02, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java
```
  4661da62
- s1728: add check in UserServlet for a special user used to augment a user's identites. · ab5fa4a8
  Jeff Burke authored Sep 02, 2015
  
  ab5fa4a8
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 9e647a79
  Jeff Burke authored Sep 02, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
```
  9e647a79
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into s1832 · c5c8fdb2
  Adrian Damian authored Sep 02, 2015
  
  c5c8fdb2
- Merged with ac2 · 4f5d5366
  Adrian Damian authored Sep 02, 2015
  
  4f5d5366
- Story 1657 rework. Removed debug statements and removed usage of deprecated X500Principal. · d4990244
  Alinga Yeung authored Sep 02, 2015
  
  d4990244