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
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
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
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
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
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
3f05a855c0
Merge branch 'master' into spi
2017-09-13 09:07:26 +03:00
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
9c9268c735
Fixed some formatting differences ( #6044 )
2017-08-18 17:58:45 +03:00
d78121d957
Used Google Java Codestyle
2017-08-18 17:45:22 +03:00
6e9825c699
Used Google Java Codestyle
2017-08-18 17:16:54 +03:00
5b373e6cf5
Used Google Java Codestyle ( #5851 )
2017-08-18 17:00:58 +03:00
1ca8cecad5
Merge with master
2017-08-17 18:13:10 +03:00
ce41b4a71d
Change copyright owner to "Red Hat, Inc" on remaining files ( #6032 )
...
* Change copyright owner on remaining files
* fixup! Change copyright owner on remaining files
* fixup! fixup! Change copyright owner on remaining files
2017-08-17 18:05:53 +03:00
ce3873af82
Merge branch 'master' into spi
2017-08-17 17:16:04 +03:00
a552e67a76
Merge branch 'master' into spi
2017-08-17 16:40:48 +03:00
c9b568dc47
Fix license headers ( #5984 )
2017-08-14 09:12:48 +03:00
373e93d89a
CHE-5339: Mark with color Git changed files in project explorer ( #5722 )
2017-08-14 08:56:39 +03:00
03f7e01379
CHE-5335: Add Git branch/revision link to project name ( #5817 )
2017-08-14 08:21:33 +03:00
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
016d03c169
Merge branch 'master' into spi
2017-07-28 16:56:28 +03:00
c9c9a4a692
CHE-3415: Add ability to perform Git pull with rebase ( #5787 )
2017-07-27 09:33:33 +03:00
a1dfdfb04e
Merge branch 'master' into spi
2017-07-05 18:25:50 +03:00
3c947a0f53
Rework importing a project while consuming Factory to avoid using Everrest based Websocket calls ( #5493 )
2017-07-04 11:18:57 +03:00
e914a59c3e
Merge branch 'master' into spi
2017-05-17 11:03:00 +03:00
3deb16ea97
Unification of JSON RPC codebase ( #5005 )
2017-05-16 15:03:24 +03:00
7e0ed03cf2
Merge branch 'master' into spi
2017-04-19 16:52:48 +03:00
a6a569b9f7
Concept of Minimal and Full assembly ( #4578 )
...
Concept of Minimal and Full assembly
2017-04-14 10:05:03 +03:00
17703adcdc
Add tmp build script spi-tmpbuild.sh
2017-04-12 15:50:32 +03:00
4521969244
CHE-4014; remove deprecated RemotePreferenceDao ( #4455 )
2017-03-17 15:15:10 +00:00
Igor Vinokur