aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-24204-1965/+8062
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CHANGELOG.md README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/layout/account_row.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| * version bump to 1.6.3 and changelog1.6.3Daniel Gultsch2015-08-232-2/+5
| |
| * open files with capital extensions as well. fixes #1354Daniel Gultsch2015-08-231-1/+1
| |
| * bugfix: next encryption is now being properly detected1.6.2Daniel Gultsch2015-08-232-3/+2
| |
| * version bump to 1.6.2 and changelogDaniel Gultsch2015-08-232-2/+5
| |
| * introduce special iq type for internal timeouts. always use != result to ↵Daniel Gultsch2015-08-237-20/+18
| | | | | | | | check for error in callbacks
| * reformatingDaniel Gultsch2015-08-231-3/+1
| |
| * deal with another set of stream:features after bindDaniel Gultsch2015-08-231-7/+9
| |
| * added changelog for 1.6.11.6.1Daniel Gultsch2015-08-231-0/+3
| |
| * version bump to 1.6.1Daniel Gultsch2015-08-231-2/+2
| |
| * Add error handling to OMEMO PEP codeAndreas Straub2015-08-231-116/+131
| | | | | | | | Log received errors and abort processing
| * remove the READ_PHONE_STATE permission.Michael2015-08-231-0/+2
| |
| * remove callbacks directly from iteratorDaniel Gultsch2015-08-231-2/+2
| |
| * don't make subsequent iq request when original stanza returned an errorDaniel Gultsch2015-08-232-51/+67
| |
| * modified clearIqCallbacks into 2-step processDaniel Gultsch2015-08-233-19/+23
| |
| * pulled translations from transifex1.6.0Daniel Gultsch2015-08-1912-151/+397
| |
| * fixed nasty 'stuck at sending' bug that got introduced in ↵Daniel Gultsch2015-08-191-0/+1
| | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153
| * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| |
| * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
| |
| * increased version codeDaniel Gultsch2015-08-161-1/+1
| |
| * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| |
| * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| |
| * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
| |
| * catch null pointer in ScramSHA1 saslDaniel Gultsch2015-08-161-0/+3
| |
| * version bump to 1.6.0Daniel Gultsch2015-08-151-2/+2
| |
| * Merge branch 'development'Daniel Gultsch2015-08-153-0/+48
| |\
| | * Update license string with librariesAndreas Straub2015-08-151-0/+4
| | |
| | * Display error message if all contact keys purgedAndreas Straub2015-08-153-0/+44
| | |
| * | Merge branch 'development'Daniel Gultsch2015-08-15201-1239/+6933
| |\|
| | * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| | |
| | * Merge pull request #1329 from hlad/server_info_http_uploadDaniel Gultsch2015-08-153-0/+28
| | |\ | | | | | | | | show HTTP upload availability on Edit account screen (server info)
| | | * show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| | |/
| | * version bump to 1.6.0-beta.2Daniel Gultsch2015-08-111-2/+2
| | |
| | * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-116-51/+218
| | | | | | | | | | | | fixed #522
| | * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| | | | | | | | | | | | fixes #1323
| | * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| | | | | | | | | | | | fixes #1326
| | * put wake locks on out of band file transfersDaniel Gultsch2015-08-105-25/+32
| | |
| | * report wrong file size in otr encrypted jingle file transfers to be ↵Daniel Gultsch2015-08-103-3/+10
| | | | | | | | | | | | compatible with conversations > 1.6
| | * provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-102-38/+61
| | |
| | * Merge pull request #1324 from fiaxh/omemo_logoDaniel Gultsch2015-08-092-0/+274
| | |\ | | | | | | | | OMEMO logo
| | | * OMEMO logofiaxh2015-08-092-0/+274
| | |/
| | * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| | |
| | * decreased right hand side padding in contact keysDaniel Gultsch2015-08-081-1/+3
| | |
| | * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-088-26/+25
| | |
| | * removed dead codeDaniel Gultsch2015-08-081-10/+0
| | |
| | * don't request ack for iq stanzas before stream managment is initializedDaniel Gultsch2015-08-081-2/+2
| | | | | | | | | | | | fixes #1322
| | * Increase number of published prekeys for releaseAndreas Straub2015-08-071-1/+1
| | |
| | * request server-ACKs for iq stanzasDaniel Gultsch2015-08-061-33/+37
| | |
| | * fail old/invalid iq stanzas on bindDaniel Gultsch2015-08-061-0/+13
| | |
| | * hide multi-end and otr encryption in conferencesDaniel Gultsch2015-08-061-2/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 22:49:20 +0000