- 03 Oct, 2013 8 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
- 02 Oct, 2013 15 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
- 30 Sep, 2013 4 commits
-
-
Matija Obreza authored
-
Matija Obreza 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
-
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
-
- 29 Sep, 2013 3 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
- 24 Sep, 2013 1 commit
-
-
Matija Obreza authored
-
- 23 Sep, 2013 3 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-
- 20 Sep, 2013 6 commits
-
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
language
-
Matija Obreza authored
-
Matija Obreza authored
-
Matija Obreza authored
-