Commits · f64bbc4f6f8670fe5115d8b7c4f69cfd5ae51e1f · OATS-CADC / ac · GitLab

Oct 30, 2014
- Merge branch 's1711' of /srv/cadc/git/wopencadc into s1711 · f64bbc4f
  Adrian Damian authored Oct 30, 2014
  
  f64bbc4f
- Removed test user password from unit test files. · d64d22ff
  Adrian Damian authored Oct 30, 2014
  
  d64d22ff
Oct 29, 2014
- Merge branch 's1666' of /srv/cadc/git/wopencadc into s1711 · dd38d8db
  Dustin Jenkins authored Oct 29, 2014
  
  dd38d8db
- s1666: bug fixes and updated unit tests · 057c890f
  Jeff Burke authored Oct 29, 2014
  
  057c890f
- Merged with origin · 18d3ac66
  Adrian Damian authored Oct 29, 2014
  
  18d3ac66
- Changed LdapConfig in a properties file to be found in ~/config/ · e3f1ab09
  Adrian Damian authored Oct 29, 2014
  
  e3f1ab09
- Story 1711: Fix for TLS. · ca3a1499
  Dustin Jenkins authored Oct 29, 2014
  
  ca3a1499
- Merge branch 'nep110' of /srv/cadc/git/wopencadc into s1711 · d4eb2bf3
  Dustin Jenkins authored Oct 29, 2014
  
  d4eb2bf3
Oct 28, 2014
- Merge branch 's1666' into s1711 · 82b45a08
  Adrian Damian authored Oct 28, 2014
  
  82b45a08
- Merge branch 's1666' of ssh://mach16/srv/cadc/git/wopencadc into s1666 · 9441f331
  Jeff Burke authored Oct 28, 2014
  
  9441f331
- s1666: updated GroupDAO unit tests · 166e816e
  Jeff Burke authored Oct 28, 2014
  
  166e816e
- Merge branch 'nep110' into s1668 · 4c09aa32
  Sharon Goliath authored Oct 28, 2014
  
  4c09aa32
- s1666: bug fixes for getGroupNames · c4bf1457
  Jeff Burke authored Oct 28, 2014
  
  c4bf1457
Oct 24, 2014
- Merge branch 'master' of /srv/cadc/git/wopencadc into s1666 · af9390c7
  Dustin Jenkins authored Oct 24, 2014
  
  af9390c7
- Story 1666: Completed merge from nep110 · dfb3ef09
  Dustin Jenkins authored Oct 24, 2014
  
  dfb3ef09
- Story 1666: Fix for Description values. · 945a9705
  Dustin Jenkins authored Oct 24, 2014
  
  945a9705
Oct 23, 2014
- nep110 - Enhanced caching test · 3f08cda6
  Brian Major authored Oct 23, 2014
  
  3f08cda6
Oct 22, 2014
- Merge branch 't62652' into release_candidate · 1f064407
  CADC Software Admin--S.Gaudet authored Oct 22, 2014
  
  1f064407
- Merge branch 's1666' of ssh://mach16/srv/cadc/git/wopencadc into s1666 · 844f2c43
  Jeff Burke authored Oct 22, 2014
```
Conflicts:
	projects/cadcAccessControl-Server/build.xml
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GetGroupNamesAction.java
```
  844f2c43
- s1666: unit and int tests for listing group names · d8046963
  Jeff Burke authored Oct 22, 2014
  
  d8046963
- Story 1666: Fixes and added missing file. · ea1914e5
  Dustin Jenkins authored Oct 22, 2014
  
  ea1914e5
Oct 17, 2014
- Story 1666: Added javacsv to the classpath. · 9f4c122b
  Dustin Jenkins authored Oct 17, 2014
  
  9f4c122b
- s1666 - start of work to list all group names · 67c5adc7
  Brian Major authored Oct 17, 2014
  
  67c5adc7
Oct 16, 2014
- nep110 - Added UserNotFoundException to GMSClient update group method · d89a7a2c
  Brian Major authored Oct 16, 2014
  
  d89a7a2c
- nep110 - Added UserNotFoundException to GMSClient user membership actions · a73286e3
  Brian Major authored Oct 16, 2014
  
  a73286e3
- nep110 - Fixed bugs to do with group deletion and membership · 34bc9381
  Brian Major authored Oct 16, 2014
  
  34bc9381
Oct 14, 2014
- Merge branch 's1689' of /usr/cadc/dev/git/wopencadc into nep110 · eb8c29bb
  Brian Major authored Oct 14, 2014
  
  eb8c29bb
- Merge branch 'nep110' of /usr/cadc/dev/git/wopencadc into nep110 · 9527e05a
  Brian Major authored Oct 14, 2014
  
  9527e05a
Oct 06, 2014
- Merge remote-tracking branch 'origin/s1689' into s1689 · b9dd71bd
  Ed Chapin authored Oct 06, 2014
  
  b9dd71bd
- Merge branch 's1689' of /usr/cadc/dev/git/wopencadc into s1689 · a7369411
  Adrian Damian authored Oct 06, 2014
  
  a7369411
- Fixed problem with non-canonized DNs in ac search · e8940ede
  Adrian Damian authored Oct 06, 2014
  
  e8940ede
Oct 02, 2014
- nep110 - Restored missing authentication util methods, canonize dn in ldap dao for search. · 457dbfbe
  Brian Major authored Oct 02, 2014
  
  457dbfbe
Sep 26, 2014
- s1651: updated unit tests · 4a0a4bdb
  Jeff Burke authored Sep 26, 2014
  
  4a0a4bdb
- Merge branch 's1651' of ssh://mach16/usr/cadc/dev/git/wopencadc into s1651 · 83b8eadd
  Jeff Burke authored Sep 26, 2014
  
  83b8eadd
- s1651: updated unit tests · 1a12ad49
  Jeff Burke authored Sep 26, 2014
  
  1a12ad49
- s1651 - Added check that searches can only be done by same person · 629d4227
  Brian Major authored Sep 26, 2014
  
  629d4227
- Merge branch 's1651' of ssh://mach16/usr/cadc/dev/git/wopencadc into s1651 · 7d8d32c5
  Jeff Burke authored Sep 26, 2014
  
  7d8d32c5
- Story 1651: Fix GMSClient Test and added getDetails() method to User class. · 4ada8fb9
  Dustin Jenkins authored Sep 26, 2014
  
  4ada8fb9
- Merge branch 's1651' of ssh://mach16/usr/cadc/dev/git/wopencadc into s1651 · 1e40e7b4
  Jeff Burke authored Sep 26, 2014
  
  1e40e7b4
- Story 1651: Added owner to getGroup(). · aa5c3e6b
  Dustin Jenkins authored Sep 26, 2014
  
  aa5c3e6b