d7e1c73cf8
RELEASE: Set next development version ( #10110 )
2018-06-19 17:24:50 +03:00
1e41c83b1d
Do not track hidden items in the root by 'GitCheckoutDetector'
...
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2018-06-07 10:22:26 +03:00
00ca1592c7
Make it possible to have distributed ProjectRegistry ( #9848 )
...
* Adding pipeline
* del jenkinsfile
* Make exec agent not to use setsid for other than Linux envs
* revert pom.xml
* goformat
* get projects folder from workkspace configuration
* Merge remote-tracking branch 'upstream/master'
* clean code
* clean code
* Fix calculation Projects Root so it wont cause NPE if there are no 'project' volume defined
* Revert "Fix calculation Projects Root so it wont cause NPE if there are no 'project' volume defined"
This reverts commit 127a79e54c3e7f97a74f0103506025eb5e181777.
* Fix calculation Projects Root so it wont cause NPE if there are no 'project' volume defined
* replace provided attribute values with stored (src, out) in PlainJavaProjectType
* fix PlainJavaProjectType for getting rid and deprecate using SettableValueProvider
* remove comented code
* hide brouse source folder button, set source folder field as disabled
* hide the browse source button, set source folder field to read only mode, remove highlighter from the source folder field
* adapt test for current changes on UI, set save button to enable state
* apply formatting
* fs cache PT
* fix order of steps in the test
* Refactor RegisteredProject to make it possible to cache it (as DTO) to local file
* cache Projects and PTs to files
* Make it possible to have several impls for ProjectRegistry preparing it to be distributed across multi machines env
* merge upstream
* merge upstream
* merge upstream
* Update MavenServerService.java
* clean code
* small fix
* small fix
* small fix
2018-05-31 15:26:42 +03:00
7231585f4b
RELEASE: Set next development version ( #9862 )
2018-05-30 12:01:54 +03:00
6677e27a6b
RELEASE: Set next development version ( #9669 )
2018-05-11 10:27:31 +03:00
ed3b4870e4
CHE-9442: Fix Git exception when editing untracked or new file ( #9529 )
2018-04-26 16:27:35 +03:00
edb0e15e6f
RELEASE: Set next development version ( #9473 )
2018-04-18 08:31:24 +02:00
7e47b1c8ff
CHE-9066: Fix wrong author name of revert commit ( #9302 )
...
JGit sets commit author of revert commit from OS preferences. Added amend commit to rewrite commit author.
2018-04-04 11:16:45 +03:00
e006334aad
RELEASE: Set next development version ( #9268 )
2018-03-28 10:58:30 +03:00
42984501bf
CHE-8752: Fix error when creating a project inside existing folder ( #9072 )
2018-03-14 17:10:51 +00:00
dbdac2a604
RELEASE: Set next development version ( #9038 )
2018-03-07 17:53:03 +07:00
e2762411b3
RELEASE: Set next development version ( #8773 )
2018-02-14 15:00:52 +02:00
f50c2ebbf5
RELEASE: Set next development version ( #8496 )
2018-01-31 17:53:10 +02:00
2c2bd6637c
Set new year in license headers ( #8244 )
2018-01-11 16:04:49 +02:00
71704ab3a7
RELEASE: Set next development version ( #8135 )
2018-01-03 14:13:25 +02:00
907429eaa5
CHE-7885: Throw exception on Git Status if checkout is in progress ( #8071 )
2017-12-28 11:51:36 +00:00
30c931c355
CHE-7856: Fix parsing path when getting Git Status on file creation ( #7974 )
2017-12-22 13:58:30 +00:00
f4c1946fb6
CHE-7001: Fix Git status of untracked files in Git diff ( #7962 )
2017-12-21 09:16:23 +00:00
9cf76ab45e
CHE-7220: Fix Git add to index when deleted files are present ( #7874 )
2017-12-15 11:58:25 +00:00
5a6d3910b2
RELEASE: set next dev version ( #7882 )
2017-12-14 15:51:34 +02:00
3c86904c50
CHE-7792: Do not allow to get Git status if commit is in progress ( #7835 )
...
This prevents sending redundant websocket message to client, when index file is updated while commit operation.
2017-12-13 12:32:32 +00:00
c53b517f23
Cleanup project config after deleting .git directory ( #7665 )
...
* Cleanup project config after deleting .git directory
* Update project type during import
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-12-08 17:37:37 +02:00
63764c8391
CHE-7407: Remove redundant Git file watcher initialization ( #7622 )
2017-11-30 09:36:28 +00:00
5f730e20b4
CHE-7162: Improve branch search mechanism in Git checkout command ( #7491 )
2017-11-28 09:45:27 +00:00
c06c0b0e4f
CHE-7407: Rework Git file change event detection to be depend on opened editors ( #7527 )
2017-11-28 09:21:46 +00:00
a34f6d43e6
Removed several everrest-websockets dependencies from ws-agent poms ( #7462 )
2017-11-27 14:31:27 +02:00
506210325a
RELEASE: set next dev version ( #7523 )
2017-11-23 12:50:56 +02:00
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
0f635cf122
Added JSON-RPC back-end to Project API and removed deprecated VFS classes ( #7380 )
2017-11-20 12:02:46 +02:00
46ddf5e840
Base of Git Panel ( #7235 )
2017-11-13 09:24:40 +02:00
19f5fd1f5a
RELEASE: Set next development version ( #7112 )
2017-10-31 16:46:30 +02:00
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
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
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
f4cc97acce
Set next version 6.0.0-M1-SNAPSHOT
2017-10-19 13:53:40 +03:00
e321ab00b1
Merge with master
2017-10-15 14:33:47 +03:00
abe3271908
RELEASE: Set next development version ( #6692 )
...
* RELEASE: Set next development version
2017-10-14 20:17:04 +03:00
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
fe005f3df5
Add git changes markers to the editor ( #6054 )
2017-10-09 10:02:41 +03:00
4bc18519db
Merge branch 'che-multiuser' into spi
2017-10-05 16:30:22 +03:00
05642192b5
CHE-6342: Rework git status feature ( #6536 )
2017-10-03 10:23:17 +03:00
57b2fc7058
CHE-6024: Add 'Git revert' action ( #6108 )
2017-10-03 09:21:33 +03:00
2512d7b9bf
Revert Git revert action ( #6470 )
2017-09-27 15:21:46 +00:00
dac5b6610f
CHE-6024: Revert commit action ( #6386 )
...
* CHE-6024: Revert commit action
2017-09-27 08:26:25 +00:00
685def4d29
Merge branch 'master' into spi
2017-09-21 09:24:39 +03:00
8e03d56bfb
RELEASE: Set next development version ( #6345 )
2017-09-19 14:52:53 +03:00
c0283c1640
Merge branch 'master' into spi
2017-09-19 09:51:13 +03:00
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
a07ffc3c70
Merge branch 'master' into spi
2017-09-14 15:48:40 +03:00
4a07971bab
CHE-6191: FIx bug when can not open project in workspace with custom … ( #6196 )
...
…WORKDIR property
2017-09-13 06:38:10 +00:00
Roman Iuvshyn