ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,752 Commits 169 Branches 68 Tags
8c14f8d2eb5d4fbca29ae4d893c25bd084afa03e
Commit Graph

1752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l10n daemon script
8c14f8d2eb SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-07-28 02:18:15 +00:00
l10n daemon script
559da66197 GIT_SILENT made messages (after extraction) 2021-07-28 01:43:57 +00:00
l10n daemon script
759496620f SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-07-26 02:17:04 +00:00
l10n daemon script
1f7b1ad29f SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-07-20 02:18:30 +00:00
l10n daemon script
9338567137 GIT_SILENT made messages (after extraction) 2021-07-20 01:42:10 +00:00
l10n daemon script
75d2488dbc GIT_SILENT made messages (after extraction) 2021-07-05 01:42:44 +00:00
l10n daemon script
4bed6a07cd GIT_SILENT made messages (after extraction) 2021-06-28 01:56:28 +00:00
l10n daemon script
cb1c9d1869 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-16 02:24:26 +00:00
l10n daemon script
76b2d4ac49 GIT_SILENT made messages (after extraction) 2021-06-16 01:50:18 +00:00
l10n daemon script
5fc931484e SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-14 02:13:57 +00:00
l10n daemon script
e60ed3b889 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-13 02:20:41 +00:00
l10n daemon script
1314567fde GIT_SILENT made messages (after extraction) 2021-06-13 01:46:53 +00:00
l10n daemon script
047aa793e7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-07 02:15:39 +00:00
l10n daemon script
d60f8f4dfa GIT_SILENT made messages (after extraction) 2021-06-07 01:41:55 +00:00
l10n daemon script
20139c08d8 GIT_SILENT made messages (after extraction) 2021-06-06 01:44:24 +00:00
l10n daemon script
fb59bac165 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-04 02:26:16 +00:00
l10n daemon script
5a65dc4d9a GIT_SILENT made messages (after extraction) 2021-06-04 01:50:31 +00:00
l10n daemon script
03ec17366e SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-03 02:27:05 +00:00
l10n daemon script
15137cd704 GIT_SILENT made messages (after extraction) 2021-06-03 01:51:44 +00:00
l10n daemon script
2aea0015ba GIT_SILENT made messages (after extraction) 2021-06-02 01:41:00 +00:00
l10n daemon script
f6fd099808 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2021-06-01 02:13:55 +00:00
l10n daemon script
04082fc095 GIT_SILENT made messages (after extraction) 2021-06-01 01:40:17 +00:00
Carl Schwan
bc977c3fc6 Update apstream screenshots v1.2 2021-05-31 20:26:07 +02:00
Carl Schwan
c4c283c85a Update versioning to 1.2.0 2021-05-31 17:25:35 +02:00
Carl Schwan
56f49fabf7 Don't mark message as read when the current window is not visible 
Fix #378

(cherry picked from commit 87d1fefae2)
 2021-05-31 17:22:09 +02:00
Carl Schwan
fe407a3421 Mark all message as read when clicking on down button 
Fix #379

(cherry picked from commit 6e5bca4928)
 2021-05-31 17:22:03 +02:00
l10n daemon script
bbe539885e GIT_SILENT made messages (after extraction) 
(cherry picked from commit 4d236a201b)
 2021-05-31 16:58:08 +02:00
Carl Schwan
ff978b9586 Update Appstream 2021-05-31 16:57:50 +02:00
Noah Davis
885b75e35f Move TypingIndicator to the right side 
So that it's less likely to cover message text.
 2021-05-31 16:54:41 +02:00
Srevin Saju
cb81eaf26f feat: show the username and avatar again on date-change 
when the clock hits 00:00 in the user's time zone, but in the
case of a continuous discussion, it is likely that "Today"
date-change marker would obstruct the conversation, and the
username and avatar would be missing.


(cherry picked from commit 3e78bff8a1)
 2021-05-29 22:16:42 +00:00
Carl Schwan
22732b801b Don't steal focus in panel search field 
(cherry picked from commit 807112fb19)
 2021-05-30 00:06:58 +02:00
Carl Schwan
ae3e395b47 Reinitialize completion list after switching room 
(cherry picked from commit e15e10d319)
 2021-05-29 23:55:58 +02:00
Carl Schwan
96c91e2a35 Make sure we only add non empty name or display name in autocompletion 
list

Otherwise this will breaks when replacing names later

(cherry picked from commit c7fd5cc511)
 2021-05-29 23:15:26 +02:00
Carl Schwan
e36204bbd8 Open room when pressing Enter or Return 
Fix #381

(cherry picked from commit b37152ff89)
 2021-05-29 20:16:45 +02:00
Arnav Rawat
1804140ac0 Restore I-Beam cursor on hover 
Should not cause issues with themes


(cherry picked from commit df0ad391ba)
 2021-05-28 13:35:05 +00:00
Carl Schwan
5a28a93ab6 Fix reverse tabbing not working in autocompletion 
Now call autocomplete() also for shift+tab

Fix #377

(cherry picked from commit 3329739d55)
 2021-05-28 14:57:35 +02:00
Carl Schwan
76bd529c3c Fix size of replies in mesage delegate 2021-05-28 14:53:43 +02:00
Carl Schwan
293288a0b6 Fix completion when tabing users 
This was caused by weird bindings. Now just access the userId value
directly.

Fix #324

(cherry picked from commit d9125148fe)
 2021-05-28 14:27:44 +02:00
Carl Schwan
51b6593f96 Better read market handling: Mark room as read when scrolling to the 
bottom

Fix #372

(cherry picked from commit db0f421811)
 2021-05-28 14:07:19 +02:00
Carl Schwan
51e73568c4 Fix date being show too often 
(cherry picked from commit 3d251b9b25)
 2021-05-28 14:07:19 +02:00
Carl Schwan
e461e2098b Don't use SystemTray integration on GNOME and ElementaryOS 
These platforms don't support it so hiding NeoChat in the tray in these
platforms is not a good idea and other a rather poor user experience.

(cherry picked from commit 13888401fa)
 2021-05-28 14:07:19 +02:00
Hannah von Reth
79ceb45fae Fix Windows builds 
(cherry picked from commit 92fcff1dce)
 2021-05-28 14:07:19 +02:00
Nicolas Fella
0c292b34ff Remove minSdk version from AndroidManifest 
(cherry picked from commit 41838d01df)
 2021-05-28 14:07:19 +02:00
Nicolas Fella
db6640ba49 Fix Android ifdef 
(cherry picked from commit af75cebba1)
 2021-05-28 14:07:19 +02:00
Nicolas Fella
3827249f0c remove spurious QFileDialog include 
(cherry picked from commit 1cec672c0a)
 2021-05-28 14:07:19 +02:00
Nicolas Fella
f40a3daef4 remove spurious QMenu include 
(cherry picked from commit bd5f6c9c9e)
 2021-05-28 14:07:19 +02:00
Nicolas Fella
8d2608a230 Use QGuiApplication instead of QApplication where appropriate 
(cherry picked from commit 6e04d343b7)
 2021-05-28 14:07:19 +02:00
Nicolas Fella
3e5628def3 Don't find Widgets on Android 
(cherry picked from commit 454e35433b)
 2021-05-28 12:09:01 +00:00
Tobias Fella
3b3673fdff Fix multiple headers for the same sections 
(cherry picked from commit 4dea02197c)
 2021-05-28 12:08:32 +00:00
Adriaan de Groot
d81e4c417d CMake: various tidying-up 
(cherry picked from commit 294f0c7e1a)
 2021-05-28 12:07:48 +00:00