Commit Graph

322 Commits (269a50691d767994319fddf773fbc02b69a8fc84)

Author SHA1 Message Date
Igor Vinokur 63764c8391
CHE-7407: Remove redundant Git file watcher initialization (#7622) 2017-11-30 09:36:28 +00:00
Roman Iuvshyn 506210325a
RELEASE: set next dev version (#7523) 2017-11-23 12:50:56 +02:00
Igor Vinokur 366c105419
CHE-6813: Add search filter to Git branch dialogs (#7433) 2017-11-21 10:28:10 +00:00
Oleksandr Andriienko 6cd13682e5
CHE-6741: Fix Git files colors after git commit. (#7422)
Signed-off-by: Oleksandr Andriienko <oandriie@redhat.com>
2017-11-20 16:56:53 +00:00
Igor Vinokur c2897b04f8
CHE-6255: Apply 3-state checkbox in Git changes list widget (#7265)
Add new widget that extends SelectableChangesPanel and has check-boxes. 
Implement 3-state check-box to show that folder has selected and not selected items
2017-11-17 07:31:46 +00:00
Mykola Morhun 46ddf5e840
Base of Git Panel (#7235) 2017-11-13 09:24:40 +02:00
Igor Vinokur d5280f84b9
CHE-6741: Fix Git JsonRPC chanel initialization (#7275) 2017-11-09 14:11:33 +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
Igor Vinokur 5e434faac1
CHE-6645: Add new icons instead of file name colors in Git changes list (#6998)
- Added new icons instead of file name colors in Git changes list.
- Changed icons and style of buttons.
- Removed colors table that described item colors.
2017-10-30 15:25:57 +02:00
Vitalii Parfonov d0e7297d3c Check class instance before cast it (#6996)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-10-25 17:31:19 +03: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
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
Artem Zatsarynnyi 22c21265aa Merge branch 'master' into spi 2017-10-11 10:16:43 +03:00
Igor Vinokur 4f09d1d00f CHE-5340: Rework 'VcsChangeMarkerRenderFactory' initialization (#6658)
Add ability to implement VcsChangeMarkerRenderFactory from multiple places
2017-10-10 17:00:46 +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
Anatoliy Bazko 0181b6572e CHE-6024: Add selenium test (#6550) 2017-10-03 15:51:50 +03:00
Anatoliy Bazko 05642192b5 CHE-6342: Rework git status feature (#6536) 2017-10-03 10:23:17 +03:00
Dmitrii Bocharov 57b2fc7058 CHE-6024: Add 'Git revert' action (#6108) 2017-10-03 09:21:33 +03:00
Anatoliy Bazko 2512d7b9bf Revert Git revert action (#6470) 2017-09-27 15:21:46 +00:00
Anatoliy Bazko dac5b6610f CHE-6024: Revert commit action (#6386)
* CHE-6024: Revert commit action
2017-09-27 08:26:25 +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
Vitalii Parfonov d60d4da5a9 Workaround for fixing freeze browser for big project (#6341)
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-09-19 13:06:23 +03:00
Artem Zatsarynnyi c0283c1640 Merge branch 'master' into spi 2017-09-19 09:51:13 +03:00
Igor Vinokur 9f08923327 CHE-6033: Fix bug when git colors are note updated after git operations (#6262)
CHE-6033: Fix bug when git colors are note updated after git operations
2017-09-18 12:21:24 +03:00
Artem Zatsarynnyi cfc0fa03b7 Merge branch 'master' into spi 2017-09-18 11:17:32 +03:00
Mykola Morhun 7beb2467ba CHE-5925: Add hotkeys to the most usable git actions (#6247)
CHE-5925: Add hotkeys to the most usable git actions
2017-09-15 15:28:02 +03:00
Artem Zatsarynnyi acce13f30c Merge branch 'master' into spi 2017-09-15 11:21:33 +03:00
Artem Zatsarynnyi 3f05a855c0 Merge branch 'master' into spi 2017-09-13 09:07:26 +03:00
Igor Vinokur fc35ba2618 CHE-6114: Fix problems with project explorer performance in big projects (#6175)
1. Add ability to get Git status with filter.
2. Reworked Injecting VCS status info in Project service to make Status request only once instead of requesting each time in the loop.
3. Removed `format` parameter from get status method in Git Service, because it is redundant and do not affects to anything, since we use Jgit as a Git engine.
2017-09-12 14:41:28 +00:00
Mykola Morhun c7ed1d8336 Add ability to switch between files in Git Diff widget (#5965)
* Performs small refactoring of git-compare-related functionality.
* Adds ability to switch to the next/previous file in git compare widget.
* Adds hotkeys for next and previous diff
* Adds Save Changes button for git compare widget.
* Fixes compare with deleted file bug.
* Moves Git Diff widget from iframe to IDE.
2017-09-12 14:13:52 +03:00
Vitaliy Guliy dcdab14f73 CHE-5735 Provide consistent "new tab" behaviour (#6156)
* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour

* CHE-5735 Provide consistent "new tab" behaviour
2017-09-06 18:15:00 +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
Oleksandr Garagatyi 041aff648c Merge branch 'master' into spi
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-08-23 09:49:33 +03:00
Roman Nikitenko 0343393028 CHE-5829. Fix non-exhaustive switch statements
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-08-22 18:16:33 +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 48d8129fc7 Fix git watchers initialization 2017-08-18 14:41:58 +03:00
Artem Zatsarynnyi 83d25535a9 Fix licenses
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
2017-08-17 17:19:12 +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
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
Igor Vinokur 03f7e01379 CHE-5335: Add Git branch/revision link to project name (#5817) 2017-08-14 08:21:33 +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
Igor Vinokur a523fe3c44 CHE-3415: Change 'Rebase instead of merge' checkbox title (#5969) 2017-08-10 17:46:54 +03:00
Roman Iuvshyn c2eb3188c1 RELEASE: Set next development version (#5949) 2017-08-09 11:17:20 +03:00
Igor Vinokur 3902db77d1 CHE-4678: Add all/local/remote filter in Git branches dialog (#5858) 2017-08-04 08:56:09 +03:00
Mykola Morhun 307491c349 CHE-5862: Set right handler on double click in Git Compare window (#5885)
Set right handler on double click in Git Compare window
2017-08-03 16:17:25 +03:00
Artem Zatsarynnyi dd66566958 IDE API reorganization (#5867) 2017-08-01 18:16:59 +03:00
Artem Zatsarynnyi 016d03c169 Merge branch 'master' into spi 2017-07-28 16:56:28 +03:00
Igor Vinokur c9c9a4a692 CHE-3415: Add ability to perform Git pull with rebase (#5787) 2017-07-27 09:33:33 +03:00
Artem Zatsarynnyi 643d69319a Merge branch 'master' into spi 2017-07-26 11:45:33 +03:00
Mykola Morhun d5de61bfb9 CHE-3221: Fix git compare on submodules. (#5799)
* CHE-3221: Fix git compare on submodules.
2017-07-25 17:46:28 +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 cf34dfc5ea Clean up IDE API: remove obsolete workspace model classes (#5757) 2017-07-20 16:11:16 +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
Mykola Morhun 084c66c4e4 CHE-5152: Apply pagination in Git Reset window (#5726)
* CHE-5152: Apply pagination in Git Reset window
* CHE-5152: Apply max scroll fix for Git History window
* CHE-5152: Fix selection bug in GIt Reset window
2017-07-20 10:01:52 +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 14790b609c Move JSON-RPC endpoints ids to constants (#5612) 2017-07-12 10:21:19 +03:00
Artem Zatsarynnyi a1dfdfb04e Merge branch 'master' into spi 2017-07-05 18:25:50 +03:00
Igor Vinokur cb1348b26c CHE-5346 Rework git client-service (#5476)
1. Get rid of using Everrest based Websocket calls in `GitServiceClientImpl.java`.
2. Remove deprecated methods from git client service.
3. Get rid of `DevMachine devMachine` parameter from all git client service methods.
4. Rework Git clent side to use streams and lambdas.
2017-07-04 11:25:18 +03:00
Artem Zatsarynnyi 7b0fd18f05 Merge branch 'master' into spi 2017-07-03 10:15:20 +03:00
Igor Vinokur 4977d61383 CHE-5469: Fix group by folders view in commit dialog (#5504) 2017-07-03 06:49:19 +00: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 35bc8b0707 Fix merge conflicts
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
2017-06-26 12:51:05 +03:00
Artem Zatsarynnyi ec72446d24 Merge branch 'master' into spi 2017-06-26 12:50:09 +03:00
Artem Zatsarynnyi ba953206ce Move GitServiceClient from IDE API to plugin GIT 2017-06-23 17:36:24 +03:00
Artem Zatsarynnyi d02ab6094a Make JSON RPC initialization steps depend on the appropriate servers' statuses (#5455)
split JsonRpcWebSocketAgentEventListener into separate components
2017-06-23 17:15:26 +03:00
Igor Vinokur 495bfba11d CHE-3416: Add force push checkbox to Git Push dialog (#5444) 2017-06-23 12:29:28 +03: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
Igor Vinokur 5bdd4c882e CHE-5390: Fix bug when failed to commit renamed files (#5394) 2017-06-20 09:39:57 +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 1d5648fd6e Fix building project with maven (#5354) 2017-06-12 23:48:28 +03:00
Artem Zatsarynnyi 212bbc7808 Merge branch 'master' into spi 2017-06-01 10:45:08 +03:00
Igor Vinokur f2047ea01a CHE-3614: Rework Git commit window (#5081)
Reworked Git commit window with changed files panel and check-boxes to select witch file or folder to commit or not
2017-05-31 22:00:12 +03:00
Artem Zatsarynnyi ad3bc4d739 Use Workdspace's and Factory's model objects in IDE (#5221) 2017-05-29 16:19:43 +03:00
Artem Zatsarynnyi fa91db1f4e Merge branch 'master' into spi 2017-05-29 11:25:30 +03:00
Dmitry Kuleshov cc8fd2473a Switch TestDocument (LSP) service to the websocket JSON-RPC (#5186) 2017-05-25 16:44:42 +03: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
Artem Zatsarynnyi e914a59c3e Merge branch 'master' into spi 2017-05-17 11:03:00 +03:00
Dmitry Kuleshov 3deb16ea97 Unification of JSON RPC codebase (#5005) 2017-05-16 15:03:24 +03:00
Alexander Garagatyi 21c4589086 Merge branch 'master' into spi
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
2017-05-15 12:27:23 +03:00
Artem Zatsarynnyi 1ae101d7ab clean-up IDE code 2017-05-14 17:45:49 +03:00
Roman Iuvshin b3ae33acf5 RELEASE: Set next development version 2017-05-10 10:54:42 +00:00