1. 30 Sep, 2013 2 commits
    • Kateryna Kliushnyk's avatar
      Tokens management finished · 1366e2c0
      Kateryna Kliushnyk authored
      Conflicts:
      	crophub_oauth_client/src/main/java/org/crophub/auth/client/CropHubClient.java
      	crophub_server_oauth/src/main/java/org/crophub/auth/server/utils/ServiceEndpoints.java
      	crophub_server_oauth/src/main/resources/spring/auth-servlet.xml
      	crophub_server_oauth/src/main/resources/spring/spring-security.xml
      1366e2c0
    • Kateryna Kliushnyk's avatar
      Tokens management finished · e06513fa
      Kateryna Kliushnyk authored
      Conflicts:
      	.gitignore
      	crophub_oauth_client/pom.xml
      	crophub_oauth_client/src/main/java/org/crophub/auth/client/CropHubClient.java
      	crophub_server_oauth/pom.xml
      	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/DataSetController.java
      	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/LicensesController.java
      	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/OrganizationController.java
      	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/TraitsController.java
      	crophub_server_oauth/src/main/java/org/crophub/auth/server/controller/UserController.java
      	crophub_server_oauth/src/main/resources/database.properties
      	crophub_server_oauth/src/main/resources/spring/spring-oauth.xml
      	crophub_server_oauth/src/main/resources/spring/spring-security.xml
      	crophub_server_oauth/src/main/webapp/login.jsp
      e06513fa
  2. 29 Sep, 2013 3 commits
  3. 24 Sep, 2013 1 commit
  4. 23 Sep, 2013 3 commits
  5. 20 Sep, 2013 9 commits
  6. 19 Sep, 2013 2 commits
  7. 18 Sep, 2013 10 commits
  8. 17 Sep, 2013 7 commits
  9. 16 Sep, 2013 3 commits