04be689c69
Merge branch 'master' into spi
2017-09-04 11:51:57 +03:00
2850a74a11
RELEASE: Set next development version ( #6067 )
2017-08-23 11:11:34 +03:00
041aff648c
Merge branch 'master' into spi
...
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-08-23 09:49:33 +03:00
0343393028
CHE-5829. Fix non-exhaustive switch statements
...
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-08-22 18:16:33 +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
48d8129fc7
Fix git watchers initialization
2017-08-18 14:41:58 +03:00
83d25535a9
Fix licenses
...
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
2017-08-17 17:19:12 +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
51fed52707
Merge branch 'master' into spi
2017-08-17 15:21:26 +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
a523fe3c44
CHE-3415: Change 'Rebase instead of merge' checkbox title ( #5969 )
2017-08-10 17:46:54 +03:00
c2eb3188c1
RELEASE: Set next development version ( #5949 )
2017-08-09 11:17:20 +03:00
3902db77d1
CHE-4678: Add all/local/remote filter in Git branches dialog ( #5858 )
2017-08-04 08:56:09 +03:00
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
dd66566958
IDE API reorganization ( #5867 )
2017-08-01 18:16:59 +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
643d69319a
Merge branch 'master' into spi
2017-07-26 11:45:33 +03:00
d5de61bfb9
CHE-3221: Fix git compare on submodules. ( #5799 )
...
* CHE-3221: Fix git compare on submodules.
2017-07-25 17:46:28 +03:00
32de1e7447
Rename methods ( #5762 )
...
AppContext#getMasterEndpoint -> AppContext#getMasterApiEndpoint
AppContext#getDevAgentEndpoint -> AppContext#getWsAgentServerApiEndpoint
2017-07-21 10:15:20 +03:00
cf34dfc5ea
Clean up IDE API: remove obsolete workspace model classes ( #5757 )
2017-07-20 16:11:16 +03:00
b851196df5
Merge branch 'master' into spi
2017-07-20 12:30:15 +03:00
fdcb210bfb
Remove obsolete IDE events ( #5751 )
2017-07-20 11:46:00 +03:00
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
185273f8b9
RELEASE: Set next development version ( #5734 )
...
* RELEASE: Set next development version
2017-07-19 12:45:32 +03:00
14790b609c
Move JSON-RPC endpoints ids to constants ( #5612 )
2017-07-12 10:21:19 +03:00
a1dfdfb04e
Merge branch 'master' into spi
2017-07-05 18:25:50 +03:00
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
7b0fd18f05
Merge branch 'master' into spi
2017-07-03 10:15:20 +03:00
4977d61383
CHE-5469: Fix group by folders view in commit dialog ( #5504 )
2017-07-03 06:49:19 +00:00
1ba5f63d8f
Merge branch 'master' into spi
2017-06-29 17:45:59 +03:00
eab04ddd6b
RELEASE: Set next development version
2017-06-29 07:59:05 +00:00
35bc8b0707
Fix merge conflicts
...
Signed-off-by: Artem Zatsarynnyi <azatsary@redhat.com>
2017-06-26 12:51:05 +03:00
ec72446d24
Merge branch 'master' into spi
2017-06-26 12:50:09 +03:00
ba953206ce
Move GitServiceClient from IDE API to plugin GIT
2017-06-23 17:36:24 +03:00
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
495bfba11d
CHE-3416: Add force push checkbox to Git Push dialog ( #5444 )
2017-06-23 12:29:28 +03:00
ad2460999e
Merge branch 'master' into spi
2017-06-22 08:27:59 +03:00
513aa19ebd
RELEASE: Set next development version
2017-06-21 13:04:16 +00:00
812338b6b5
Merge branch 'master' into spi
2017-06-20 13:57:48 +03:00
5bdd4c882e
CHE-5390: Fix bug when failed to commit renamed files ( #5394 )
2017-06-20 09:39:57 +03:00
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
eb2fa0eeed
RELEASE: Set next development version
2017-06-14 07:13:04 +00:00
1d5648fd6e
Fix building project with maven ( #5354 )
2017-06-12 23:48:28 +03:00
212bbc7808
Merge branch 'master' into spi
2017-06-01 10:45:08 +03:00
Artem Zatsarynnyi