mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-02-06 13:45:42 +00:00
Code Issues Projects Releases Wiki Activity
3,694 Commits 13 Branches 30 Tags
0ea7ce49cc967da61805fafa554f8dfca71c38ec
Commit Graph

3694 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wroot
0ea7ce49cc SPARK-2212 Smack 4.4.0 2020-12-24 12:19:14 +02:00
wroot
66265495b3 Merge pull request #584 from igniterealtime/revert-583-master 
Revert "SPARK-2212 Smack update to 4.4.0"
 2020-12-24 12:16:49 +02:00
wroot
b9f41237b7 Revert "SPARK-2212 Smack update to 4.4.0" 2020-12-24 12:16:36 +02:00
wroot
c5ec4f2c69 Merge pull request #583 from wrooot/master 
SPARK-2212 Smack update to 4.4.0
 2020-12-24 12:15:24 +02:00
wroot
05b94a8acb SPARK-2212 Smack update to 4.4.0 2020-12-24 12:14:46 +02:00
wroot
0a68173800 Merge pull request #582 from k33ptoo/gui 
Icon and Error Fix - FlatLaf Update
SPARK-2214
 2020-12-20 11:34:08 +02:00
Amos Chepchieng
1db730c32d Update FlatLaf to 0.45 2020-12-20 10:57:01 +03:00
Amos Chepchieng
d06bf16eb5 Fix Mainwindow Bounds not restoring - Replace File Transfer Icon in Preference - Attempt fix for null pointer in preference[to be tested] 2020-12-20 10:48:50 +03:00
wroot
c7f3020674 Merge pull request #581 from k33ptoo/gui 
Icon Fix and Null in Preference Saving
SPARK-2214
 2020-12-19 21:47:16 +02:00
Amos Chepchieng
8b95d439f6 Update Roaster Icons and Spacing - Fix appearance null error - Add Right click to Username in Login Panel 2020-12-19 22:25:25 +03:00
wroot
67ebab8f7f Merge pull request #580 from k33ptoo/gui 
GUI Update - FIX Errors
SPARK-2214
 2020-12-19 18:48:50 +02:00
Amos Chepchieng
666549918b Update emoticons and fix missing icons in preferences and chat room 2020-12-19 18:19:15 +03:00
Amos Chepchieng
fa6651c27d UI and Icons Update 2020-12-19 15:34:22 +03:00
Amos Chepchieng
5a6d550b16 Update LF Manager to Allow Single LF Update ThemePanel and remove theme selection, update more icons 2020-12-19 14:22:39 +03:00
Amos Chepchieng
2534c6f3d9 Set FlafLaf as Default LF 2020-12-19 12:09:29 +03:00
Amos Chepchieng
3a0d3199c4 Update Login Panel Buttons and icons for MainWindow 2020-12-18 12:28:49 +03:00
wroot
92d4087c00 Merge pull request #579 from k33ptoo/gui 
GUI Update - SPARK-2214
 2020-12-17 21:40:16 +02:00
Amos Chepchieng
f7660c4ed6 Update Preference UI. Update all visible icons to Material Outline Gray 2020-12-17 15:56:08 +03:00
wroot
fa123eff40 No project lead 2020-12-17 08:52:06 +02:00
Amos Chepchieng
816521d58b Merge pull request #4 from igniterealtime/master 
Update gui branch
 2020-12-04 11:47:30 +03:00
wroot
1e00ddfbfe Merge pull request #578 from R87A/SPARK-2204 
SPARK-2204: Code cleanup
 2020-11-27 13:58:46 +02:00
wroot
12d5f4ffb0 Merge pull request #577 from igniterealtime/fix-meet-plugin-deleolajide-1 
Run the electron download in a thread
SPARK-1828
SPARK-2161
SPARK-2166
 2020-11-27 13:57:08 +02:00
wroot
ebd57e72fb Merge pull request #576 from igniterealtime/fix-fileupload-plugin-dele 
update the base64 decoder
SPARK-2210
 2020-11-27 13:53:06 +02:00
arthur
648679cf88 SPARK-2204: Code cleanup: Remove statements with empty body 2020-11-26 23:31:01 +03:00
arthur
790cf68b6a SPARK-2204: Code cleanup: Remove some deprecated methods usage 2020-11-26 23:15:10 +03:00
arthur
894478ab45 SPARK-2204: Code cleanup: Fix raw using of parametrized classes 2020-11-26 22:54:05 +03:00
Amos Chepchieng
af9d7aea75 Merge branch 'master' of https://github.com/igniterealtime/Spark into igniterealtime-master 
# Conflicts:
#	core/src/main/java/org/jivesoftware/spark/ui/themes/LookAndFeelManager.java
 2020-11-26 09:45:42 +03:00
