Christian S
40d20b2aed
copy Avatar Crop patch
2015-11-07 09:54:31 +01:00
Christian S
fc4ead341f
Merge remote-tracking branch 'siacs/master' into development
2015-11-07 09:49:32 +01:00
Andreas Straub
c6e54e7e5a
Move migration 19 before 17
...
Migration 17 depends on Account deserialization, so any migrations that
touch the accounts table need to be applied beforehand.
Re-writing the migration to work directly on the database would lead to
a lot of code duplication, so it's not worth it at this time, but might
become necessary later on to avoid dependency cycles.
2015-11-06 14:50:55 +01:00
Philip Flohr
8736a4af3a
use Config.AVATAR_SIZE as size for cropping avatar picture
2015-11-06 12:32:07 +01:00
Philip Flohr
a31b05628c
set the avatar image size to 384x384
2015-11-06 11:37:07 +01:00
Philip Flohr
d8a15ebebb
users are now able to crop their avatar pictures
2015-11-06 11:14:05 +01:00
Christian S
a8cdf281a0
Update CHANGELOG.md
2015-11-02 19:59:21 +01:00
Daniel Gultsch
8471fbd9b7
updated FAQ to account for incompatible server
2015-11-01 14:22:01 +01:00
Christian S
06b218c1a6
Merge pull request #47 from siacs/master
...
copy commits
2015-11-01 10:21:59 +01:00
Daniel Gultsch
fb9ba0a734
don't close socket on disconnect
2015-11-01 07:45:00 +01:00
Daniel Gultsch
baf76d883c
indicate cbe in chat message hint
2015-10-31 22:55:04 +01:00
Christian S
1e50c4c55c
Version bump
2015-10-31 17:55:16 +01:00
Christian S
c5dc1628a4
Merge remote-tracking branch 'siacs/master' into development
2015-10-31 17:14:53 +01:00
Daniel Gultsch
bca29cf7fd
explicitly mark verified omemo keys in UI
2015-10-31 10:57:57 +01:00
Daniel Gultsch
b9de159e97
versrion bump to 1.7.2
2015-10-30 12:05:44 +01:00
Daniel Gultsch
34bcc59f72
fixed session objects not being build on start up
2015-10-30 12:05:21 +01:00
Daniel Gultsch
6a458b853c
Merge pull request #1513 from fiaxh/pgp_background_decryption
...
PGP messages background decryption
2015-10-30 10:18:27 +01:00
Daniel Gultsch
1ec3d86eb7
version bump to 1.7.1
2015-10-29 23:16:39 +01:00
Daniel Gultsch
8553d5a563
moved db calls made from UI into serial background thread
2015-10-29 17:20:01 +01:00
Daniel Gultsch
ef7857ac8d
avoid npe when checking for stream restart
2015-10-29 14:38:35 +01:00
Daniel Gultsch
c7ff196f58
push CN into nick pep node when uploading certificate. subscribe to nick node
2015-10-29 13:41:08 +01:00
Daniel Gultsch
7410e2023a
Merge branch 'master' of github.com:siacs/Conversations
2015-10-29 12:08:32 +01:00
Daniel Gultsch
1221cff561
load avatars in message adapter in background task
2015-10-29 12:08:15 +01:00
Daniel Gultsch
a7fd629c05
show encryption type in warned/red messages
2015-10-28 22:40:09 +01:00
fiaxh
016a57f123
Show PGP "please wait" message only when actually decrypting
2015-10-28 20:57:15 +00:00
fiaxh
29a849cb92
Decrypt PGP messages in background
2015-10-28 19:57:11 +00:00
Daniel Gultsch
d65273ce39
Merge pull request #1523 from SamWhited/presence_sync_fix
...
Don't synchronize on non-final field
2015-10-27 17:16:18 +01:00
Sam Whited
e747ecef4d
Don't synchronize on non-final field
2015-10-26 20:13:48 -05:00
Daniel Gultsch
ec473a4437
Merge pull request #1520 from saqura/self_handle_orientation
...
Handle some orientation changes manually
2015-10-26 09:30:08 +01:00
Christian S
107acd1a5b
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
2015-10-26 09:22:49 +01:00
saqura
48f172fc9e
Reset the margins manually after rotating
2015-10-26 00:59:32 +01:00
Daniel Gultsch
d4877177b7
version bump to 1.7.0
2015-10-25 22:48:02 +01:00
Daniel Gultsch
56afdcc94a
invalidate menu after backend connection.
...
fixes the menu not being shown after rotation in edit account details
2015-10-25 22:46:06 +01:00
saqura
1f2b2c8834
Handle some orientation changes manually
...
Currently most activities get destroyed/recreated when rotating the
device. This commit prevents this from happening where it is not
necessary.
The most obvious improvements are:
* The options menu in the EditAccountActivity does not disappear when
rotating the device.
* CSI inactive/active states are no longer sent on every rotate.
2015-10-25 21:34:16 +01:00
Christian S
2c179a1d41
Merge remote-tracking branch 'siacs/master' into development
2015-10-22 20:31:08 +02:00
Christian S
83ec2b1255
bug fixed in updater
2015-10-22 20:29:16 +02:00
Christian S
2200ba240a
Merge 'hlad/hlad' into development
2015-10-22 19:21:26 +02:00
hlad
887de0becc
show resource in dynamic tags
2015-10-22 19:19:49 +02:00
Christian S
e7f0508713
corrected german strings
2015-10-22 16:05:09 +02:00
Daniel Gultsch
1bd68a42b2
join muc even if initial conference configuration fetch failed
2015-10-22 11:20:36 +02:00
Daniel Gultsch
3c45f00443
fixed read conversations showing up as notifications after a restart
2015-10-21 17:41:44 +02:00
Daniel Gultsch
d56214f096
version bump to 1.7.0-beta.2
2015-10-21 11:14:00 +02:00
Christian S
d4392488bb
set Conversations + version as user-agent for update check
2015-10-20 20:51:47 +02:00
Christian S
ce023c396a
add offline hint to subtitle if contact is offline
2015-10-20 20:15:47 +02:00
Christian S
9d6b7bc032
Merge remote-tracking branch 'siacs/master' into development
2015-10-20 19:30:38 +02:00
Christian S
eb8a7d660e
Update README.md
2015-10-20 19:19:16 +02:00
Christian S
4a155edca8
Update CHANGELOG.md
2015-10-20 19:18:56 +02:00
Daniel Gultsch
f4a33a007c
open unknown files with wildcard intent
2015-10-20 17:41:07 +02:00
Daniel Gultsch
569b9f4e66
open manage account + certificate chooser when cbe mode is enabled
2015-10-20 15:27:33 +02:00
Daniel Gultsch
53125dbccc
move chat state reset from background switch to foreground switch to account for chat states sent in the mean time
2015-10-19 23:22:29 +02:00
