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

1464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
l10n daemon script
4b0cefe7ff 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-05-16 02:25:27 +00:00
l10n daemon script
60e9587aa7 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-03-30 02:15:43 +00:00
l10n daemon script
ae2c517940 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-03-27 09:18:53 +01:00
l10n daemon script
ac38b42403 GIT_SILENT made messages (after extraction) 2021-03-27 08:04:31 +01:00
l10n daemon script
06803548fa 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-03-21 09:12:18 +01:00
l10n daemon script
70dba75d31 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-03-17 12:07:25 +01:00
l10n daemon script
aad95d2bc3 GIT_SILENT made messages (after extraction) 2021-03-17 10:41:10 +01:00
l10n daemon script
d57b410c04 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-03-14 10:23:37 +01:00
Carl Schwan
e24a1b4541 Fix "Choose local file" does nothing 
An import was wrong.

Fix #286


(cherry picked from commit 34311e4d48)
 2021-03-05 00:34:52 +00:00
Carl Schwan
008ef38226 Fix icon sizes on mobile 
(cherry picked from commit a9678b6fc3)
 2021-03-05 00:34:36 +00:00
Albert Astals Cid
cae3c4ca60 i18nc -> i18n 
there's no context so the c is wrong
 2021-03-05 00:14:30 +01:00
l10n daemon script
71c4d7d651 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-03-03 11:43:25 +01:00
l10n daemon script
d8edac696d GIT_SILENT made messages (after extraction) 2021-03-03 09:47:29 +01:00
l10n daemon script
a5570838ca 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-03-01 09:49:45 +01:00
l10n daemon script
2d75c34b17 GIT_SILENT made messages (after extraction) 2021-02-24 08:43:58 +01:00
Carl Schwan
cc372f67eb Update version to 1.1.1 v1.1.1 2021-02-23 14:39:22 +01:00
Tobias Fella
aaa042a2f0 Fix include 
(cherry picked from commit 37a681596b)
 2021-02-23 11:36:29 +00:00
Tobias Fella
6fdc8a9298 Fix another include 
(cherry picked from commit b67a35bfe3)
 2021-02-23 11:36:09 +00:00
Carl Schwan
1526c81a2f Add 1.1 release information v1.1.0 2021-02-22 21:01:57 +01:00
Carl Schwan
03d13bb543 Bump version 2021-02-22 20:58:10 +01:00
Carl Schwan
d8916aa133 Update AppStream 2021-02-22 20:56:55 +01:00
Carl Schwan
bb3b3bc088 Input field fixes 
* Message with multiple mentions are not broken in IRC. Fix #267
* Editing a message won't remove mentions anymore
 2021-02-22 19:09:56 +00:00
l10n daemon script
1234132a05 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-02-22 10:25:39 +01:00
l10n daemon script
52e5ec50c6 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-02-20 12:01:33 +01:00
l10n daemon script
16f661f6ae 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-02-19 17:00:04 +01:00
l10n daemon script
df1835de2d 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-02-18 11:51:49 +01:00
l10n daemon script
1432ba2368 GIT_SILENT made messages (after extraction) 2021-02-18 10:23:48 +01:00
Tobias Fella
edcbc9ab01 Port away from QQC1 
The only usage was a dialog that was never called


(cherry picked from commit f71bbe20dc)
 2021-02-17 21:34:30 +00:00
Carl Schwan
1afbd42523 Revert "Revert "Improve sending message with mentions"" 
This reverts commit 0f043e36c4.
 2021-02-17 21:58:57 +01:00
Tobias Fella
7ff54f62f3 Backport stickerevents 2021-02-17 21:00:11 +00:00
Tobias Fella
cc2b183fc5 Revert "Switch to newDisplayName() and newAvatarUrl()" 
This reverts commit a1b66f3aa6.
 2021-02-17 21:00:11 +00:00
Tobias Fella
2558e1f6b5 DOn't try to compile without keywords 2021-02-17 21:00:11 +00:00
Tobias Fella
a7e61f0e20 Revert "Fix build failure" 
This reverts commit ab8dabc280.
 2021-02-17 21:00:11 +00:00
Tobias Fella
345eb0c229 Revert "Bump dependencies to libQuotient 0.7 (master)" 
This reverts commit d646962ea1.
 2021-02-17 21:00:11 +00:00
Tobias Fella
91ef8806f2 Show contextdrawer only in RoomPage 2021-02-17 20:16:38 +00:00
Tobias Fella
e546c12b45 Don't underline links 2021-02-17 20:16:19 +00:00
Carl Schwan
43f81fcead Use version less Qt target 2021-02-15 19:46:07 +01:00
l10n daemon script
bfbca5b1c2 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-02-15 07:09:27 +01:00
Anjani Kumar
babbc039ab Focus inputField after cancelling edit/reply 2021-02-14 15:32:02 +05:30
Yuri Chornoivan
d3b8c9b98e Fix minor typo: sytem -> system 2021-02-14 08:53:48 +02:00
Tobias Fella
0ca2eb4008 Add option to disable system tray integration 
Implements #59
 2021-02-13 19:18:28 +00:00
Anjani Kumar
3979cf59ce Clears inputField when edit is cancelled. 2021-02-13 19:17:06 +00:00
Tobias Fella
f4ab281789 Revert "Fix broken i18ncp call" 
This reverts commit 7d100b2a0f
 2021-02-12 15:21:20 +00:00
Tobias Fella
7d100b2a0f Fix broken i18ncp call 2021-02-11 23:18:14 +01:00
Tobias Fella
9432e28685 Fix opening a second invitation 2021-02-10 23:13:16 +01:00
Arnav Rawat
b84375749b Close menu after selecting a reaction 
Fixes #256
 2021-02-10 10:33:35 +00:00
l10n daemon script
07dffa7e73 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-02-10 08:16:48 +01:00
l10n daemon script
7816d220ea GIT_SILENT made messages (after extraction) 2021-02-10 03:39:08 +01:00
Tobias Fella
28dfc4b6d7 Update gitignore 2021-02-08 18:09:01 +01:00
Tobias Fella
d78196d7c7 Mention the nightly build in README 2021-02-08 15:04:33 +00:00