| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Update CHANGELOG.md | Christian S | 2015-11-02 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge pull request #47 from siacs/master | Christian S | 2015-11-01 | 9 | -18/+72 | |
| |\| | | | | | copy commits | |||||
| | * | don't close socket on disconnect | Daniel Gultsch | 2015-11-01 | 1 | -1/+0 | |
| | | | ||||||
| | * | indicate cbe in chat message hint | Daniel Gultsch | 2015-10-31 | 3 | -3/+26 | |
| | | | ||||||
| | * | explicitly mark verified omemo keys in UI | Daniel Gultsch | 2015-10-31 | 7 | -16/+48 | |
| | | | ||||||
| * | | Version bump | Christian S | 2015-10-31 | 2 | -3/+4 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-31 | 31 | -109/+576 | |
| |\| | ||||||
| | * | versrion bump to 1.7.2 | Daniel Gultsch | 2015-10-30 | 1 | -2/+2 | |
| | | | ||||||
| | * | fixed session objects not being build on start up | Daniel Gultsch | 2015-10-30 | 2 | -2/+1 | |
| | | | ||||||
| | * | Merge pull request #1513 from fiaxh/pgp_background_decryption | Daniel Gultsch | 2015-10-30 | 11 | -75/+294 | |
| | |\ | | | | | | | PGP messages background decryption | |||||
| | | * | Show PGP "please wait" message only when actually decrypting | fiaxh | 2015-10-28 | 2 | -2/+7 | |
| | | | | ||||||
| | | * | Decrypt PGP messages in background | fiaxh | 2015-10-28 | 9 | -73/+287 | |
| | | | | ||||||
| | * | | version bump to 1.7.1 | Daniel Gultsch | 2015-10-29 | 2 | -2/+5 | |
| | | | | ||||||
| | * | | moved db calls made from UI into serial background thread | Daniel Gultsch | 2015-10-29 | 1 | -5/+21 | |
| | | | | ||||||
| | * | | avoid npe when checking for stream restart | Daniel Gultsch | 2015-10-29 | 1 | -2/+4 | |
| | | | | ||||||
| | * | | push CN into nick pep node when uploading certificate. subscribe to nick node | Daniel Gultsch | 2015-10-29 | 7 | -5/+47 | |
| | | | | ||||||
| | * | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-10-29 | 1 | -1/+1 | |
| | |\| | ||||||
| | | * | Merge pull request #1523 from SamWhited/presence_sync_fix | Daniel Gultsch | 2015-10-27 | 1 | -1/+1 | |
| | | |\ | | | | | | | | | Don't synchronize on non-final field | |||||
| | | | * | Don't synchronize on non-final field | Sam Whited | 2015-10-26 | 1 | -1/+1 | |
| | | |/ | ||||||
| | * | | load avatars in message adapter in background task | Daniel Gultsch | 2015-10-29 | 4 | -17/+115 | |
| | | | | ||||||
| | * | | show encryption type in warned/red messages | Daniel Gultsch | 2015-10-28 | 3 | -0/+32 | |
| | |/ | ||||||
| | * | Merge pull request #1520 from saqura/self_handle_orientation | Daniel Gultsch | 2015-10-26 | 9 | -1/+57 | |
| | |\ | | | | | | | Handle some orientation changes manually | |||||
| | | * | Reset the margins manually after rotating | saqura | 2015-10-26 | 8 | -1/+53 | |
| | | | | ||||||
| | | * | Handle some orientation changes manually | saqura | 2015-10-25 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2015-10-26 | 1 | -0/+1 | |
| |\| | | ||||||
| | * | | version bump to 1.7.0 | Daniel Gultsch | 2015-10-25 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | invalidate menu after backend connection. | Daniel Gultsch | 2015-10-25 | 1 | -0/+1 | |
| | |/ | | | | | | | fixes the menu not being shown after rotation in edit account details | |||||
| * | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-22 | 3 | -7/+47 | |
| |\| | ||||||
| | * | join muc even if initial conference configuration fetch failed | Daniel Gultsch | 2015-10-22 | 2 | -2/+43 | |
| | | | ||||||
| | * | fixed read conversations showing up as notifications after a restart | Daniel Gultsch | 2015-10-21 | 1 | -5/+4 | |
| | | | ||||||
| | * | version bump to 1.7.0-beta.2 | Daniel Gultsch | 2015-10-21 | 1 | -2/+2 | |
| | | | ||||||
| * | | bug fixed in updater | Christian S | 2015-10-22 | 2 | -108/+110 | |
| | | | ||||||
| * | | Merge 'hlad/hlad' into development | Christian S | 2015-10-22 | 2 | -0/+22 | |
| |\ \ | ||||||
| | * | | show resource in dynamic tags | hlad | 2015-10-22 | 2 | -0/+22 | |
| | | | | ||||||
| * | | | corrected german strings | Christian S | 2015-10-22 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | set Conversations + version as user-agent for update check | Christian S | 2015-10-20 | 1 | -0/+13 | |
| | | | | ||||||
| * | | | add offline hint to subtitle if contact is offline | Christian S | 2015-10-20 | 1 | -1404/+1410 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2015-10-20 | 10 | -143/+183 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | open unknown files with wildcard intent | Daniel Gultsch | 2015-10-20 | 2 | -10/+15 | |
| | | | | ||||||
| | * | | open manage account + certificate chooser when cbe mode is enabled | Daniel Gultsch | 2015-10-20 | 4 | -88/+105 | |
| | | | | ||||||
| | * | | move chat state reset from background switch to foreground switch to account ↵ | Daniel Gultsch | 2015-10-19 | 1 | -3/+3 | |
| | | | | | | | | | | | | | for chat states sent in the mean time | |||||
| | * | | update last seen in mucs. fixes #1508 | Daniel Gultsch | 2015-10-19 | 1 | -1/+5 | |
| | | | | ||||||
| | * | | add nick to bookmark when entering full jid in join conference dialog | Daniel Gultsch | 2015-10-19 | 1 | -4/+6 | |
| | | | | ||||||
| | * | | synchronize around the disco object | Daniel Gultsch | 2015-10-19 | 1 | -44/+53 | |
| | | | | ||||||
| | * | | version bump to 1.7.0-beta | Daniel Gultsch | 2015-10-17 | 2 | -2/+10 | |
| | | | | ||||||
| | * | | disconnet in background thread | Daniel Gultsch | 2015-10-17 | 1 | -1/+7 | |
| | | | | ||||||
| | * | | only try EXTERNAL auth if client certificate is set for account | Daniel Gultsch | 2015-10-17 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update README.md | Christian S | 2015-10-20 | 1 | -5/+43 | |
| | | | | ||||||
| * | | | Update CHANGELOG.md | Christian S | 2015-10-20 | 1 | -3/+10 | |
| | | | | ||||||
| * | | | show lastseen as subtitle in chatview | Christian S | 2015-10-19 | 1 | -2/+3 | |
| | | | | ||||||
 |
index : PiratX | |
| The new way for communications |
| aboutsummaryrefslogtreecommitdiffstats |