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
de347bedae
CHE#6041 Move Organization&Resource APIs ( #6384 )
...
* Use different Sql schemas for che and che-multiuser
* Move Resource API
* Move Organization API
* Move personal account
* Add Che Multiuser integration tests
* Fix integration tests
* Set 5.19.0-SNAPSHOT version for moved modules
* Fix multiuser packaging
2017-09-22 09:31:23 +03:00
685def4d29
Merge branch 'master' into spi
2017-09-21 09:24:39 +03:00
546ba4e4ea
Merge with master
2017-09-20 11:34:18 +03:00
8e03d56bfb
RELEASE: Set next development version ( #6345 )
2017-09-19 14:52:53 +03:00
e3e382103f
Fix build warnings
2017-09-15 17:03:34 +03:00
d2bfa4f7f4
Move permissions and authorization into separate module;
2017-09-14 17:03:43 +03:00
d635b25831
Adds permissions into Che multiuser. ( #6133 )
2017-09-12 11:43:04 +03:00
04be689c69
Merge branch 'master' into spi
2017-09-04 11:51:57 +03:00
2850a74a11
RELEASE: Set next development version ( #6067 )
2017-08-23 11:11:34 +03:00
6e9825c699
Used Google Java Codestyle
2017-08-18 17:16:54 +03:00
5b373e6cf5
Used Google Java Codestyle ( #5851 )
2017-08-18 17:00:58 +03:00
a552e67a76
Merge branch 'master' into spi
2017-08-17 16:40:48 +03:00
51fed52707
Merge branch 'master' into spi
2017-08-17 15:21:26 +03:00
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
338773ba9a
Move activity components to plugin-activity ( #5896 )
...
Move activity components to plugin-activity
2017-08-10 10:04:57 +03:00
Sergii Leshchenko