Commit Graph

888 Commits

Author SHA1 Message Date
l10n daemon script
dcf35abe79 GIT_SILENT made messages (after extraction) 2020-11-01 02:27:08 +01:00
l10n daemon script
efd22b1d21 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"
2020-10-30 06:37:41 +01:00
l10n daemon script
6decf96497 GIT_SILENT made messages (after extraction) 2020-10-30 02:31:29 +01:00
l10n daemon script
60c511b9d7 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"
2020-10-29 06:37:31 +01:00
l10n daemon script
9afc090c9c GIT_SILENT made messages (after extraction) 2020-10-29 02:32:25 +01:00
l10n daemon script
032140331c 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"
2020-10-28 06:22:17 +01:00
l10n daemon script
73796734e5 GIT_SILENT made messages (after extraction) 2020-10-28 02:27:51 +01:00
l10n daemon script
3c5cd095b8 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"
2020-10-27 06:19:17 +01:00
l10n daemon script
1876d9148b GIT_SILENT made messages (after extraction) 2020-10-27 02:27:03 +01:00
l10n daemon script
b9bd2aabff 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"
2020-10-26 06:08:59 +01:00
l10n daemon script
6a2c11b56c GIT_SILENT made messages (after extraction) 2020-10-26 02:24:08 +01:00
l10n daemon script
a787d1a21d 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"
2020-10-25 05:12:30 +01:00
Carl Schwan
dfec20f0f2 remove vim temporary file 2020-10-23 09:41:31 +02:00
Carl Schwan
68f509d582 Start working on the RoomDrawer port 2020-10-04 17:32:11 +02:00
Carl Schwan
81563c056f Simplify timeline structure and fix text wrapping bug 2020-10-04 10:46:48 +02:00
Carl Schwan
88ea6f2ea1 Improve Kirigami 2020-10-03 18:29:54 +02:00
Carl Schwan
2532a86e7e Merge branch 'master' into kirigami2 2020-10-03 17:48:27 +02:00
Black
d6009479a5 Fix some deprecation. 2020-07-28 20:33:32 -07:00
Black
675ec40a63 Update to libQuotient 0.6. 2020-07-25 16:45:48 -07:00
Black Hat
c8b75202c0 Merge branch 'alistair/appveyor-qt-update' into 'master'
appveyor.yml: Update to Qt 5.15 and VS 2019

Closes #208

See merge request spectral-im/spectral!78
2020-07-16 00:35:37 +00:00
Alistair Francis
e2841e5430 appveyor.yml: Update to Qt 5.15 and VS 2019
Signed-off-by: Alistair Francis <alistair@alistair23.me>
2020-07-15 16:21:15 -07:00
Black Hat
2458769f10 Merge branch 'hexdiract-master-openbsd' into 'master'
Add support for OpenBSD

See merge request spectral-im/spectral!77
2020-07-13 02:00:21 +00:00
Zr22
679bb4c01b Add support for OpenBSD 2020-07-10 07:31:28 +00:00
Black Hat
ca91709c9b Merge branch 'qt5-15' into 'master'
Qt 5.15

See merge request spectral-im/spectral!76
2020-06-07 00:17:52 +00:00
Black
9fc316757e Use null coalescing. 2020-06-03 22:02:46 -07:00
Black
1f95e8888a Merge branch 'master' of https://gitlab.com/spectral-im/spectral 2020-04-15 19:44:53 -07:00
Black
8d77ae3335 Update deps. 2020-04-15 19:44:45 -07:00
Black
ccece5112f More changes. 2020-04-07 20:39:49 -07:00
Black Hat
ff7a217378 Merge branch 'html' into 'master'
Escape HTML in notifications when server supports HTML

See merge request spectral-im/spectral!74
2020-03-28 05:24:30 +00:00
Black Hat
1c21e40bd6 Merge branch 'desktopentry' into 'master'
Add desktop-entry hint to notifications

See merge request spectral-im/spectral!73
2020-03-28 02:20:08 +00:00
Nicolas Fella
6935bd9c4d Escape HTML in notifications when server supports HTML 2020-03-27 17:54:30 +01:00
Nicolas Fella
26f539d7f1 Add desktop-entry hint to notifications 2020-03-27 16:34:28 +01:00
Black
8ef46dfc66 Change state event position. 2020-03-25 19:34:58 -07:00
Black
68ca557389 Some fixes in layout. 2020-03-25 19:19:28 -07:00
Black
1cb363924e Update libQuotient. 2020-03-25 18:44:29 -07:00
Black
a798a1f830 Fix on new canonical alias events. 2020-03-23 22:59:39 -07:00
Black
e765080e7f Merge branch 'master' of https://gitlab.com/spectral-im/spectral 2020-03-21 13:39:12 -07:00
Black
517de81ac4 Update libQuotient. 2020-03-21 13:39:05 -07:00
Black Hat
1ce9c8de0d Merge branch 'screen-width' into 'master'
Decrease minimumWidth

Closes #191

See merge request spectral-im/spectral!72
2020-03-10 23:13:18 +00:00
Jonah Brüchert
c34a4a5a3c Decrease minimumWidth
Fixes #191
2020-03-10 21:40:42 +01:00
Black
f25b79ab7e Fix impplicit binding and stuff. 2020-02-12 14:44:00 -08:00
Black
cd10a8474a Use controls. 2020-02-12 02:20:29 -08:00
Black
d3b926bc8e Wrap an itemdelegate. 2020-02-12 01:06:03 -08:00
Black
6d6266f03c Fix jumping issues. 2020-02-12 00:57:45 -08:00
Black
5c4d0a969d First attempt. 2020-02-12 00:37:35 -08:00
Black
29e6933b4f Fix code wrapping and scrolling again. 2020-02-09 00:12:07 -08:00
Black
c8b02cf907 Wrap welcome message.
Fix #148.
2020-02-08 23:27:28 -08:00
Black
b22c238365 Merge branch 'master' of https://gitlab.com/spectral-im/spectral 2020-02-08 23:21:21 -08:00
Black
a0e77f0fe8 Fix #185.
libQuotient fix of compiling on big-endian targets.
2020-02-08 23:21:13 -08:00
Black Hat
769f259dd0 Merge branch 'tim74-packaging-status' into 'master'
Add Fedora installation instructions

See merge request spectral-im/spectral!71
2020-02-01 00:47:36 +00:00