Commit graph

1075 commits

Author SHA1 Message Date
Joseph Donofry
a17a5550f8
Update to newer mtxclient to allow optional static linking 2019-05-12 23:23:47 -04:00
Joseph Donofry
b8b48a2f3d
Attempt to make travis build with more cores 2019-05-12 22:44:17 -04:00
Joseph Donofry
be5287aa90 Update Travis Install Script
Add new key for ubuntu repo that causes travis to fail.
2019-05-09 19:23:20 -04:00
Joseph Donofry
002021d255
Merge pull request #64 from Nheko-Reborn/travis-ci-fixes
Link mtxclient dynamically and update to Boost 1.69 for CI build
2019-05-08 23:35:16 -04:00
redsky17
4b7e9f7746
link boost dynamically 2019-05-08 22:57:21 -04:00
redsky17
eeb8fff2b5
Update mtxclient ver 2019-05-08 22:17:46 -04:00
redsky17
da0f8cf291
Update to boost 1.69.0 to attemp travis fix 2019-05-08 21:52:00 -04:00
redsky17
b0aa8bc2b4
Remove 'error on unset' for travis builds 2019-05-01 13:01:48 -04:00
redsky17
b2c8c6a1c6
Remove unset var causing error due to Qt script 2019-05-01 11:59:10 -04:00
redsky17
8ef4ba3d11
Use bash instead of sh because the qt env script needs to be run under bash. 2019-05-01 11:20:05 -04:00
redsky17
d0300c55f0
Fix Travis GPG-related build error 2019-05-01 10:51:13 -04:00
Joseph Donofry
3f2781af86
Merge pull request #60 from MonokelPinguin/remove-xml-parsing-of-messages
Simplify linkifyMessage.  Fixes #18.  Thanks @MonokelPinguin
2019-05-01 09:53:40 -04:00
Nicolas Werner
c8c0b41527 Raw string literals not allowed in MOC headers on OSX 2019-05-01 13:33:34 +02:00
Nicolas Werner
23eef9e1bc Simplify linkifyMessage
Parsing html as xml has inherent problems, most notable there are many
matrix clients that don't escape ampersands in urls of mx-replies, etc.
(See issue #18)

This also removes the replacement of <mx-reply> as it isn't strictly
needed.

Also the QRegExp is replaced with the Qt5 QRegularExpression for
perfomance and because it supports lookahead and lookbehind.

I'm pretty sure that the original code also replaced href="" with
href=\"\", which was probably wrong, but I'm not to sure about that.

Fixes #18
2019-05-01 12:11:19 +02:00
Joseph Donofry
e1457d5c7a
Merge pull request #58 from zapashcanon/sh
improve shell scripts and update .gitignore.  Thanks @zapashcanon
2019-04-29 15:48:51 -04:00
zapashcanon
eee6f2de31
improve shell scripts and update .gitignore 2019-04-24 01:55:05 +02:00
redsky17
33b1f37e37
Update olm repo to new location.
Remove LICENSE file in favor of COPYING
2019-04-18 22:30:00 -04:00
redsky17
c06d6240cc
Change LICENSE to COPYING to match gpl standard 2019-04-18 22:26:13 -04:00
redsky17
4cb27f34f2
Fix linting 2019-04-04 22:24:21 +00:00
redsky17
2d9f98a0b7
Update mtxclient version 2019-04-04 21:49:39 +00:00
redsky17
994f79cfbc
Update nheko to export sessions using new format
(requires mtxclient updates as well).
2019-03-27 23:13:38 +00:00
Joseph Donofry
6f13b0df0d
Merge pull request #43 from vtronko/implicitconversion_fix
Get rid of implicit conversion in text input height calculation.  Thanks @vtronko
2019-03-03 18:48:46 -05:00
Joseph Donofry
e3ca96000a
Merge pull request #40 from vtronko/textwidgetborder-fix
Don't let multiline text background overlap top border of text widget.  Fixes #39 
Thanks @vtronko
2019-03-03 18:35:45 -05:00
Vladyslav tronko
c719e01f3d Don't let multiline text background overlap top border of text widget 2019-03-04 00:54:53 +02:00
Vladyslav Tronko
d2a28072f6 Get rid of implicit conversion in text input height calculation 2019-03-03 20:34:57 +02:00
redsky17
0c53a87488
Update README screenshots. Fixes #36 2019-02-27 02:43:16 +00:00
redsky17
617875f906
Make appveyor script Build Nlohmann 2019-02-27 01:45:40 +00:00
redsky17
1ac56e9c4e
Revert dockerfile to trusty and build sodium locally 2019-02-27 01:00:00 +00:00
redsky17
0c9af63d1a
Attempt to fix appimage issue 2019-02-26 23:46:07 +00:00
redsky17
8165aa2b0d
Maybe fix docker issues 2019-02-25 03:20:50 +00:00
redsky17
8a2df06f3a
Fix linting issue 2019-02-25 03:10:02 +00:00
Joe
c1788f0b7d CI Updates 2019-02-24 21:37:11 -05:00
Joe
e7b4c9ecb2 More CI Fixes 2019-02-24 18:23:08 -05:00
Joe
d57a9dee81 more ci updates 2019-02-24 17:29:51 -05:00
Joe
bc1390125b Fix line ending issue 2019-02-24 17:03:26 -05:00
redsky17
e345cee32f Switch CI builds to use bundled JSON
Apparently the nlohmann library is not available in the standard
repositories.  I would rather build it than add universe deps.
2019-02-24 16:50:55 -05:00
redsky17
ee12e01939 Update JSON build deps.
Update JSON build dependencies, change the dockerfile and other
CI files that relate to this.  Also update target mtxclient
revision.
2019-02-24 16:42:37 -05:00
redsky17
4e17b7df72 Make some Dockerfile improvements 2019-02-24 15:09:12 -05:00
redsky17
75fb95855d
Nlohmann build updates 2019-02-24 20:05:11 +00:00
Joseph Donofry
ec83d9e6bd
Merge pull request #32 from Vistaus/master
Updated Dutch translation (thanks @Vistaus )
2019-02-20 15:57:38 -05:00
Heimen Stoffels
8b560d396a
Updated Dutch translation 2019-02-20 20:05:43 +01:00
Joseph Donofry
4c8f6ab0c5
Merge pull request #31 from Nheko-Reborn/fix_initial_sync_loop
Fix initial sync loop
2019-02-18 22:52:36 -05:00
Joseph Donofry
6497d1d822
Merge pull request #27 from AndrewJDR/fix_initial_sync_loop
Attempt to fix issue #19 by increasing the lmdb max_dbs setting.
2019-02-18 18:00:46 -05:00
Joseph Donofry
15ad42562c
Merge pull request #28 from miocho/patch-1
Update nheko_de.ts (German Translations)
2019-02-17 15:23:07 -05:00
miocho
f527ce0a08
Update nheko_de.ts 2019-02-17 17:54:16 +00:00
Andrew Johnson
b5733b2737 Attempt to fix issue #19 by increasing the lmdb max_dbs setting. 2019-02-16 17:05:25 -08:00
Joe
440d0b81ca Release Nheko 0.6.3
- Update version numbers and documentation
- Fix github releases oauth key
2019-02-08 14:49:53 -05:00
Joe
ebe5b19e76 Merge branch 'master' of https://github.com/redsky17/nheko 2019-02-08 14:06:37 -05:00
redsky17
83d2d6d7dd Adjust cmake minimum for included boost 2019-02-08 04:04:07 +00:00
redsky17
fa6bc6a466 Tweak build settings 2019-02-08 03:20:03 +00:00