Skip to content

Commit

Permalink
Merge branch 'devel' of github.com:dbeaver/dbeaver into fixColorForCo…
Browse files Browse the repository at this point in the history
…nnection
  • Loading branch information
Alexey Chibisov committed Jan 9, 2019
2 parents 6f966a8 + 1b3e48a commit 7b32f24
Show file tree
Hide file tree
Showing 1,164 changed files with 55,335 additions and 49,841 deletions.
File renamed without changes.
File renamed without changes.
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE.md
@@ -0,0 +1,33 @@
<!--
Thank you for reporting an issue.
*IMPORTANT* - *before* creating a new issue please look around:
- DBeaver documentation: https://github.com/dbeaver/dbeaver/wiki
and
- open issues in Github tracker: https://github.com/dbeaver/dbeaver/issues
If you cannot find a similar problem, then create a new issue. Short tips about new issues can be found here: https://github.com/dbeaver/dbeaver/wiki/Posting-issues
Please, do not create issue duplicates. If you find the same or similar issue, just add a comment or vote for this feature. It helps us to track the most popular requests and fix them faster.
Please fill in as much of the template as possible.
-->

#### System information:
- Operating system (distribution) and version
- DBeaver version
- Java version
- Additional extensions

#### Connection specification:
- Database name and version
- Driver name
- Do you use security connection (SSH, Proxy, etc)?


#### Describe the problem you're observing:

#### Steps to reproduce, if exist:

#### Include any warning/errors/backtraces from the logs
<!-- Please, find the short guide how to find logs here: https://github.com/dbeaver/dbeaver/wiki/Log-files-->
File renamed without changes.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -8,6 +8,7 @@ tmp/
*.bak
*.swp
*~.nib
.settings
local.properties
.loadpath

Expand Down
9 changes: 0 additions & 9 deletions ISSUE_TEMPLATE.md

This file was deleted.

45 changes: 0 additions & 45 deletions README-pt.md

This file was deleted.

5 changes: 2 additions & 3 deletions README.md
Expand Up @@ -13,7 +13,7 @@ Supports any database which has JDBC driver (which basically means - ANY databas

* Has a lot of <a href="https://github.com/dbeaver/dbeaver/wiki">features</a> including metadata editor, SQL editor, rich data editor, ERD, data export/import/migration, SQL execution plans, etc.
* Based on <a href="http://www.eclipse.org/">Eclipse</a> platform.
* Uses plugins architecture and provides additional functionality for the following databases: MySQL/MariaDB, PostgreSQL, Oracle, DB2 LUW, Exasol, SQL Server, Sybase/SAP ASE, SQLite, Firebird, H2, HSQLDB, Derby, Teradata, Vertica, Netezza, Informix, etc.
* Uses plugins architecture and provides additional functionality for the following databases: MySQL/MariaDB, PostgreSQL, Greenplum, Oracle, DB2 LUW, Exasol, SQL Server, Sybase/SAP ASE, SQLite, Firebird, H2, HSQLDB, Derby, Teradata, Vertica, Netezza, Informix, etc.

<a href="https://dbeaver.io/product/dbeaver-ss-mock.png"><img src="https://dbeaver.io/product/dbeaver-ss-mock.png" width="400"/></a>
<a href="https://dbeaver.io/product/dbeaver-ss-erd.png"><img src="https://dbeaver.io/product/dbeaver-ss-erd.png" width="400"/></a>
Expand Down Expand Up @@ -64,11 +64,10 @@ Binaries are in `product/standalone/target/products`

## Contribution: help the Beaver!

Hooray, we have reached 5k of stars on GitHub and continue to grow!
Hooray, we have reached 7k of stars on GitHub and continue to grow!
That's really cool, we are glad that you like DBeaver.

- We are actively looking for new source code contributors. We have added labels “Good first issue” and “Help wanted” to some tickets. If you want to be a part of our development team just be brave and take a ticket.
- We decided to try Bounty: https://www.bountysource.com/issues/62789348-tip-of-the-day-popup. We are not sure that it works. But if yes we will be glad to place more tickets to this platform.
- You can buy <a href="https://dbeaver.com/download">DBeaver EE</a> version. It includes all features of CE + NoSQL databases support + EE extensions + official online support. Also, licensed users have priorities in bug fixes and new features development.
Those who read up to this point - you can use community discounts (check our <a href="https://github.com/dbeaver/dbeaver/wiki/Enterprise-Edition">WIKI</a>).

Expand Down
4 changes: 2 additions & 2 deletions bundles/org.jkiss.utils/META-INF/MANIFEST.MF
Expand Up @@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.utils
Bundle-Version: 2.1.83.qualifier
Bundle-Release-Date: 20190107
Bundle-Version: 2.1.84.qualifier
Bundle-Release-Date: 20190121
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.jkiss.code,
org.jkiss.utils,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.jkiss.utils/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.utils</artifactId>
<version>2.1.83-SNAPSHOT</version>
<version>2.1.84-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
6 changes: 6 additions & 0 deletions bundles/org.jkiss.utils/src/org/jkiss/utils/CommonUtils.java
Expand Up @@ -563,4 +563,10 @@ public static boolean startsWithIgnoreCase(@NotNull String str, @NotNull String
return str.regionMatches(true, 0, startPart, 0, startPart.length());
}

public static String niceFormatFloat(float val) {
if (val == (int) val)
return String.valueOf((int)val);
else
return String.valueOf(val);
}
}
4 changes: 2 additions & 2 deletions bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
Expand Up @@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.wmi
Bundle-Version: 2.0.93.qualifier
Bundle-Release-Date: 20190107
Bundle-Version: 2.0.94.qualifier
Bundle-Release-Date: 20190121
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.jkiss.wmi.service
2 changes: 1 addition & 1 deletion bundles/org.jkiss.wmi/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.wmi</artifactId>
<version>2.0.93-SNAPSHOT</version>
<version>2.0.94-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ce.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ce.feature"
label="%featureName"
version="5.3.2.qualifier"
version="5.3.3.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.core.application">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ce.feature/pom.xml
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ce.feature</artifactId>
<version>5.3.2-SNAPSHOT</version>
<version>5.3.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<build>
Expand Down
4 changes: 3 additions & 1 deletion features/org.jkiss.dbeaver.core.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.core.feature"
label="%featureName"
version="5.3.2.qualifier"
version="5.3.3.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.core">

