Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | be more carefull with pending uris | Daniel Gultsch | 2015-12-05 | 1 | -8/+16 | |
| | ||||||
* | check for query object as condition to trigger deduplication instead of serverId | Daniel Gultsch | 2015-12-05 | 1 | -1/+1 | |
| | ||||||
* | parse stanza-id from messages | Daniel Gultsch | 2015-12-04 | 2 | -3/+23 | |
| | ||||||
* | properly clear muc user avatar caches | Daniel Gultsch | 2015-12-04 | 4 | -13/+30 | |
| | ||||||
* | fixed showing avatars for contacts in muc | Daniel Gultsch | 2015-12-04 | 1 | -1/+10 | |
| | ||||||
* | Merge pull request #1595 from fiaxh/pgp_database_signature | Daniel Gultsch | 2015-12-04 | 3 | -74/+96 | |
|\ | | | | | Regenerate PGP signatures once | |||||
| * | Unset all PGP signatures once | fiaxh | 2015-12-02 | 3 | -74/+96 | |
| | | | | | | | | ... so they will be redone to match the changed status. | |||||
* | | avoid some NPEs | Daniel Gultsch | 2015-12-04 | 2 | -3/+4 | |
| | | ||||||
* | | rely on message id if message id is uuid and pgp encryption was used to ↵ | Daniel Gultsch | 2015-12-04 | 1 | -1/+3 | |
| | | | | | | | | deduplicate messages. fixes #1357 | |||||
* | | use proposed nick as default nick in mucoptions | Daniel Gultsch | 2015-12-04 | 3 | -8/+1 | |
| | | ||||||
* | | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-03 | 6 | -181/+295 | |
| | | ||||||
* | | enabled previously disabled http upload | Daniel Gultsch | 2015-12-03 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2015-12-02 | 3 | -3/+22 | |
|\ \ | ||||||
| * \ | Merge pull request #1545 from SamWhited/show_new_contact_request_messages | Daniel Gultsch | 2015-12-02 | 3 | -3/+22 | |
| |\ \ | | |/ | |/| | Show status message when contact requests presence | |||||
| | * | Show status message when contact requests presence | Sam Whited | 2015-12-02 | 3 | -3/+22 | |
| | | | | | | | | | | | | Remove presence when conversation closed | |||||
* | | | show tor config in paranoid mode | Daniel Gultsch | 2015-12-02 | 1 | -1/+1 | |
|/ / | ||||||
* | | fixed avatar loading for non-file uris | Daniel Gultsch | 2015-12-02 | 2 | -11/+7 | |
| | | ||||||
* | | users are now able to crop their avatar pictures using the android-crop | Philip Flohr | 2015-12-02 | 2 | -8/+35 | |
| | | | | | | | | library | |||||
* | | hide message content in notifications in paranoia mode | Daniel Gultsch | 2015-12-02 | 1 | -20/+30 | |
|/ | ||||||
* | introduced build-time paranoia mode that disables unencrypted chats and ↵ | Daniel Gultsch | 2015-12-01 | 5 | -4/+24 | |
| | | | | forces TOR | |||||
* | introduce config.java variable to optionally show number of connected ↵ | Daniel Gultsch | 2015-12-01 | 2 | -37/+57 | |
| | | | | accounts in notification | |||||
* | fixed crashes when activity got destroyed when selecting pgp key | Daniel Gultsch | 2015-12-01 | 2 | -40/+95 | |
| | ||||||
* | combine multiple message receipts into single message | Daniel Gultsch | 2015-12-01 | 2 | -12/+15 | |
| | ||||||
* | add error state for unavailable tor network | Daniel Gultsch | 2015-12-01 | 3 | -13/+14 | |
| | ||||||
* | always use http proxy for http requests. (socks is leaking dns) | Daniel Gultsch | 2015-12-01 | 1 | -5/+1 | |
| | ||||||
* | refactored socks5 connection code. make jingle transport use that new code | Daniel Gultsch | 2015-12-01 | 4 | -53/+72 | |
| | ||||||
* | do socks5 connect manually | Daniel Gultsch | 2015-12-01 | 3 | -51/+69 | |
| | ||||||
* | initial tor support | Daniel Gultsch | 2015-12-01 | 11 | -129/+273 | |
| | ||||||
* | changed method signature of calcSampleSize | Daniel Gultsch | 2015-11-30 | 1 | -1/+1 | |
| | ||||||
* | hide subject edit button if not editable by user | Daniel Gultsch | 2015-11-26 | 4 | -5/+30 | |
| | ||||||
* | encrypt pgp messages to self | Daniel Gultsch | 2015-11-26 | 1 | -8/+8 | |
| | ||||||
* | detect server identity and added muc-workaround for slack | Daniel Gultsch | 2015-11-26 | 3 | -5/+49 | |
| | ||||||
* | removed unnecessary configuration fetch after join | Daniel Gultsch | 2015-11-26 | 1 | -1/+1 | |
| | ||||||
* | removed unecessary chat state | Daniel Gultsch | 2015-11-26 | 1 | -1/+1 | |
| | ||||||
* | fail jingle file transfer if axolotl key message could not be created. fixes ↵ | Daniel Gultsch | 2015-11-26 | 1 | -1/+5 | |
| | | | | #1576 | |||||
* | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 15 | -129/+91 | |
| | ||||||
* | Merge pull request #1569 from fiaxh/conference_one_other_occupant | Daniel Gultsch | 2015-11-24 | 1 | -20/+48 | |
|\ | | | | | Show own avatar in tile for conferences with only one other occupant next to theirs | |||||
| * | Own contact picture in tile for conferences with only one other occupant | fiaxh | 2015-11-15 | 1 | -20/+48 | |
| | | ||||||
* | | Merge pull request #1558 from fiaxh/pgp_api_9.0 | Daniel Gultsch | 2015-11-24 | 7 | -44/+137 | |
|\ \ | | | | | | | Use OpenPGP-API 9.0 | |||||
| * | | Sign empty status | fiaxh | 2015-11-09 | 2 | -3/+1 | |
| | | | ||||||
| * | | Use OpenPGP-API 9.0 | fiaxh | 2015-11-09 | 6 | -43/+138 | |
| |/ | ||||||
* / | PgpEngine: Get account from conversation instead of from contact. fixes ↵ | fiaxh | 2015-11-15 | 1 | -3/+3 | |
|/ | | | | #1568, fixes #1544 | |||||
* | Move migration 19 before 17 | Andreas Straub | 2015-11-06 | 1 | -3/+6 | |
| | | | | | | | | | 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. | |||||
* | 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 | 2 | -1/+23 | |
| | ||||||
* | explicitly mark verified omemo keys in UI | Daniel Gultsch | 2015-10-31 | 6 | -16/+46 | |
| | ||||||
* | 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 | 10 | -74/+292 | |
|\ | | | | | PGP messages background decryption | |||||
| * | Show PGP "please wait" message only when actually decrypting | fiaxh | 2015-10-28 | 1 | -1/+5 | |
| | | ||||||
| * | Decrypt PGP messages in background | fiaxh | 2015-10-28 | 9 | -73/+287 | |
| | |