f1e09ced81
Fix activity checker fails
...
Signed-off-by: Anna Shumilova <ashumilo@redhat.com>
2017-10-02 15:26:38 +03:00
81bce959ce
Merge branch 'che-multiuser' into spi
2017-10-02 14:59:55 +03:00
1f639c0557
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-10-02 09:03:47 +03:00
34ba429d58
Implemented getVersion in OpenShiftConnector ( #6222 )
...
* Implemented getVersion in OpenShiftConnector
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-10-02 07:42:42 +02:00
b9767355b7
Merge with master
2017-09-30 13:57:06 +03:00
6db2424a7a
Removed unneeded code from top method
2017-09-29 17:11:54 +02:00
e0f60000d5
Implement top method in OpenShiftConnector
...
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-09-29 17:11:54 +02:00
7503f50e77
Added getSystemInfo into OpenShiftConnector
...
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
2017-09-29 17:09:50 +02:00
430c1a32d7
Fix the issue when no exposed ports are defined in the docker image
...
Change-Id: I76fa7b6aaff552043e1e8cf2934527f491631b2a
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-29 11:16:20 +02:00
d207193377
CHE-6463 Exclude docker infrastructure from multiuser packaging
2017-09-28 13:06:50 +03:00
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
772b1bbc71
Fix build after updating to EclipseLink 2.7.0 ( https://github.com/eclipse/che-dependencies/pull/58 )
2017-09-28 12:17:48 +03:00
28c5193252
Merge commit 'da636d181c41a5602dbd5ced28474ad985df49c0' into spi
2017-09-28 12:15:59 +03:00
32ae31765e
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-09-28 08:35:45 +03:00
da636d181c
Avoid NPE by checking if map are null and not only empty
...
https://github.com/redhat-developer/rh-che/issues/338
Change-Id: Ic760eef59be7fcaf47cb94ad83652892897d4d31
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-28 07:01:49 +02:00
2512d7b9bf
Revert Git revert action ( #6470 )
2017-09-27 15:21:46 +00:00
fb48c3d5d6
Merge with master. Fixing problem after merge Update EclipseLink to v2.7.0
2017-09-27 16:12:42 +03:00
2fe4505eab
Small fixes for master ( #6462 )
...
Small fixes for master.
* Removed dependency on server side in gwt code (debugger)
* Fixed ThreadDumpTest
* Formatted java class
2017-09-27 11:26:56 +00:00
01ab2b2587
Merge remote-tracking branch 'origin/master' into che-multiuser
...
# Conflicts:
# dashboard/src/app/index.module.ts
# dashboard/src/app/workspaces/workspace-details/workspace-details.service.ts
# dashboard/src/components/typings/che.d.ts
2017-09-27 13:36:26 +03:00
dac5b6610f
CHE-6024: Revert commit action ( #6386 )
...
* CHE-6024: Revert commit action
2017-09-27 08:26:25 +00:00
a99e4d13c6
Merge branch 'master' into spi
2017-09-27 09:35:39 +03:00
89ba171893
Merge branch 'master' into spi
2017-09-26 10:24:43 +03:00
8a42d4f141
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-09-26 09:53:53 +03:00
c5fad59c6d
Reused antlr java 5 grammar from che-lib ( #6410 )
2017-09-26 09:41:17 +03:00
f1d2a2c647
Fix logging when an exception occurs on operations with workspaces' ssh keys ( #6419 )
2017-09-25 16:47:31 +03:00
854f030260
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-09-25 15:50:55 +03:00
7c7e596fb7
Add possibility to disable DockerInstanceStopDetector ( #6415 )
...
It is needed for OpenShift infra where getting events
is not supported due to security limits.
To disable containers stop detector variable
CHE_DOCKER_ENABLE__CONTAINER__STOP__DETECTOR=false should be
defined.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-09-25 15:47:02 +03:00
2b10bbf10c
Merge remote-tracking branch 'origin' into che-multiuser
...
# Conflicts:
# dashboard/src/app/index.module.ts
2017-09-25 15:18:19 +03:00
229aedc87d
Merge branch 'master' into spi
2017-09-25 11:55:17 +03:00
4058f61ec1
CHE-6397: set missing environment context on machine start
...
Set environment context for a thread where logs of a machine are read.
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
Signed-off-by: Oleksandr Garagatyi <ogaragat@redhat.com>
2017-09-25 10:05:45 +03:00
a013d28a95
Fix build with invalid import
...
Change-Id: I156d1db78f2e0500b9a184afd23ed4d46f0d5e10
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-22 17:54:47 +02:00
9e3c1dff1c
CHE-5729: fix the preview page of refactoring ( #6385 )
2017-09-22 17:22:04 +03:00
af4d967aa0
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-09-22 11:14:36 +03:00
de347bedae
CHE#6041 Move Organization&Resource APIs ( #6384 )
...
* Use different Sql schemas for che and che-multiuser
* Move Resource API
* Move Organization API
* Move personal account
* Add Che Multiuser integration tests
* Fix integration tests
* Set 5.19.0-SNAPSHOT version for moved modules
* Fix multiuser packaging
2017-09-22 09:31:23 +03:00
39d3d3e140
Merge branch 'master' into spi
2017-09-22 09:01:53 +03:00
514913d5d1
CHE-5729: adapt PHP test runner according new API ( #6201 )
2017-09-21 10:32:10 +03:00
685def4d29
Merge branch 'master' into spi
2017-09-21 09:24:39 +03:00
546ba4e4ea
Merge with master
2017-09-20 11:34:18 +03:00
8e03d56bfb
RELEASE: Set next development version ( #6345 )
2017-09-19 14:52:53 +03:00
d60d4da5a9
Workaround for fixing freeze browser for big project ( #6341 )
...
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-09-19 13:06:23 +03:00
c0283c1640
Merge branch 'master' into spi
2017-09-19 09:51:13 +03:00
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
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
cfc0fa03b7
Merge branch 'master' into spi
2017-09-18 11:17:32 +03:00
e7006e5ae4
Merge with master
2017-09-18 08:46:28 +03:00
e3e382103f
Fix build warnings
2017-09-15 17:03:34 +03:00
38b5c83d23
Add test dependensies
2017-09-15 16:12:50 +03:00
7beb2467ba
CHE-5925: Add hotkeys to the most usable git actions ( #6247 )
...
CHE-5925: Add hotkeys to the most usable git actions
2017-09-15 15:28:02 +03:00
acce13f30c
Merge branch 'master' into spi
2017-09-15 11:21:33 +03:00
d2bfa4f7f4
Move permissions and authorization into separate module;
2017-09-14 17:03:43 +03:00
a07ffc3c70
Merge branch 'master' into spi
2017-09-14 15:48:40 +03:00
d847b4149f
CHE-5810: Improve client encoding for file or folder path to support special symbols ( #6166 )
2017-09-14 15:47:32 +03:00
0bd960605e
openshift.io-798 Checking only first 20 chars of tag in 'getImageStreamTagFromRepo' for long tags
...
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
2017-09-13 14:06:18 +02:00
6b76cadf84
Thread dump for java debugger ( #5320 )
...
CHE-3708: Thread dump for java debugger
2017-09-13 13:35:28 +03:00
ed73a101dc
CHE-5338. Clean up app state preference when workspace is removed
...
Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
2017-09-13 11:16:42 +03: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
c7ed1d8336
Add ability to switch between files in Git Diff widget ( #5965 )
...
* Performs small refactoring of git-compare-related functionality.
* Adds ability to switch to the next/previous file in git compare widget.
* Adds hotkeys for next and previous diff
* Adds Save Changes button for git compare widget.
* Fixes compare with deleted file bug.
* Moves Git Diff widget from iframe to IDE.
2017-09-12 14:13:52 +03:00
d635b25831
Adds permissions into Che multiuser. ( #6133 )
2017-09-12 11:43:04 +03:00
9866284b67
Merge branch 'master' into spi
2017-09-12 11:36:21 +03:00
bc98043240
Merge with master
2017-09-12 09:45:20 +03:00
1ec0f6aaf4
CHE-6081 Make workspace files cleaning as infrastructure specific feature ( #6193 )
...
Add removing of OpenShift project when workspace is removed
2017-09-11 18:00:03 +03:00
7e29f7b526
Merge branch 'master' into spi
2017-09-11 12:23:40 +03:00
e56989159a
lazily init the local repository.
...
Change-Id: I7cf8aff6b655f4040426bf9152fe98c6f0d34ef4
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-11 11:03:41 +02:00
688c73f079
GWT dependency should not be there. It's running on server side.
...
Change-Id: Ic67763b18e5edcf99ea562e1a061ea8e2a03ddc8
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
2017-09-11 10:52:37 +02:00
0cb30a922e
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-09-11 08:36:03 +03:00
5231059555
CHE-5721: Importing java formatter for the project or workspace ( #6077 )
2017-09-08 16:19:31 +03:00
3b78c21bbf
Merge branch 'master' into spi
2017-09-07 12:25:37 +03:00
eca2291b1b
Fix warning in pom.xml ( #6158 )
...
Signed-off-by: Vitalii Parfonov <vparfonov@redhat.com>
2017-09-07 09:17:17 +03:00
7faecbadc9
5485 apply workspace edit ( #5955 )
...
* Add ApplyWorkspaceEditAction
Signed-off-by: Thomas Mäder <tmader@redhat.com>
* Fix copyright statement
Signed-off-by: Thomas Mäder <tmader@redhat.com>
2017-09-07 08:49:36 +03:00
261de9f5b8
Format code
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:44:35 +02:00
f342bafac1
Fix log calls with toString()
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:32:09 +02:00
d06a8f5bb8
Add missing license copyright
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:32:07 +02:00
af9a04ab0b
Add Javadoc
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:32:04 +02:00
84fc282b00
Make it a singleton
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:32:02 +02:00
a196b585b7
Format code
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:31:59 +02:00
34244dd388
Add filtering rules for health checks and icons ...
...
... and factorize some code
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:31:57 +02:00
8d17bd8cf6
Fix invalid property names
...
Signed-off-by: David Festal <dfestal@redhat.com>
2017-09-06 19:31:55 +02:00
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
c80b423fef
CHE-5886: Run XML test suite for TestNG ( #6145 )
2017-09-06 11:18:13 +03:00
1aa217b9a7
Code action call does not have dignostics ( #6113 )
...
Signed-off-by: Thomas Mäder <tmader@redhat.com>
2017-09-06 09:41:03 +02:00
d3f58dd1d7
Merge branch 'master' into che-multiuser
2017-09-06 10:03:18 +03:00
53de6d1daa
Use ws-agent's Java in testing plugin ( #6132 )
...
* Use ws-agent's Java in tests
* Use ws-agent's Java in tests
2017-09-06 08:23:22 +03:00
27ff919209
Remove unsupported ant extension ( #6140 )
2017-09-05 17:18:48 +03:00
2e798d6fce
Add implementation for 'Show message request' LS feature ( #5860 )
...
* #1794 implement 'ShowMessageRequest'
2017-09-04 16:12:25 +02:00
f01bde39ca
Fix code formatting
2017-09-04 17:09:42 +03:00
69247b42b8
Add profile service endpoint to keycloak info service
2017-09-04 15:11:09 +03:00
9c8734cd3b
Add profile service endpoint to keycloak info service
2017-09-04 14:54:24 +03:00
1f27537c2b
Some JSON RPC requests are not processed by RequestHandlerManage ( #5991 )
2017-09-04 12:26:45 +03:00
04be689c69
Merge branch 'master' into spi
2017-09-04 11:51:57 +03:00
7d3cf94a30
Merge with master
2017-08-23 14:08:07 +03:00
4a3d9b80de
Add missed dependency
2017-08-23 12:15:25 +03:00
927d54c8f4
Add Composer dyna-module
2017-08-23 11:35:03 +03:00
2850a74a11
RELEASE: Set next development version ( #6067 )
2017-08-23 11:11:34 +03:00
2cab5980ef
Merge with master
2017-08-23 10:35:31 +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
1fb3a1d1bc
Merge branch 'master' into spi
2017-08-21 12:07:00 +03:00
058ec12a41
Merge remote-tracking branch 'origin/master' into che-multiuser
2017-08-21 09:31:00 +03:00
93eaf18997
#5750 fix cursor position after completion proposal inserted ( #6020 )
...
* #5750 fix cursor position after completion proposal inserted
2017-08-19 16:03:12 +03:00
Anna Shumilova