Commit Graph

617 Commits

Author SHA1 Message Date
Black Hat
c683d6576e Smooth avatar. 2019-03-03 18:28:05 +08:00
Black Hat
6dd33af0ca Fix a bug in notification. 2019-03-02 22:07:06 +08:00
Black Hat
31203235f2 Init new notification implementation. 2019-03-02 21:31:39 +08:00
Black Hat
6eb7f21090 Update libqmatrixclient && fix image provider crashes. 2019-03-02 15:33:37 +08:00
Black Hat
b5644cb07c Merge branch 'fix-cmark' into 'develop'
Fix markdown lib

See merge request b0/spectral!42
2019-03-01 13:27:41 +00:00
Black Hat
7fe4c82bda Merge branch 'kitsune-fix-image-provider' into 'develop'
Fix ImageProvider crashes with libQMC 0.5

See merge request b0/spectral!41
2019-03-01 11:27:23 +00:00
Kitsune Ral
7ea9b2124e More #includes moved to .h 2019-02-28 11:20:26 +00:00
Kitsune Ral
d6ddae8894 Move around an #include to fix FTBFS 2019-02-28 10:43:15 +00:00
Kitsune Ral
c2f66dcc70 Fix a crash with newest library
This is basically a replica of
4c0020385a
for Spectral.
2019-02-28 10:34:24 +00:00
Black Hat
1d1cd3410a Change markdown parser. 2019-02-13 16:14:13 +08:00
Black Hat
b71359e92a Update Windows CI 2019-02-13 14:54:40 +08:00
Black Hat
81ce18f3bd Attempt to enable bundle_font in flatpak build. 2019-02-05 21:56:23 +08:00
Black Hat
1ae59cee82 Fix timeline alignment. 2019-02-05 21:31:49 +08:00
Black Hat
70de1e3d7c Merge branch 'material' into 'develop'
Material Design

See merge request b0/spectral!30
2019-02-03 04:22:23 +00:00
Black Hat
7454dbc9d0 Merge branch 'develop' into 'material'
# Conflicts:
#   .appveyor.yml
2019-02-03 04:21:50 +00:00
Black Hat
cf7f01723b Fix artifact upload. 2019-02-03 11:47:05 +08:00
Black Hat
709e121d13 Fix CI. 2019-02-02 21:18:13 +08:00
Black Hat
98e0e7e6a3 Fix CI. 2019-02-02 21:05:47 +08:00
Black Hat
232ae235a1 Add missing files. 2019-02-02 20:59:27 +08:00
Black Hat
495dbf2ba2 Fixing markdown licensing && compilation issues. 2019-02-02 14:25:25 +08:00
Black Hat
91fe860b7c Merge branch 'bintray-version' into 'master'
Set Bintray version to be the same as the in app version

See merge request b0/spectral!38
2019-01-18 01:25:44 +00:00
Black Hat
1c76f2653b Use postFile from libqmatrixclient.
Remove crappy json code.
2019-01-18 09:09:11 +08:00
Black Hat
635dbbff39 Init commonmark support.
Add dependency cmark.
2019-01-18 08:46:50 +08:00
Black Hat
2b0e45bddf Update libqmatrixclient. 2019-01-14 09:53:08 +08:00
Aaron Raimist
11a4d37c37
Set Bintray version to be the same as the in app version
This is needed for Homebrew Cask.
2019-01-08 17:34:52 -06:00
Black Hat
aaf4189c03 Merge branch 'macos-info-plist' into 'master'
Set macOS Info.plist

See merge request b0/spectral!35
2019-01-08 07:35:46 +00:00
Black Hat
09f69ea5fa Merge branch 'macos-build-number-take-2' into 'master'
Make macOS .dmg use correct build number, take 2

See merge request b0/spectral!37
2019-01-06 07:37:48 +00:00
Aaron Raimist
e7adc0098f
Make macOS .dmg use correct build number, take 2 2019-01-05 17:06:09 -06:00
Black Hat
c46d38e38e New WIP image provider. 2019-01-04 20:17:26 +08:00
Black Hat
d3d0128a97 Merge branch 'revert-e9fe310d' into 'master'
Revert "Merge branch 'macos-build-number' into 'master'"

See merge request b0/spectral!36
2019-01-04 10:48:00 +00:00
Black Hat
40b8ca437a Revert "Merge branch 'macos-build-number' into 'master'"
This reverts merge request !34
2019-01-04 10:16:24 +00:00
Black Hat
e9fe310d04 Merge branch 'macos-build-number' into 'master'
Make macOS .dmg use correct build number

See merge request b0/spectral!34
2019-01-03 23:53:38 +00:00
Aaron Raimist
c90e96072c Fix the CFBundleIdentifier 2019-01-02 21:40:36 -06:00
Aaron Raimist
da7fb89c81 Set version number like major.minor.patch.build on macOS
Qt is supposed to work with these kinds of version numbers but it doesn't seem to actually work for some reason
http://doc.qt.io/qt-5/qmake-variable-reference.html#version.

You should eventually be able to revert this commit (and remove the VERSION line) once there are version numbers set that are just major.minor.patch.
2019-01-02 21:36:17 -06:00
Aaron Raimist
446c9194bf Set macOS Info.plist 2019-01-02 20:58:43 -06:00
Aaron Raimist
60c3ed3c54 Make macOS .dmg use correct build number 2019-01-02 18:34:58 -06:00
Black Hat
ec43131a10 Clean up notification. 2018-12-24 20:31:40 +08:00
Black Hat
316d1429fa Add typing notification. 2018-12-23 11:24:01 +08:00
Black Hat
e5fbdc15ff Update QtQuick.
Add FileDelegate.
2018-12-22 22:25:03 +08:00
Black Hat
5ee47ed207 Fix #128. 2018-12-22 20:39:51 +08:00
Black Hat
0d06498467 Use color palette. 2018-12-16 10:47:58 +08:00
Black Hat
df045a786f Code cleanup. 2018-12-15 22:29:51 +08:00
Black Hat
076c501605 Merge branch 'qt-512' into 'material'
Qt 512

See merge request b0/spectral!33
2018-12-15 02:56:10 +00:00
Black Hat
8300d022b2 Update libqmatrixclient.
Enable member lazy loading.
Some Qt 5.12 fix.
2018-12-15 10:46:18 +08:00
Hazy Fish
66e2d99620 Update QtQuick. 2018-12-07 09:18:42 +08:00
Black Hat
4212dbe265 Init Qt 5.12. 2018-12-06 19:12:42 +08:00
Black Hat
2d7addafc7 Clean up. 2018-12-04 13:46:40 +08:00
Black Hat
aff2c2ffb2 Merge branch 'no-paintable' into 'material'
Remove paintable

See merge request b0/spectral!32
2018-12-03 12:21:04 +00:00
Black Hat
92b1458c4a Fix avatar changes. 2018-12-03 20:11:24 +08:00
Black Hat
8959be2cb8 Remove ImageItem, Paintable and use unified image provider. 2018-12-03 19:55:42 +08:00