1. 02 Oct, 2013 6 commits
  2. 30 Sep, 2013 4 commits
    • Matija Obreza's avatar
      Spring config · 2236c4cc
      Matija Obreza authored
      2236c4cc
    • Matija Obreza's avatar
      Fixed package names and missing classes · 97c9a6c3
      Matija Obreza authored
      97c9a6c3
    • Kateryna Kliushnyk's avatar
      Tokens management finished · 1366e2c0
      Kateryna Kliushnyk authored and Matija Obreza's avatar Matija Obreza committed
      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 and Matija Obreza's avatar Matija Obreza committed
      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
  3. 29 Sep, 2013 3 commits
  4. 24 Sep, 2013 1 commit
  5. 23 Sep, 2013 3 commits
  6. 20 Sep, 2013 9 commits
  7. 19 Sep, 2013 2 commits
  8. 18 Sep, 2013 10 commits
  9. 17 Sep, 2013 2 commits