Sergii Leshchenko
|
03934a0804
|
Merge remote-tracking branch 'origin/master' into spi
# Conflicts:
# assembly-multiuser/assembly-wsmaster-war/pom.xml
# assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MachineAuthModule.java
# assembly-multiuser/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/MultiUserCheWsMasterModule.java
# assembly-multiuser/assembly-wsmaster-war/src/main/resources/META-INF/persistence.xml
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/CheWsMasterModule.java
# assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
# dashboard/src/app/admin/user-management/user-details/user-details.html
# dashboard/src/app/organizations/organization-details/organization-details.html
# dashboard/src/app/teams/team-details/team-details.html
# dashboard/src/components/api/workspace/che-workspace.factory.ts
# dockerfiles/init/manifests/che.env
# dockerfiles/init/modules/openshift/files/scripts/deploy_che.sh
# dockerfiles/init/modules/openshift/files/scripts/multi-user/wait_until_postgres_is_available.sh
# ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/jsonrpc/WorkspaceMasterJsonRpcInitializer.java
# ide/che-core-ide-stacks/src/main/resources/stacks.json
# ide/che-core-orion-editor/src/main/java/org/eclipse/che/ide/editor/orion/client/OrionEditorPresenter.java
# multiuser/api/che-multiuser-api-resource/pom.xml
# multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculator.java
# multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTracker.java
# multiuser/api/che-multiuser-api-resource/src/main/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManager.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/EnvironmentRamCalculatorTest.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/usage/tracker/RamResourceUsageTrackerTest.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/LimitsCheckingWorkspaceManagerTest.java
# multiuser/api/che-multiuser-api-resource/src/test/java/org/eclipse/che/multiuser/resource/api/workspace/TestObjects.java
# multiuser/integration-tests/che-multiuser-cascade-removal/pom.xml
# multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java
# multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/TestObjectsFactory.java
# multiuser/integration-tests/che-multiuser-cascade-removal/src/test/resources/META-INF/persistence.xml
# multiuser/integration-tests/che-multiuser-postgresql-tck/pom.xml
# multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/java/MultiuserPostgresqlTckModule.java
# multiuser/integration-tests/che-multiuser-postgresql-tck/src/test/resources/META-INF/persistence.xml
# multiuser/keycloak/che-multiuser-keycloak-ide/src/main/java/org/eclipse/che/multiuser/keycloak/ide/KeycloakProvider.java
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/pom.xml
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineAsyncRequestFactory.java
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/MachineTokenServiceClientImpl.java
# multiuser/machine-auth/che-multiuser-machine-authentication-ide/src/main/java/org/eclipse/che/multiuser/machine/authentication/ide/inject/MachineAuthGinModule.java
# multiuser/machine-auth/che-multiuser-machine-authentication/src/main/java/org/eclipse/che/multiuser/machine/authentication/server/MachineSessionInvalidator.java
# multiuser/permission/che-multiuser-permission-machine/pom.xml
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilter.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDao.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDao.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserMachineJpaModule.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/jpa/listener/RemoveRecipeOnLastUserRemovedEventSubscriber.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProvider.java
# multiuser/permission/che-multiuser-permission-machine/src/main/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipePermissionsImpl.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/filters/RecipePermissionsFilterTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaRecipePermissionsDaoTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/JpaTestModule.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/MultiuserJpaRecipeDaoTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/RemovePermissionsBeforeRecipeRemovedEventSubscriberTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/jpa/TestWorkspaceEntity.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/recipe/RecipeCreatorPermissionsProviderTest.java
# multiuser/permission/che-multiuser-permission-machine/src/test/java/org/eclipse/che/multiuser/permission/machine/spi/tck/RecipePermissionsDaoTest.java
# multiuser/permission/che-multiuser-permission-workspace/pom.xml
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/WorkspaceCreatorPermissionsProvider.java
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilter.java
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/MultiuserWorkspaceJpaModule.java
# multiuser/permission/che-multiuser-permission-workspace/src/main/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/MultiuserJpaWorkspaceDao.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/filters/WorkspacePermissionsFilterTest.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/jpa/WorkspaceTckModule.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/JpaTckModule.java
# multiuser/permission/che-multiuser-permission-workspace/src/test/java/org/eclipse/che/multiuser/permission/workspace/server/spi/jpa/RemovePermissionsBeforeStackRemovedEventSubscriberTest.java
# multiuser/pom.xml
# 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
# selenium/che-selenium-core/src/main/java/org/eclipse/che/selenium/core/workspace/TestWorkspaceProviderImpl.java
# selenium/che-selenium-test/README.md
# selenium/che-selenium-test/pom.xml
# selenium/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/CodenvyEditor.java
# selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/CreateWorkspaceOnDashboardTest.java
# selenium/che-selenium-test/src/test/java/org/eclipse/che/selenium/workspaces/WorkingWithNodeWsTest.java
# selenium/che-selenium-test/src/test/resources/conf/selenium.properties
# 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-user/pom.xml
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/environment/server/MachineLinksInjector.java
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/WorkspaceServiceLinksInjector.java
# wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
# wsmaster/integration-tests/postgresql-tck/pom.xml
|
2017-10-09 14:51:25 +03:00 |
|
Anatoliy Bazko
|
8d70ec4024
|
Fix php debugger test (#6556)
|
2017-10-06 10:38:22 +03:00 |
|
Artem Zatsarynnyi
|
685def4d29
|
Merge branch 'master' into spi
|
2017-09-21 09:24:39 +03:00 |
|
Roman Iuvshyn
|
8e03d56bfb
|
RELEASE: Set next development version (#6345)
|
2017-09-19 14:52:53 +03:00 |
|
Artem Zatsarynnyi
|
a07ffc3c70
|
Merge branch 'master' into spi
|
2017-09-14 15:48:40 +03:00 |
|
Anatoliy Bazko
|
6b76cadf84
|
Thread dump for java debugger (#5320)
CHE-3708: Thread dump for java debugger
|
2017-09-13 13:35:28 +03:00 |
|
Artem Zatsarynnyi
|
04be689c69
|
Merge branch 'master' into spi
|
2017-09-04 11:51:57 +03:00 |
|
Roman Iuvshyn
|
2850a74a11
|
RELEASE: Set next development version (#6067)
|
2017-08-23 11:11:34 +03:00 |
|
Sergii Kabashniuk
|
6e9825c699
|
Used Google Java Codestyle
|
2017-08-18 17:16:54 +03:00 |
|
Sergii Kabashniuk
|
5b373e6cf5
|
Used Google Java Codestyle (#5851)
|
2017-08-18 17:00:58 +03:00 |
|
Artem Zatsarynnyi
|
51fed52707
|
Merge branch 'master' into spi
|
2017-08-17 15:21:26 +03:00 |
|
Roman Iuvshyn
|
c2eb3188c1
|
RELEASE: Set next development version (#5949)
|
2017-08-09 11:17:20 +03:00 |
|
Artem Zatsarynnyi
|
b851196df5
|
Merge branch 'master' into spi
|
2017-07-20 12:30:15 +03:00 |
|
Artem Zatsarynnyi
|
fdcb210bfb
|
Remove obsolete IDE events (#5751)
|
2017-07-20 11:46:00 +03:00 |
|
Roman Iuvshyn
|
185273f8b9
|
RELEASE: Set next development version (#5734)
* RELEASE: Set next development version
|
2017-07-19 12:45:32 +03:00 |
|
Artem Zatsarynnyi
|
1ba5f63d8f
|
Merge branch 'master' into spi
|
2017-06-29 17:45:59 +03:00 |
|
Roman Iuvshin
|
eab04ddd6b
|
RELEASE: Set next development version
|
2017-06-29 07:59:05 +00:00 |
|
Artem Zatsarynnyi
|
ad2460999e
|
Merge branch 'master' into spi
|
2017-06-22 08:27:59 +03:00 |
|
Michail Kuznetsov
|
10227bf474
|
Set correct scopes for dependencies (#5416)
|
2017-06-21 14:22:15 +00:00 |
|
Roman Iuvshin
|
513aa19ebd
|
RELEASE: Set next development version
|
2017-06-21 13:04:16 +00: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 |
|
Roman Iuvshin
|
eb2fa0eeed
|
RELEASE: Set next development version
|
2017-06-14 07:13:04 +00:00 |
|
Artem Zatsarynnyi
|
ad3bc4d739
|
Use Workdspace's and Factory's model objects in IDE (#5221)
|
2017-05-29 16:19:43 +03:00 |
|
Aleksandr Andrienko
|
4bcc56436f
|
CHE-5156: Fix ability start new debug session after disconnect from previous session. (#5167)
Signed-off-by: Aleksandr Andrienko <aandrienko@codenvy.com>
|
2017-05-26 15:16:25 +03:00 |
|
Roman Iuvshin
|
9fbf173eb9
|
RELEASE: Set next development version
|
2017-05-24 07:30:41 +00:00 |
|
Dmitry Kuleshov
|
3deb16ea97
|
Unification of JSON RPC codebase (#5005)
|
2017-05-16 15:03:24 +03:00 |
|
Roman Iuvshin
|
b3ae33acf5
|
RELEASE: Set next development version
|
2017-05-10 10:54:42 +00:00 |
|
Roman Iuvshin
|
6d88cf8c73
|
[maven-release-plugin] prepare for next development iteration
|
2017-04-25 18:19:17 +00:00 |
|
Roman Iuvshin
|
d7f023fd89
|
[maven-release-plugin] prepare release 5.9.0
|
2017-04-25 18:19:10 +00:00 |
|
Roman Iuvshin
|
7805c146e6
|
[maven-release-plugin] prepare for next development iteration
|
2017-04-13 11:07:13 +00:00 |
|
Roman Iuvshin
|
e8107fd96c
|
[maven-release-plugin] prepare release 5.8.0
|
2017-04-13 11:07:06 +00:00 |
|
Roman Iuvshin
|
840ae853f8
|
Revert "RELEASE: set minor change version"
This reverts commit e23b9257a3.
|
2017-04-11 20:55:24 +03:00 |
|
Roman Iuvshin
|
e23b9257a3
|
RELEASE: set minor change version
|
2017-04-11 18:10:45 +03:00 |
|
Valeriy Svydenko
|
3280700465
|
CHE-4593: Use JSON RPC for the debugger functionality (#4739)
|
2017-04-07 13:55:10 +00:00 |
|
Roman Iuvshin
|
08d4d0f25c
|
[maven-release-plugin] prepare for next development iteration
|
2017-04-06 14:28:39 +00:00 |
|
Roman Iuvshin
|
53a0325213
|
[maven-release-plugin] prepare release 5.7.0
|
2017-04-06 14:28:33 +00:00 |
|
Roman Iuvshin
|
342f103654
|
[maven-release-plugin] prepare for next development iteration
|
2017-03-30 12:25:35 +00:00 |
|
Roman Iuvshin
|
e6e4a652cc
|
[maven-release-plugin] prepare release 5.6.0
|
2017-03-30 12:25:28 +00:00 |
|
Roman Iuvshin
|
e7588aa2b3
|
[maven-release-plugin] prepare for next development iteration
|
2017-03-15 14:59:35 +00:00 |
|
Roman Iuvshin
|
69cf9f5528
|
[maven-release-plugin] prepare release 5.5.0
|
2017-03-15 14:59:28 +00:00 |
|
Anatoliy Bazko
|
de27a4e14f
|
Remove gwt-test-util redundant dependency (#4320)
|
2017-03-06 12:31:26 +00:00 |
|
Roman Iuvshin
|
ceff3938ff
|
[maven-release-plugin] prepare for next development iteration
|
2017-03-02 18:33:12 +00:00 |
|
Roman Iuvshin
|
8ed6e10476
|
[maven-release-plugin] prepare release 5.4.0
|
2017-03-02 18:33:06 +00:00 |
|
Roman Iuvshin
|
e71c7b5671
|
[maven-release-plugin] prepare for next development iteration
|
2017-02-17 11:04:07 +00:00 |
|
Roman Iuvshin
|
c071c65aa2
|
[maven-release-plugin] prepare release 5.3.0
|
2017-02-17 11:03:59 +00:00 |
|
Roman Iuvshin
|
0dd0dea686
|
[maven-release-plugin] prepare for next development iteration
|
2017-02-01 13:31:32 +00:00 |
|
Roman Iuvshin
|
d138c3623f
|
[maven-release-plugin] prepare release 5.2.0
|
2017-02-01 13:31:25 +00:00 |
|
Roman Iuvshin
|
05a7cd53b5
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-18 16:33:24 +00:00 |
|
Roman Iuvshin
|
41d3739928
|
[maven-release-plugin] prepare release 5.1.0
|
2017-01-18 16:33:17 +00:00 |
|
Roman Iuvshin
|
9904460818
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-06 11:48:49 +00:00 |