Sergii Leshchenko
|
108b3d832b
|
Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser
# Conflicts:
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
# dockerfiles/init/manifests/che.env
# plugins/plugin-docker/che-plugin-docker-machine/src/test/java/org/eclipse/che/plugin/docker/machine/MachineProviderImplTest.java
# plugins/plugin-docker/pom.xml
# plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
# pom.xml
# wsagent/agent/src/main/java/org/eclipse/che/api/agent/WsAgentLauncher.java
# wsagent/agent/src/test/java/org/eclipse/che/api/agent/WsAgentLauncherTest.java
# wsmaster/che-core-api-machine/pom.xml
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
|
2017-09-28 12:33:07 +03:00 |
|
Sergii Kabashniuk
|
d4f03cbc4a
|
Ability to authenticate Oauth flow (#6326)
* Add keycloak token to oauth authenticate call
* fixup! Add keycloak token to oauth authenticate call
* fixup! Add keycloak token to oauth authenticate call
* Fix dashboard build
* fixup! Add keycloak token to oauth authenticate call
* fixup! Add keycloak token to oauth authenticate call
* Add security token for websocket url (#6319)
* Add security token for websocket url
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
* Fix failed test (#6325)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
|
2017-09-18 18:42:49 +03:00 |
|
Sergii Kabashniuk
|
ff76657a9f
|
Used Google Java Codestyle
|
2017-08-18 17:28:50 +03:00 |
|
Sergii Kabashniuk
|
6e9825c699
|
Used Google Java Codestyle
|
2017-08-18 17:16:54 +03:00 |
|
Artem Zatsarynnyi
|
a552e67a76
|
Merge branch 'master' into spi
|
2017-08-17 16:40:48 +03:00 |
|
Mykhailo Kuznietsov
|
69d5148385
|
Changed copyright owner to "Red Hat, Inc." in license headers (#5964)
Change license header contributor to Red Hat, Inc.
|
2017-08-11 10:46:58 +03:00 |
|
Artem Zatsarynnyi
|
32de1e7447
|
Rename methods (#5762)
AppContext#getMasterEndpoint -> AppContext#getMasterApiEndpoint
AppContext#getDevAgentEndpoint -> AppContext#getWsAgentServerApiEndpoint
|
2017-07-21 10:15:20 +03:00 |
|
Artem Zatsarynnyi
|
cce79bf469
|
Merge branch 'master' into spi
# Conflicts:
# assembly/assembly-wsmaster-war/pom.xml
# infrastructures/docker/pom.xml
# plugins/plugin-docker/che-plugin-docker-compose/pom.xml
# plugins/plugin-github/che-plugin-github-pullrequest/src/main/java/org/eclipse/che/plugin/pullrequest/client/GitHubHostingService.java
# plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunAllTestAction.java
# plugins/plugin-testing-java/plugin-testing-junit/che-plugin-testing-junit-ide/src/main/java/org/eclipse/che/plugin/testing/junit/ide/action/RunClassTestAction.java
# plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java
# plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunClassTestAction.java
# plugins/plugin-testing-java/plugin-testing-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunTestXMLAction.java
# pom.xml
# wsmaster/che-core-api-machine/pom.xml
|
2017-06-15 10:35:47 +03:00 |
|
Igor Vinokur
|
fe60e9f143
|
CHE-4007: Remove deprecated methods in GitHubClientService (#5322)
|
2017-06-13 09:26:24 +00:00 |
|
Artem Zatsarynnyi
|
ad3bc4d739
|
Use Workdspace's and Factory's model objects in IDE (#5221)
|
2017-05-29 16:19:43 +03:00 |
|
Max Shaposhnik
|
6f25db4709
|
Added factory images (#4725)
|
2017-04-06 16:04:55 +03:00 |
|
Max Shaposhnik
|
62d32687c2
|
Factory migration (#4413)
|
2017-04-03 15:11:45 +03:00 |