Commit Graph

120 Commits (ec77e2204666bed3b3ebfca2b2bc3cf528cd363a)

Author SHA1 Message Date
Roman Iuvshyn 71704ab3a7
RELEASE: Set next development version (#8135) 2018-01-03 14:13:25 +02:00
Roman Iuvshyn 5a6d3910b2
RELEASE: set next dev version (#7882) 2017-12-14 15:51:34 +02:00
Roman Iuvshyn 506210325a
RELEASE: set next dev version (#7523) 2017-11-23 12:50:56 +02:00
Dmytro Kulieshov 0f635cf122
Added JSON-RPC back-end to Project API and removed deprecated VFS classes (#7380) 2017-11-20 12:02:46 +02:00
Mykola Morhun 46ddf5e840
Base of Git Panel (#7235) 2017-11-13 09:24:40 +02:00
Florent BENOIT 31919c3970 Update to new Lucene 7.0.1 API
Change-Id: I95ca91028114a909ec6ec0c7a7f123e8c09cab2c
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-11-02 12:11:00 +01:00
Roman Iuvshyn 19f5fd1f5a
RELEASE: Set next development version (#7112) 2017-10-31 16:46:30 +02:00
Artem Zatsarynnyi f15fbf1cb1
IDE agnostic way to launch GWT Super DevMode (#7084)
Adapted modules to gwt-lib/gwt-app lifecycle;
shared libs have been cleaned up from the GWT related stuff;
enabled launching Super DevMode with a reactor goal gwt:codeserver;
enabled launching Super DevMode inside a dev-machine (for Che in Che development);
separate compiling IDE GWT app from packaging IDE Web app.

Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
2017-10-31 15:27:22 +02:00
Sergii Kabashniuk f4cc97acce Set next version 6.0.0-M1-SNAPSHOT 2017-10-19 13:53:40 +03:00
Sergii Kabashniuk e321ab00b1 Merge with master 2017-10-15 14:33:47 +03:00
Roman Iuvshyn abe3271908 RELEASE: Set next development version (#6692)
* RELEASE: Set next development version
2017-10-14 20:17:04 +03:00
Sergii Kabashniuk f1e0592348 Merge remote-tracking branch 'origin/master' into spi 2017-10-12 13:26:27 +03:00
Vladyslav Zhukovskyi 848d6f9594 Create model interface representing file change (#6681)
* Replace abstract method with default implementation

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Replace abstract method with default implementation

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Fix formatting issue

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>

* Create model interface representing file change

Signed-off-by: Vladyslav Zhukovskyi <vzhukovs@redhat.com>
2017-10-12 11:29:58 +03:00
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
Igor Vinokur fe005f3df5 Add git changes markers to the editor (#6054) 2017-10-09 10:02:41 +03:00
Artem Zatsarynnyi 4bc18519db Merge branch 'che-multiuser' into spi 2017-10-05 16:30:22 +03:00
Valeriy Svydenko 25c16a63be Add pagination to the full text search results (#6522) 2017-10-04 18:08:39 +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 acce13f30c Merge branch 'master' into spi 2017-09-15 11:21:33 +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 ce3873af82 Merge branch 'master' into spi 2017-08-17 17:16:04 +03:00
Artem Zatsarynnyi a552e67a76 Merge branch 'master' into spi 2017-08-17 16:40:48 +03:00
Artem Zatsarynnyi 51fed52707 Merge branch 'master' into spi 2017-08-17 15:21:26 +03:00
Vitalii Parfonov 0cada6bc98 CHE-5174 Improving search results (#5989)
* CHE-5714:Improving search results:

line numbers are shown for matches
multiple matches in the same file are shown individually
when you click on a search result, the editor loads the file AND jumps straight to the matching line with all instances of the search term already highlighted

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-08-16 13:17:06 +03:00
Vitalii Parfonov 3cf436ff79 Revert "CHE-5174 Improving search results (#5874)" (#5988)
This reverts commit 83150f4683.
2017-08-14 16:18:44 +03:00
Vitalii Parfonov 83150f4683 CHE-5174 Improving search results (#5874)
* CHE-5714:Improving search results:

line numbers are shown for matches
multiple matches in the same file are shown individually
when you click on a search result, the editor loads the file AND jumps straight to the matching line with all instances of the search term already highlighted

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>

* Code cleanup

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-08-14 16:09:28 +03:00
Igor Vinokur c9b568dc47 Fix license headers (#5984) 2017-08-14 09:12:48 +03:00
Igor Vinokur 373e93d89a CHE-5339: Mark with color Git changed files in project explorer (#5722) 2017-08-14 08:56:39 +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
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
Roman Iuvshyn 185273f8b9 RELEASE: Set next development version (#5734)
* RELEASE: Set next development version
2017-07-19 12:45:32 +03:00
Artem Zatsarynnyi da2b92c66e Merge branch 'master' into spi 2017-07-12 11:37:57 +03:00
Dmytro Kulieshov 4e63b844fc Rework Navigate to File feature to avoid using Everrest based Websocket calls (#5561) 2017-07-11 10:57:38 +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
Roman Iuvshin 513aa19ebd RELEASE: Set next development version 2017-06-21 13:04:16 +00:00
Artem Zatsarynnyi 812338b6b5 Merge branch 'master' into spi 2017-06-20 13:57:48 +03:00
Vladyslav Zhukovskii b95d74c5bb Broadcast project import output through json rpc protocol (#4888)
* Broadcast project import output through json rpc protocol

Signed-off-by: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>

* Remove redundant text

Signed-off-by: Vladyslav Zhukovskii <vzhukovskii@codenvy.com>

* Code refactoring

* Code refactoring

* Name convention

* New line

* Refactor method body

* Add log call

* Extract hardcoded strings to the constants
2017-06-20 12:22:53 +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
Roman Iuvshin eb2fa0eeed RELEASE: Set next development version 2017-06-14 07:13:04 +00:00
Artem Zatsarynnyi 212bbc7808 Merge branch 'master' into spi 2017-06-01 10:45:08 +03:00
Roman Nikitenko 1c7818f14e CHE-3570. Add ability to turn on/off autosave mode for editor content
Signed-off-by: Roman Nikitenko <rnikitenko@codenvy.com>
2017-05-31 13:29:01 +00:00
Artem Zatsarynnyi 993e8df52e Merge branch 'master' into spi 2017-05-24 12:16:17 +03:00
Roman Iuvshin 9fbf173eb9 RELEASE: Set next development version 2017-05-24 07:30:41 +00:00