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
3,741 Commits
124 Branches
308 Tags
147 MiB
Commit Graph

206 Commits (8e1fe4b65da3c10dd1b9bc98dbf90886fffa1a7f)

Author SHA1 Message Date
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
Alexander Garagatyi 7877e47f6a Merge branch 'master' into spi 
Signed-off-by: Alexander Garagatyi <agaragatyi@codenvy.com>
 2017-04-27 12:08:59 +03: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
Artem Zatsarynnyi 3c74f118ca Merge branch 'master' into spi 2017-04-24 15:32:39 +03:00
Valeriy Svydenko 6403d212c6 CHE-4596: move che-plugin-machine-ext-client to IDE core (#4861) 2017-04-21 14:01:04 +00:00
Alexander Garagatyi 7e0ed03cf2 Merge branch 'master' into spi 2017-04-19 16:52:48 +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
Yevhenii Voevodin 791b898447 Merged with master 2017-04-12 16:18:56 +03:00
Yevhenii Voevodin 17703adcdc Add tmp build script spi-tmpbuild.sh 2017-04-12 15:50:32 +03: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 342f103654 [maven-release-plugin] prepare for next development iteration 2017-03-30 12:25:35 +00:00
Roman Iuvshin e6e4a652cc [maven-release-plugin] prepare release 5.6.0 2017-03-30 12:25:28 +00:00
Roman Iuvshin e7588aa2b3 [maven-release-plugin] prepare for next development iteration 2017-03-15 14:59:35 +00:00
Roman Iuvshin 69cf9f5528 [maven-release-plugin] prepare release 5.5.0 2017-03-15 14:59:28 +00:00
Vitalii Parfonov 127f792be0 Add Eclipse KeyScheme as Extension (#4394) 
* Add Eclipse KeyScheme as Extension


Signed-off-by: Arnaud Kervern <akervern@nuxeo.com>
 2017-03-10 18:13:22 +02:00
Igor Vinokur 7c68278f44 CHE-3583: Add new line to message area in Git commit window when Enter pressed (#4280) 2017-03-10 09:01:34 +00:00
Roman Iuvshin ceff3938ff [maven-release-plugin] prepare for next development iteration 2017-03-02 18:33:12 +00:00
Roman Iuvshin 8ed6e10476 [maven-release-plugin] prepare release 5.4.0 2017-03-02 18:33:06 +00:00