Commits · 044153d8949853b78438ab376b223cd6f3f2f1d3 · OATS-CADC / ac · GitLab

Jul 30, 2015
- Story s1731 ac2. Looks like I somehow renamed UsersServlet to LoginSevlet and... · 044153d8
  Alinga Yeung authored Jul 30, 2015
```
Story s1731 ac2. Looks like I somehow renamed UsersServlet to LoginSevlet and so the UsersSevlet is missing from the repo. Added it back.
```
  044153d8
- Story 1731 ac2. Fixed merge conflicts. · e3073a5a
  Alinga Yeung authored Jul 30, 2015
  
  e3073a5a
- Story s1731 in ac2. Add LoginServlet and fixed LdapUserDAO. · be9a3e09
  Alinga Yeung authored Jul 30, 2015
  
  be9a3e09
Jul 28, 2015
- Merge branch 'ac2' of ssh://gimli2:/srv/cadc/git/wopencadc into ac2 · 45428647
  Brian Major authored Jul 28, 2015
  
  45428647
- Story 1662: Use new /ac login features. · 86586fd8
  Dustin Jenkins authored Jul 28, 2015
  
  86586fd8
- Story 1662: Use new /ac login features. · fc11c866
  Dustin Jenkins authored Jul 28, 2015
  
  fc11c866
Jul 27, 2015
- ac2: move group web classes into own package, update and change user passwords in DAO. · ba23b978
  Jeff Burke authored Jul 27, 2015
  
  ba23b978
Jul 24, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 0bc7947b
  Jeff Burke authored Jul 24, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/test/LdapConfig.test.properties
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
```
  0bc7947b
- ac2: don't use PosixDetails in the UserDAO · 8363572b
  Jeff Burke authored Jul 24, 2015
  
  8363572b
- AC2: Fix tests. · 6b2786a8
  Dustin Jenkins authored Jul 24, 2015
  
  6b2786a8
Jul 23, 2015
- AC2: Implement whoami entry. · f8e1a0fe
  Dustin Jenkins authored Jul 23, 2015
  
  f8e1a0fe
- ac2: update LDAP user and set password · 45d56e37
  Jeff Burke authored Jul 23, 2015
  
  45d56e37
- Merge branch 's1734' of ssh://gimli2/srv/cadc/git/wopencadc into s1734 · 74a05aa0
  Jeff Burke authored Jul 23, 2015
  
  74a05aa0
- s1734: update User's in LDAP · e2180720
  Jeff Burke authored Jul 23, 2015
  
  e2180720
Jul 20, 2015
- Story 1734: Added user list GET call. · 5032c231
  Dustin Jenkins authored Jul 20, 2015
  
  5032c231
- Story 1734: Test fix with 'fixed' build file. · c3711484
  Dustin Jenkins authored Jul 20, 2015
  
  c3711484
- Story 1734: Added listing of users. · 0ab722e5
  Dustin Jenkins authored Jul 20, 2015
  
  0ab722e5
- Merge branch 's1661' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · 659bf4e8
  Dustin Jenkins authored Jul 20, 2015
  
  659bf4e8
- Story 1734: Fix for integration tests. · db92fb92
  Dustin Jenkins authored Jul 20, 2015
  
  db92fb92
- Merge branch 's1661' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1734 · a022b143
  Dustin Jenkins authored Jul 20, 2015
  
  a022b143
Jul 17, 2015
- Story 1734: Accommodate 409 (Already exists). · f518d03e
  Dustin Jenkins authored Jul 17, 2015
  
  f518d03e
Jul 16, 2015
- Story 1734: Fix tests. · 2939acdb
  Dustin Jenkins authored Jul 16, 2015
  
  2939acdb
- Story 1734: Fix for public PUT. · 2eebbfb7
  Dustin Jenkins authored Jul 16, 2015
  
  2eebbfb7
- Story 1734: Added UserRequestReader test and implementation for JSON. · cb9a66ff
  Dustin Jenkins authored Jul 16, 2015
  
  cb9a66ff
- Story 1734: Added GET with JSON. · 7da562b5
  Dustin Jenkins authored Jul 15, 2015
  
  7da562b5
Jul 15, 2015
- Merge branch 's1734' of ssh://gimli2/srv/cadc/git/wopencadc into s1734 · 2cc6dc2f
  Jeff Burke authored Jul 15, 2015
  
  2cc6dc2f
- s1734: added User and Group JSON reader/writers · 27cb2f56
  Jeff Burke authored Jul 15, 2015
  
  27cb2f56
Jul 14, 2015
- Merge branch 's1661' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1661 · 7e23cbdd
  Dustin Jenkins authored Jul 14, 2015
  
  7e23cbdd
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1661 · d4a9de74
  Dustin Jenkins authored Jul 14, 2015
  
  d4a9de74
Jul 13, 2015
- s1734. Renamed class from GetUserIDsAction to GetUserNameAction. · 13206cf1
  Alinga Yeung authored Jul 13, 2015
  
  13206cf1
- s1734 Merged ac2 into this branch and fixed merge conflicts. · 498b77b5
  Alinga Yeung authored Jul 13, 2015
  
  498b77b5
- Merge branch 'ac2release' of ssh://gimli2:/srv/cadc/git/wopencadc into ac2 · d1a27dc0
  Brian Major authored Jul 13, 2015
  
  d1a27dc0
- s1734: initial JSON reader writers · 0f5198c2
  Jeff Burke authored Jul 13, 2015
  
  0f5198c2
Jul 09, 2015
- ac2release - removing cadcGMSPy again · 27ea5247
  Brian Major authored Jul 09, 2015
  
  27ea5247
Jul 07, 2015
- s1734: PUT new user with password to temp tree · 5de755cb
  Jeff Burke authored Jul 07, 2015
  
  5de755cb
- Merge branch 'ac2' into s1732 · 437c03f3
  Adrian Damian authored Jul 07, 2015
  
  437c03f3
Jul 06, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca:/srv/cadc/git/wopencadc into ac2 · 3c30c84d
  Brian Major authored Jul 06, 2015
  
  3c30c84d
- Merge branch 's1665' into ac2 · 9a61f683
  Jeff Burke authored Jul 06, 2015
  
  9a61f683
Jun 30, 2015
- Merge branch 's1756' into release_candidate · 3496d1bd
  CADC Software Admin--S.Gaudet authored Jun 30, 2015
  
  3496d1bd
- Merge branch 's1756' into release_candidate · 209f38b0
  CADC Software Admin--S.Gaudet authored Jun 30, 2015
  
  209f38b0