mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity
3,522 Commits 13 Branches 30 Tags
f6f919148e7dde4eec8cd2f4bd35a003a3bb8a7d
Commit Graph

3522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
wroot
f6f919148e Merge pull request #545 from akrherz/293 
Denote Spark 2.9.3 Release
v2.9.3 		2020-10-24 14:45:43 +03:00
akrherz
24dce9789b Denote Spark 2.9.3 Release 2020-10-24 06:40:29 -05:00
wroot
e5425962ff Merge pull request #544 from R87A/SPARK-2064 
SPARK-2064: Fix reconnection to group chat rooms.
 2020-10-24 09:08:36 +03:00
R87A
f8a4c0e3f9 SPARK-2064: Fix reconnection to group chat rooms 2020-10-24 02:02:14 +03:00
arthur
f7f29871e4 Move reconnection handling code and remove redundant method 2020-10-23 22:44:41 +03:00
wroot
f3c5be7cf9 Merge pull request #543 from R87A/SPARK-2179 
SPARK-2179: Fix escaping in the incoming buzz notification message.
 2020-10-23 08:07:46 +03:00
arthur
1146b4da90 SPARK-2179: Fix escaping in the incoming buzz notification message. 2020-10-23 00:06:42 +03:00
arthur
45ad39d07c Reformat the BuzzPlugin.java code. 2020-10-22 23:14:45 +03:00
wroot
c0c746f544 Merge pull request #542 from igniterealtime/dependabot/maven/plugins/translator/junit-junit-4.13.1 
Bump junit from 4.12 to 4.13.1 in /plugins/translator
SPARK-2178
 2020-10-13 12:14:38 +03:00
dependabot[bot]
1beadf33c3 Bump junit from 4.12 to 4.13.1 in /plugins/translator 
Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-13 09:10:49 +00:00
wroot
f5795bb0e3 Merge pull request #541 from igniterealtime/dependabot/maven/core/junit-junit-4.13.1 
Bump junit from 4.8.2 to 4.13.1 in /core
SPARK-2178
 2020-10-12 22:49:33 +03:00