Expand Down Expand Up @@ -52,7 +52,9 @@
<plugin id="org.jkiss.dbeaver.ui.editors.data" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.entity" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.hex" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.image" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.sql" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.editors.xml" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ui.navigator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ext.erd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
<plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.core.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.core.feature</artifactId>
<version>5.3.2-SNAPSHOT</version>
<version>5.3.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.debug.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.debug.feature"
label="%featureName"
version="5.3.2.qualifier"
version="5.3.3.qualifier"
provider-name="%providerName">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.debug.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.debug.feature</artifactId>
<version>5.3.2-SNAPSHOT</version>
<version>5.3.3-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.db2.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.db2.feature"
label="%featureName"
version="2.1.85.qualifier"
version="2.1.86.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.db2">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.db2.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.db2.feature</artifactId>
<version>2.1.85-SNAPSHOT</version>
<version>2.1.86-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.exasol.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.exasol.feature"
label="%featureName"
version="1.0.58.qualifier"
version="1.0.59.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.exasol">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.exasol.feature/pom.xml
Expand Up @@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.exasol.feature</artifactId>
<version>1.0.58-SNAPSHOT</version>
<version>1.0.59-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.generic.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.generic.feature"
label="%featureName"
version="2.1.86.qualifier"
version="2.1.87.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.generic">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.generic.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.generic.feature</artifactId>
<version>2.1.86-SNAPSHOT</version>
<version>2.1.87-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
@@ -1,7 +1,7 @@
featureName=DBeaver MySQL Extension
providerName=JKISS
providerName=DBeaver Corp
description=DBeaver MySQL Extension
copyright=(c) JKISS, 2010-2017
copyright=(c) JKISS, 2010-2018
licenseURL=../../docs/licenses/dbeaver_license.txt
license=\
Apache License\n\
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.mysql.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.mysql.feature"
label="%featureName"
version="2.1.85.qualifier"
version="2.1.86.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.mysql">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.mysql.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.mysql.feature</artifactId>
<version>2.1.85-SNAPSHOT</version>
<version>2.1.86-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.office.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.office.feature"
label="%featureName"
version="1.1.37.qualifier"
version="1.1.38.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.data.office">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.office.feature/pom.xml
Expand Up @@ -9,7 +9,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.office.feature</artifactId>
<version>1.1.37-SNAPSHOT</version>
<version>1.1.38-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<groupId>org.jkiss.dbeaver</groupId>
</project>
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.oracle.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.oracle.feature"
label="%featureName"
version="2.1.85.qualifier"
version="2.1.86.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.oracle">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.oracle.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.oracle.feature</artifactId>
<version>2.1.85-SNAPSHOT</version>
<version>2.1.86-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
@@ -1,7 +1,7 @@
featureName=DBeaver SVG Extension
providerName=JKISS
providerName=DBeaver Corp
description=DBeaver SVG Extension
copyright=(c) JKISS, 2017
copyright=(c) DBeaver Corp, 2018
licenseURL=../../docs/licenses/dbeaver_license.txt
license=\
Apache License\n\
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.ui.svg.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.ui.svg.feature"
label="%featureName"
version="1.0.36.qualifier"
version="1.0.37.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.ui.svg">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.ui.svg.feature/pom.xml
Expand Up @@ -9,7 +9,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.ui.svg.feature</artifactId>
<version>1.0.36-SNAPSHOT</version>
<version>1.0.37-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<groupId>org.jkiss.dbeaver</groupId>
</project>
4 changes: 2 additions & 2 deletions features/org.jkiss.dbeaver.ext.wmi.feature/feature.properties
@@ -1,7 +1,7 @@
featureName=DBeaver WMI Extension
providerName=JKISS
providerName=DBeaver Corp
description=DBeaver WMI Extension
copyright=(c) JKISS, 2016-2017
copyright=(c) DBeaver Corp, 2016-2018
licenseURL=../../docs/licenses/dbeaver_license.txt
license=\
Apache License\n\
Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.wmi.feature/feature.xml
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.wmi.feature"
label="%featureName"
version="2.0.102.qualifier"
version="2.0.103.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.wmi">

Expand Down
2 changes: 1 addition & 1 deletion features/org.jkiss.dbeaver.ext.wmi.feature/pom.xml
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.wmi.feature</artifactId>
<version>2.0.102-SNAPSHOT</version>
<version>2.0.103-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>

0 comments on commit 7b32f24

Please sign in to comment.