Commit Graph

741 Commits

Author SHA1 Message Date
Dorving
1dd07046c0 Merge remote-tracking branch 'origin/master' 2022-10-24 18:01:44 +02:00
Dorving
5277b300f4 Merge remote-tracking branch 'fork/master'
# Conflicts:
#	G-Earth/build.gradle.kts
#	G-Earth/src/main/java/gearth/services/extension_handler/extensions/implementations/network/NetworkExtensionsProducer.java
2022-10-24 18:00:26 +02:00
Dorving
fe16f85d82 Cleanups, added kotlin support, started with auto login support 2022-10-24 17:55:58 +02:00
sirjonasxx
0cdb5e6465
Merge pull request #136 from dorving/extension-store-fix
Fix for extension store on Mac
2022-08-06 23:42:03 +02:00
dorving
5fbf255704 Added jitpack.yml to specify java 17 2022-07-15 00:01:28 +02:00
dorving
35ac6158cb Changed target version to java 17 2022-07-14 23:56:44 +02:00
dorving
43f1272012 Added gradle 2022-07-14 23:47:54 +02:00
dorving
623a6488e8 Fixed typo in OSValidator.getOSFull "Mac" -> "Max"
- This fixes extension store on MacOS
2022-07-10 01:27:24 +02:00
dorving
714a1b5e86
Merge branch 'sirjonasxx:master' into master 2022-07-10 01:24:02 +02:00
sirjonasxx
630c43b07a
Merge pull request #130 from WiredSpast/master
Bugfix: Set G-Earth as owner of all alerts
2022-07-07 23:14:47 +02:00
sirjonasxx
7b515590ce
Merge pull request #134 from sirjonasxx/dependabot/maven/G-Earth/org.eclipse.jetty-jetty-http-9.4.48.v20220622
Bump jetty-http from 9.4.43.v20210629 to 9.4.48.v20220622 in /G-Earth
2022-07-07 23:14:18 +02:00
dependabot[bot]
ea89c6b45c
Bump jetty-http from 9.4.43.v20210629 to 9.4.48.v20220622 in /G-Earth
Bumps [jetty-http](https://github.com/eclipse/jetty.project) from 9.4.43.v20210629 to 9.4.48.v20220622.
- [Release notes](https://github.com/eclipse/jetty.project/releases)
- [Commits](https://github.com/eclipse/jetty.project/compare/jetty-9.4.43.v20210629...jetty-9.4.48.v20220622)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty:jetty-http
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-07 21:01:00 +00:00
WiredSpast
5a713414a3 Set G-Earth as owner of all alerts 2022-05-21 13:51:50 +02:00
sirjonasxx
e5626ad587
Merge pull request #126 from dorving/net-extension-server-checks
Added boundary for size of packets read by extension server
2022-05-04 07:17:21 +02:00
Dorving
ea5227cd3a Renamed g_mem_mac to G-Mem 2022-05-03 07:14:17 +02:00
Dorving
20cf678d4b Added newline for error message when packet length exceeds max 2022-05-03 06:57:36 +02:00
Dorving
0547d84d81 Removed redundant availability check for incoming extension connection 2022-05-03 06:56:37 +02:00
Dorving
d6a0eaa788 Upgraded jetty version that patches vulnerability 2022-05-03 06:37:14 +02:00
Dorving
31e3d571d7 Merge remote-tracking branch 'origin/master' 2022-05-03 06:33:51 +02:00
sirjonasxx
a98bab39cc
Merge pull request #119 from Laande/master
snyk vuln
2022-05-03 06:31:16 +02:00
sirjonasxx
5ac1593dae
Merge pull request #127 from dorving/client-handshake-checks
Wrapped RC4 table checks in try catch block (#106)
2022-05-03 06:28:57 +02:00
Dorving
4e2415f671 Upgraded to java 17, switched to gradle, added new G-Mem for mac
- uses badass runtime plugin to create platform-specific images (https://badass-runtime-plugin.beryx.org/releases/latest/).
- uses kotlin based gradle build script.
- uses openjfx's plugin to obtain the required javafx modules
- added G-Wasm jar to repo for now, maven link is broken for me
- added g_mem_mac executable (https://github.com/dorving/g_mem_mac)
- added MacOS readable icon (.icns format)
- removed unused and broken imports from PortRequester.java and GEarth.java
- added GEarthLauncher.java (see docs for reason)
2022-05-03 06:27:46 +02:00
sirjonasxx
765dbd6f01 Merge branch 'master' of https://github.com/sirjonasxx/G-Earth 2022-05-03 06:13:48 +02:00
sirjonasxx
bd31153149 remove option to not use new structures 2022-05-03 06:12:33 +02:00
Dorving
4bfa5d6b84 Removed Rc4Obtainer.DEBUG condition from printing stack traces 2022-04-11 05:06:00 +02:00
Dorving
35748038a9 Increased size of NetworkExtensionsProducer.MAX_PACKET_BODY_SIZE (#125) 2022-04-11 04:55:04 +02:00
Dorving
82ae7dc7a9 Validate headerId first in NetworkExtensionsProducer (#125) 2022-04-11 04:42:12 +02:00
Dorving
c2c0e2b0cb Wrapped RC4 table checks in try catch block (#106)
- also cleaned up code a bit
2022-04-11 04:17:45 +02:00
Dorving
99b349e9b0 Slight clarification in variable naming and documentation 2022-04-11 03:19:31 +02:00
Dorving
0951dba4c4 Added boundary for size of packets read by extension server
- Also added documentation and refactored the code
2022-04-11 03:16:18 +02:00
sirjonasxx
8cd429cc23
Merge pull request #124 from WiredSpast/patch-1
Fix for certificatePath which includes spaces
2022-04-10 14:12:00 +02:00
WiredSpast
3d6e7d5b32
Fix for certificatePath which includes spaces 2022-04-10 13:57:20 +02:00
sirjonasxx
b1f86aa80b
fix air for lilith's linux launcher 2022-04-08 07:30:55 +02:00
Lande
d3ff2b624f
Merge pull request #1 from Laande/snyk-fix-2dcdc35854cbcbff45ec2ddb1aeed8cf
[Snyk] Security upgrade org.eclipse.jetty.websocket:javax-websocket-server-impl from 9.4.41.v20210516 to 9.4.43.v20210629
2022-02-18 23:29:53 +01:00
snyk-bot
e2f772df0d
fix: G-Earth/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1319666
2022-02-18 22:29:11 +00:00
sirjonasxx
f5217e636f
Merge pull request #117 from ruangustavo/master
Fix black border due to display theme switcher
2022-02-17 22:07:56 +01:00
Ruan Gustavo
067a214445 Fix black border due to display picker theme minimum width 2022-02-17 17:21:04 -03:00
Ruan Gustavo
5e30d24322 Fix black border due to display theme picker minimum width 2022-02-17 14:46:34 -03:00
sirjonasxx
a03c898328 listview bug light theme 2022-02-17 01:42:38 +01:00
sirjonasxx
a2e481ba4d remove {l} 2022-02-17 01:35:43 +01:00
sirjonasxx
df495f2b3f version 1.5.2 2022-02-17 01:04:54 +01:00
sirjonasxx
cc36cf39cc Merge branch 'development' 2022-02-17 01:03:41 +01:00
sirjonasxx
ee923df8a3 final touches theme 2022-02-17 01:03:17 +01:00
sirjonasxx
f5e99924de auto background 2022-02-16 17:32:54 +01:00
sirjonasxx
64dea6fc0f renames 2022-02-16 04:49:35 +01:00
sirjonasxx
33afab4353 more 2022-02-16 04:47:54 +01:00
sirjonasxx
3d7b1fa7dd round border fix 2022-02-16 04:21:26 +01:00
sirjonasxx
77dfd67b3d ThemedExtensionFormCreator 2022-02-16 04:13:07 +01:00
sirjonasxx
48aa631f1d add skip method 2022-02-16 02:51:01 +01:00
sirjonasxx
1b6e91deb1 add skip method 2022-02-16 02:48:20 +01:00