dependabot[bot]
6b71674414 Bump junit from 4.8.2 to 4.13.1 in /core 
Bumps [junit](https://github.com/junit-team/junit4) from 4.8.2 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.8.2...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-12 19:39:46 +00:00
wroot
1d6a9fd51c Merge pull request #540 from R87A/SPARK-2177 
SPARK-2177: Fix own presence state during and after a reconnection
 2020-10-12 07:37:37 +03:00
R87A
48fabeee61 SPARK-2177: Add offline status text to the status panel. 2020-10-12 00:35:54 +03:00
R87A
13275a9bb4 SPARK-2177: Disable manual status change during reconnection. 2020-10-12 00:34:51 +03:00
R87A
c40aeb19ef SPARK-2177: Prevent automatic status change to away or offline during reconnection. 2020-10-12 00:32:27 +03:00
wroot
7f5c371f66 Merge pull request #539 from R87A/SPARK-2175 
SPARK-2175: Fix "only the first offline message comes" bug.
 2020-10-11 21:27:06 +03:00
R87A
d2c3ba957b Merge remote-tracking branch 'upstream/master' into SPARK-2175 2020-10-11 20:37:31 +03:00
R87A
9ac4cfd92a Do not handle offline messages in ChatRoomImpl class. 
Offline messages are handling by Workspace class only. So it's prevent offline messages duplicate.
 2020-10-11 20:35:44 +03:00
wroot
918c15adba Merge pull request #538 from R87A/SPARK-2175 
SPARK-2175: Fix offline message handling after a reconnect
 2020-10-11 08:31:06 +03:00
R87A
88845242ba Don't handle offline messages if the corresponding chat room has already been created. 
This eliminates duplicate messages in the transcript window when the user reconnects while the chat room is open.
 2020-10-10 23:42:11 +03:00
R87A
015970e3d7 Fix chat room existence check and chat room creation. 
Existence check should take into account the actual type of the parameter passed to the method.
There it is important to distinguish JID (EntityJid type) and bare JID (EntityBareJid type) since both are used:
bare JIDs - within one-on-one chats;
full JIDs - within private chats of group chat members.
 2020-10-10 21:41:51 +03:00
wroot
9aee1afe24 Merge pull request #537 from R87A/SPARK-2143 
SPARK-2143, SPARK-2174
 2020-10-10 10:46:02 +03:00
R87A
a9f5edf03d SPARK-2174: Import the forgotten class. 2020-10-10 01:52:31 +03:00
R87A
4071638db2 SPARK-2174: Change tab icons of chat rooms to "unavailable" when disconnected. 2020-10-10 01:28:23 +03:00
R87A
3e70662ba7 SPARK-2143: Add reconnection event handling to one-on-one chat room. 
This fixes the issue with roster always on top and disabled controls in chat room dialog after reconnection.
 2020-10-10 01:28:22 +03:00
wroot
d48e222733 Merge pull request #536 from R87A/SPARK-2143 
SPARK-2143: Fix behavior of contact list during reconnection
 2020-10-09 08:04:46 +03:00
R87A
1eec1b5b50 Merge remote-tracking branch 'upstream/master' into SPARK-2143 2020-10-08 22:53:29 +03:00
R87A
9288c9098c Fix behavior of contact list during reconnection. 2020-10-08 21:58:50 +03:00
R87A
0a101c05ee Add an overloaded getChatRoom () method that requires a parameter of type EntityBareJid. 
This fixes the issue with duplicate dialog tabs.
 2020-10-08 18:44:38 +03:00
R87A
31abf18ca4 Refactor: rename getRoomJid() to getBareJid() in ChatRoom class and its derived classes for more clarity. 2020-10-07 18:14:09 +03:00
wroot
a9b1d29d40 Merge pull request #535 from R87A/SPARK-2143 
SPARK-2143: Fix contacts duplication after reconnect
 2020-10-06 07:33:20 +03:00
ostre
0c11a9dd93 Prevent duplication of contacts after reconnect. 
Add a method to recursively update the presence of contact list items (in groups, subgroups and so on).
Replace building of "Initial contact list" with it's updating after recconnect .
 2020-10-05 22:53:19 +03:00
ostre
d499b2b205 Reformat code of ContactList.java 2020-10-05 21:45:51 +03:00
ostre
99a7a1994b Reformat code of ContactGroup.java 2020-10-05 01:48:08 +03:00
wroot
f978ff830c Merge pull request #534 from R87A/SPARK-2172 
SPARK-2172: Disable automatic activation of the new private chat room created when the first message arrived
 2020-10-04 09:46:36 +03:00
arthur
d01de10e41 Disable automatic activation of the new private chat room created when the first message arrived. 2020-10-04 00:52:47 +03:00
wroot
4a1241e575 Merge pull request #533 from R87A/SPARK-2153 
SPARK-2153: Fix private messaging in group chat.
 2020-10-02 07:36:54 +03:00
arthur
faaeb35864 Fix private messaging in group chat. 
To address private rooms in a group chat, you need to use EntityJid instead of EntityBareJid.
[See section 7.5 of XEP-0045: Multi-User Chat](https://xmpp.org/extensions/xep-0045.html#privatemessage)
 2020-10-02 02:21:11 +03:00
wroot
a76cc1bdc1 Merge pull request #532 from R87A/SPARK-2162 
SPARK-2162: Fix history issues for contacts with spaces in usernames
 2020-09-29 07:33:09 +03:00
arthur
fe6526c31f Merge branch 'master' into SPARK-2162 2020-09-29 00:29:07 +03:00
arthur
040beea9a8 Fix history issues for contacts with spaces in usernames 2020-09-29 00:23:09 +03:00
wroot
b3eac15fd2 Merge pull request #531 from R87A/SPARK-2170 
SPARK-2170: Fix converting emote expressions to icons
 2020-09-28 21:59:56 +03:00
arthur
3d890fc3f5 Fix converting emote expressions to icons 2020-09-28 19:07:47 +03:00
wroot
543fbd1439 Merge pull request #530 from R87A/SPARK-2169 
SPARK-2169: Rendering messages in chat area
 2020-09-28 01:12:01 +03:00
arthur
d6d4d0d761 Optimize messages rendering in chat area. 
Make it possible to correctly handle network addresses containing spaces when enclosed in quotes.
 2020-09-28 00:46:30 +03:00
wroot
fe2f606761 Merge pull request #529 from R87A/default-properties 
Add more consistency to default properties usage
Can be part of SPARK-2167
 2020-09-24 09:08:55 +03:00
arthur
7444cd9d43 Clean up grammar and typos, refactor some unobvious property names and remove trailing whitespace. 2020-09-24 00:53:43 +03:00
arthur
d9f297a1cf Replace string literals with constants from Default class. 2020-09-24 00:24:45 +03:00
arthur
273fb77989 Add missed string constants (static final fields) for default properties to Default class. 
- ADD_CONTACT_GROUP_DISABLED
- CHANGE_COLORS_DISABLED
- DISABLE_AVATAR_TAB
- DISABLE_BROADCAST_MENU_ITEM
- DISABLE_EDIT_PROFILE
- DISABLE_EXIT
- DISABLE_FILE_XFER
- DISABLE_MOVE_AND_COPY
- DISABLE_PLUGINS_MENU_ITEM
- DISABLE_PREFERENCES_MENU_ITEM
- DISABLE_PRESENCE_STATUS_CHANGE
- DISABLE_REMOVALS
- DISABLE_RENAMES
- DISABLE_VIEW_NOTES
- DISABLE_VIEW_TASK_LIST
- HELP_FORUM
- HELP_FORUM_DISABLED
- HELP_FORUM_TEXT
- HELP_USER_GUIDE_DISABLED
- PLUGIN_BLACKLIST
- PLUGIN_BLACKLIST_CLASS
- PLUGIN_REPOSITORY
- PLUGIN_REPOSITORY_USE_PROXY
- PROXY_PROTOCOL
 2020-09-24 00:00:05 +03:00