seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,676 Commits
124 Branches
308 Tags
147 MiB
Commit Graph

49 Commits (0c77efc2b3a5ace0a31b160d19e57bc93dd16bcc)

Author SHA1 Message Date
Sergii Leshchenko 108b3d832b Merge remote-tracking branch 'origin/che-multiuser' into spi-multiuser 
# Conflicts:
#	assembly/assembly-wsmaster-war/src/main/java/org/eclipse/che/api/deploy/WsMasterModule.java
#	dockerfiles/init/manifests/che.env
#	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
#	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-machine/pom.xml
#	wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/model/impl/EnvironmentImpl.java
 2017-09-28 12:33:07 +03:00
Artem Zatsarynnyi 685def4d29 Merge branch 'master' into spi 2017-09-21 09:24:39 +03:00
Sergii Kabashniuk 546ba4e4ea Merge with master 2017-09-20 11:34:18 +03:00
Roman Iuvshyn 8e03d56bfb RELEASE: Set next development version (#6345) 2017-09-19 14:52:53 +03:00
Sergii Kabashniuk d4f03cbc4a Ability to authenticate Oauth flow (#6326) 
* Add keycloak token to oauth authenticate call

* fixup! Add keycloak token to oauth authenticate call

* fixup! Add keycloak token to oauth authenticate call

* Fix dashboard build

* fixup! Add keycloak token to oauth authenticate call

* fixup! Add keycloak token to oauth authenticate call

* Add security token for websocket url  (#6319)

* Add security token for websocket url

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

* Fix failed test (#6325)

Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
 2017-09-18 18:42:49 +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
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
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 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
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
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
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 51cd595497 Merge branch 'master' into spi 2017-07-14 16:03:43 +03:00
Sun Seng David Tan e0c9d06ac3 PR Panel: refactoring 
Signed-off-by: Sun Seng David Tan <sutan@redhat.com>
 2017-07-13 15:20:33 +02:00
Artem Zatsarynnyi da2b92c66e Merge branch 'master' into spi 2017-07-12 11:37:57 +03:00
Vitalii Parfonov 3d25154964 Replace Window.open() with JS native call (#5584) 
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
 2017-07-10 19:39:33 +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 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 ba953206ce Move GitServiceClient from IDE API to plugin GIT 2017-06-23 17:36:24 +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 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 ad3bc4d739 Use Workdspace's and Factory's model objects in IDE (#5221) 2017-05-29 16:19:43 +03:00
Roman Iuvshin 9fbf173eb9 RELEASE: Set next development version 2017-05-24 07:30:41 +00:00
Anatoliy Bazko 0c0110a6e7 CODENVY-1949: Create PR to owner's origin reporistory (#5158) 2017-05-24 06:48:05 +00:00
Roman Iuvshin b3ae33acf5 RELEASE: Set next development version 2017-05-10 10:54:42 +00:00
Roman Iuvshin 6d88cf8c73 [maven-release-plugin] prepare for next development iteration 2017-04-25 18:19:17 +00:00
Roman Iuvshin d7f023fd89 [maven-release-plugin] prepare release 5.9.0 2017-04-25 18:19:10 +00:00
Vitaliy Guliy 261cb400dc CHE-4379 Cannot reduce process panel size (#4829) 
* CHE-4379 Cannot reduce process panel size

* CHE-4379 Cannot reduce process panel size

* CHE-4379 Cannot reduce process panel size
 2017-04-24 17:57:59 +03:00
Roman Iuvshin 7805c146e6 [maven-release-plugin] prepare for next development iteration 2017-04-13 11:07:13 +00:00
Roman Iuvshin e8107fd96c [maven-release-plugin] prepare release 5.8.0 2017-04-13 11:07:06 +00:00
Roman Iuvshin 840ae853f8 Revert "RELEASE: set minor change version" 
This reverts commit e23b9257a3.
 2017-04-11 20:55:24 +03:00
Roman Iuvshin e23b9257a3 RELEASE: set minor change version 2017-04-11 18:10:45 +03:00
Roman Iuvshin 08d4d0f25c [maven-release-plugin] prepare for next development iteration 2017-04-06 14:28:39 +00:00
Roman Iuvshin 53a0325213 [maven-release-plugin] prepare release 5.7.0 2017-04-06 14:28:33 +00:00
Roman Iuvshin 81d896aac2 fix release failure 2017-04-06 17:01:54 +03:00
Max Shaposhnik 62d32687c2 Factory migration (#4413) 2017-04-03 15:11:45 +03:00