Igor Vinokur
52599d66a8
CHE-7661: Clear active debugger on connection error ( #7932 )
2017-12-19 08:33:28 +00:00
Roman Iuvshyn
5a6d3910b2
RELEASE: set next dev version ( #7882 )
2017-12-14 15:51:34 +02:00
Roman Nikitenko
0b19f2b030
CHE-7024. Add ability of fast switching between IDE parts
...
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-12-11 14:58:31 +02:00
Roman Iuvshyn
506210325a
RELEASE: set next dev version ( #7523 )
2017-11-23 12:50:56 +02:00
Anatoliy Bazko
62611aee78
CHE-6846: Suspend breakpoint policy ( #7347 )
2017-11-16 07:13:43 +00:00
Igor Vinokur
d69256ca7b
CHE-6699: Clear debugger panel on workspace stopped ( #7298 )
2017-11-15 06:53:53 +00:00
Anatoliy Bazko
40ff60038d
CHE-6845: Disable breakpoints ( #7204 )
2017-11-07 09:32:08 +00: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
Anatoliy Bazko
0e4ffb7f87
CHE-6547: Run to cursor ( #7053 )
...
Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
2017-10-30 06:49:33 +00:00
Anatoliy Bazko
c1463d3be9
CHE-6843: Navigate to breakpoint ( #6960 )
...
Signed-off-by: Anatoliy Bazko <abazko@redhat.com>
2017-10-25 13:53:53 +00:00
Oleksandr Andriienko
e9726221c5
Add debugger watch expressions. ( #6950 )
...
Add debugger watch expressions. Use smart tree widget for debugger variables tree. Remove some unused code.
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
2017-10-25 12:38:01 +00:00
Florent BENOIT
3f262e620e
Cleanup some Mockito deprecated usage (che6) ( #6864 )
...
* Cleanup some Mockito deprecated usage
org.mockito.Matchers —> org.mockito.ArgumentMatchers
org.mockito.runners.MockitoJUnitRunner —> org.mockito.junit.MockitoJUnitRunner
Change-Id: Icf7351cb58e0f42fa95885c2d2cf6b5e98206c35
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-21 09:07:43 +02:00
Florent BENOIT
6a95b6d74a
Apply google format v1.4 https://github.com/google/google-java-format/releases/tag/google-java-format-1.4
...
Change-Id: I5df30c23165df1fd39eef4c57893bebd1d681c1d
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-19 22:23:04 +02:00
Sergii Kabashniuk
f4cc97acce
Set next version 6.0.0-M1-SNAPSHOT
2017-10-19 13:53:40 +03:00
Yevhen Vydolob
ed2433e415
Provide Action interface, use DOM Element for Action image ( #6811 )
...
* #6788 Add Action interface and declare all needed methods from absctract class Action in BaseAction class
Signed-off-by: Yevhen Vydolob <evidolob@codenvy.com>
2017-10-19 11:25:03 +02:00
Anatoliy Bazko
7a84f130f6
FixUp ( #6801 )
2017-10-18 13:01:55 +00:00
Anatoliy Bazko
d3278187fb
CHE-6545: Add condition for breakpoints ( #6763 ) ( #6786 )
2017-10-18 11:46:00 +00:00
Sergii Kabashniuk
e321ab00b1
Merge with master
2017-10-15 14:33:47 +03:00
Florent BENOIT
9581a9bbef
Move to mockito 2.10
...
Some changes are required like
- anyString() --> nullable(String.class) for many tests as in fact we provide null values
- add class for VerificationMode as there are more than one method now (can't use lambdas)
- remove cast on ArgumentMatcher (now we can use lambdas as there is generics)
- remove unecessary stubbing (mockito is now reporting un-needed stubs)
Change-Id: I69c7ccc86bc85a4401d5e33671229ae0ce560dbb
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-10-15 10:34:15 +02:00
Roman Iuvshyn
abe3271908
RELEASE: Set next development version ( #6692 )
...
* RELEASE: Set next development version
2017-10-14 20:17:04 +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
Anatoliy Bazko
8d70ec4024
Fix php debugger test ( #6556 )
2017-10-06 10:38:22 +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
772b1bbc71
Fix build after updating to EclipseLink 2.7.0 ( https://github.com/eclipse/che-dependencies/pull/58 )
2017-09-28 12:17:48 +03:00
Artem Zatsarynnyi
28c5193252
Merge commit 'da636d181c41a5602dbd5ced28474ad985df49c0' into spi
2017-09-28 12:15:59 +03:00
Anatoliy Bazko
2fe4505eab
Small fixes for master ( #6462 )
...
Small fixes for master.
* Removed dependency on server side in gwt code (debugger)
* Fixed ThreadDumpTest
* Formatted java class
2017-09-27 11:26:56 +00: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
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
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
dd66566958
IDE API reorganization ( #5867 )
2017-08-01 18:16:59 +03:00
Artem Zatsarynnyi
9438de64ce
Merge branch 'master' into spi
2017-07-31 12:15:04 +03:00
Anatoliy Bazko
e4286e6196
CHE-5236: Treat decompiled class in a proper way ( #5808 )
2017-07-28 14:27:39 +00:00
Artem Zatsarynnyi
ab0321beb4
Merge branch 'spi' of github.com:eclipse/che into spi
2017-07-28 16:56:50 +03:00
Artem Zatsarynnyi
016d03c169
Merge branch 'master' into spi
2017-07-28 16:56:28 +03:00
Vitaliy Guliy
18271f63a6
Squashed commit of the following: ( #5812 )
...
commit 93d8f7634b99829408290641e74a98d0ee310939
Merge: a9e80b1df b485ed3e0
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Fri Jul 21 11:40:32 2017 +0300
Merge branch 'master' into CHE-4929
commit a9e80b1df30f699efd9a2b525f0df152158205f1
Merge: 8fbb948ed 7a8cee2af
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Wed Jul 19 09:55:16 2017 +0300
Merge branch 'master' into CHE-4929
commit 8fbb948ed010a2b1321f99372548833d21902282
Merge: b05c8bae4 32d354518
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jul 18 11:50:49 2017 +0300
Merge branch 'master' into CHE-4929
commit b05c8bae45a4e9629c1ca8f5841c842520bf8c38
Merge: 7bad4b9ca c3dd54980
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jul 18 11:49:05 2017 +0300
Merge branch 'master' into CHE-4929
Conflicts:
ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/StandardComponentInitializer.java
ide/che-core-ide-app/src/main/resources/org/eclipse/che/ide/CoreLocalizationConstant.properties
commit 7bad4b9ca4376c9f6b51bfa7f6d68181909bb4cc
Merge: 1510debe8 f0717e0ed
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Sat Jul 1 13:17:36 2017 +0300
Merge branch 'master' into CHE-4929
commit 1510debe8baaf3667dbd39fb2f59df2d393f22c8
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Sat Jul 1 13:16:43 2017 +0300
Finalize dark theme
commit 0db3dfdef9d12caf6674325987d1384a23227c2f
Merge: ec6d1c5f0 003804df7
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Fri Jun 30 15:43:15 2017 +0300
Merge branch 'master' into CHE-4929
commit ec6d1c5f02ba37440382c9db703a25d74af79e7d
Merge: 6c7c5a3cb c7c1ee807
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 29 18:36:34 2017 +0300
Merge branch 'master' into CHE-4929
Conflicts:
plugins/plugin-testing/che-plugin-testing-ide/src/main/java/org/eclipse/che/plugin/testing/ide/view/TestResultViewImpl.java
commit 6c7c5a3cbe922a249a3c28bd0a8012868e0fcfd8
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 29 17:31:33 2017 +0300
Add button to manage toolbar visibility
commit 71fb191f46bc3c13c535f08a6e491504eb387ee6
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 29 16:51:36 2017 +0300
Add button to manage toolbar visibility
commit 25087df8832e78881cedcec79eed30b2fd09efa1
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 22 16:26:08 2017 +0300
Fixing tests
commit f7f22e29b2e1c4bb09f7b23f167409445fdb35e0
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 22 16:21:34 2017 +0300
Revert "Prototype new panel concept"
This reverts commit 9893039d928ee2256abb7856db06edd808812dc1.
commit 0033ec1e9b0e1ddedabe46c4e36bed9c381ed940
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 22 16:20:39 2017 +0300
Prototype new panel concept
commit 4fcb643bcdab86517204f60c92360bebbf1b74e7
Merge: af3d89232 215688641
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 22 13:22:01 2017 +0300
Merge branch 'master' into CHE-4929
commit af3d892322c171b56cedbd9dfffb773ec39b4b49
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 22 13:10:17 2017 +0300
Fixing Go Into functionality
commit bf14b3635215823623d4d15e6d57d91f02f626b1
Merge: b3dda08f7 5bdd4c882
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jun 20 10:00:02 2017 +0300
Merge branch 'master' into CHE-4929
commit b3dda08f78b3993d1df695d35bf16bfe96c5d5c8
Merge: 6cf0946a6 c8a8381b5
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Mon Jun 19 10:25:23 2017 +0300
Merge branch 'master' into CHE-4929
commit 6cf0946a693d6683a50dcf4b05723109d0cc97a7
Merge: 2d565db76 7b90ec595
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 15 16:00:57 2017 +0300
Merge branch 'master' into CHE-4929
commit 2d565db765b8f55b8f4381b07f5af17e5219d46b
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 15 15:59:23 2017 +0300
Prototype new panel concept
commit 3a168982787a83c7e63b4b44e2554a5c127ea252
Merge: a9bb36c7e ac2f39562
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 15 09:32:31 2017 +0300
Merge branch 'master' into CHE-4929
commit a9bb36c7e5bd69df9e9787faede3d589a4687a31
Merge: f708d7feb eb2fa0eee
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Wed Jun 14 10:29:00 2017 +0300
Merge branch 'master' into CHE-4929
commit f708d7feb8870552d707b323dd97f8381f5faf12
Merge: 9893039d9 e4f0f2372
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jun 13 17:27:02 2017 +0300
Merge branch 'master' into CHE-4929
Conflicts:
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-testng/che-plugin-testing-testng-ide/src/main/java/org/eclipse/che/plugin/testing/testng/ide/action/RunAllTestAction.java
commit 9893039d928ee2256abb7856db06edd808812dc1
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jun 13 17:22:39 2017 +0300
Prototype new panel concept
commit 1b7789f9eb25559342c8de6bf152dc6836e817bd
Merge: ef25f64d1 e8f485506
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jun 13 11:18:54 2017 +0300
Merge branch 'master' into CHE-4929
commit ef25f64d13de7ef5532efd517db30482579f3bb9
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Tue Jun 13 11:15:27 2017 +0300
Prototype new panel concept
commit 8a8c618ac020b29bdc7de788d8e6002079639eb8
Merge: ca4deebb3 bbe3c6fec
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Mon Jun 12 10:21:20 2017 +0300
Merge branch 'master' into CHE-4929
commit ca4deebb336f9143a3ba05c255834b4871f76536
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Fri Jun 9 17:24:27 2017 +0300
Prototype new panel concept
commit 82af3e0bbed736e5315644c04fa2c68b1f998590
Merge: cd5abf027 9426d5d14
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Fri Jun 9 09:56:35 2017 +0300
Merge branch 'master' into CHE-4929
commit cd5abf0273099fd57021623d98ac4be11cfea485
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Thu Jun 8 16:24:47 2017 +0300
Prototype new panel concept
commit 3acec2dc11ea0f990405949e6a96d907a92b0080
Merge: f7eadb2ef ac8d44e57
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Fri Jun 2 12:50:27 2017 +0300
Merge branch 'master' into CHE-4929
Conflicts:
ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/parts/base/BaseView.java
commit f7eadb2ef5e26838050131c2b7b4de0808cbf1e6
Author: Vitaliy Guliy <vguliy@codenvy.com>
Date: Fri Jun 2 12:34:55 2017 +0300
Prototype new panel concept
2017-07-28 15:59:25 +03:00