Dele Olajide
2e81a0b9f4 Run the electron download in a thread 
replace sun.misc.BASE64Decoder with javax.xml.bind.DatatypeConverter
 2020-11-25 21:35:38 +00:00
Dele Olajide
f01e9adf00 update the base64 decoder 2020-11-25 21:25:17 +00:00
wroot
e2e24d2e26 Merge pull request #575 from R87A/SPARK-2204 
SPARK-2204: Code cleanup
 2020-11-23 11:55:55 +02:00
arthur
b0605b3709 SPARK-2204: Code cleanup: Fix raw use of parametrized classes 2020-11-23 01:10:21 +03:00
arthur
1b6f512e00 SPARK-2204: Code cleanup: Minor issues 
- Remove redundant throw clause
- Replace lambda statement with lambda expression
- Fix map key duplication
 2020-11-22 22:55:14 +03:00
wroot
83dede3779 Merge pull request #573 from guusdk/SPARK-2207_fix-name-for-received-file 
SPARK-2207: Display correct name for received file
 2020-11-19 20:31:34 +02:00
wroot
b21f85aabc Merge pull request #572 from guusdk/dependabot-fix-for-xstream 
Replace XStream with more compatible version
SPARK-2206
 2020-11-19 20:30:26 +02:00
Guus der Kinderen
7f800b00a0 SPARK-2207: Display correct name for received file 
When a file is received, it could be renamed (see SPARK-2198). The name that's displayed in the confirmation text needs to be modified accordingly.
 2020-11-19 14:34:52 +01:00
Guus der Kinderen
20df1d00f2 Replace XStream with more compatible version 
Dependabot replaced the regular version of XStream with one that's 'java7' classified. This introduces a ClassNotFound exception.

This causes various XML file processing (such as done during update checks) to fail.

This commit replaces the XStream dependency with the regular variant, which resolves the issue.
 2020-11-19 14:02:46 +01:00
wroot
8a35d80fa8 Merge pull request #571 from R87A/SPARK-2204 
SPARK-2204: Code cleanup
 2020-11-17 22:50:27 +02:00
arthur
d714fb6112 SPARK-2204: Code cleanup: Remove unused imports 2020-11-17 23:34:46 +03:00
arthur
7c6b4e827f SPARK-2204: Code cleanup: Remove unused fields and variables 2020-11-17 23:26:30 +03:00
arthur
0fb85eeb68 SPARK-2204: Code cleanup: Remove unused assignments and redundant catch clauses 2020-11-17 21:59:49 +03:00
arthur
517496e82c SPARK-2204: Code cleanup: Convert wrapper types to primitive when possible 2020-11-17 21:42:17 +03:00
wroot
89b8867e29 Merge pull request #570 from R87A/SPARK-2204 
SPARK-2204: Code cleanup
 2020-11-17 08:03:15 +02:00
arthur
7fa5bc29b9 SPARK-2204: Code cleanup: Remove unused imports 2020-11-17 00:59:13 +03:00
arthur
ff7175800c SPARK-2204: Code cleanup: Delete declaration of exceptions that are never thrown 2020-11-17 00:27:11 +03:00
wroot
98ebf56433 Merge pull request #569 from igniterealtime/dependabot/maven/core/com.thoughtworks.xstream-xstream-1.4.13-java7 
Bump xstream from 1.4.11.1 to 1.4.13-java7 in /core
SPARK-2206
 2020-11-16 23:11:02 +02:00
arthur
bcd8f0c671 SPARK-2204: Code cleanup: Delete some empty unused methods 2020-11-17 00:05:07 +03:00
arthur
fb5a40c69a SPARK-2204: Code cleanup: Add private and final modifiers to methods if possible 2020-11-16 23:37:28 +03:00
dependabot[bot]
012ecea625 Bump xstream from 1.4.11.1 to 1.4.13-java7 in /core 
Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.11.1 to 1.4.13-java7.
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-16 20:26:16 +00:00
arthur
75682fec07 SPARK-2204: Code cleanup: Remove redundant final modifier from private and static methods 2020-11-16 22:48:52 +03:00
arthur
ff255e458e SPARK-2204: Code cleanup: Solve some more issues with AIC/lambdas 2020-11-16 22:41:57 +03:00