aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-1629-241/+919
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
| * catch all axolotl parse exception at once. fixes #1692Daniel Gultsch2016-02-111-5/+4
| |
| * send muc messages after joinDaniel Gultsch2016-02-101-1/+2
| |
| * allow user to set MAM preferencesDaniel Gultsch2016-02-095-16/+119
| |
| * prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-042-2/+13
| |
| * fixed performance regression in on scroll listenerDaniel Gultsch2016-02-042-3/+8
| |
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-049-17/+92
| |
| * add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-043-7/+21
| |
| * removed unecessary logging when muc tiles updateDaniel Gultsch2016-02-041-1/+0
| |
| * use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-033-2/+14
| |
| * cache server capsDaniel Gultsch2016-02-033-3/+36
| |
| * count all messages in a queryDaniel Gultsch2016-02-032-8/+3
| |
| * Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-032-4/+16
| | | | | | | | This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f.
| * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-036-43/+116
| |
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵Daniel Gultsch2016-02-0211-152/+467
| |\ | | | | | | | | | into singpolyma-disco-caps
| | * Do disco for caps hashes we have never seenStephen Paul Weber2016-01-241-2/+23
| | | | | | | | | | | | Then cache it
| | * Fetch cached caps result on new presenceStephen Paul Weber2016-01-242-3/+14
| | |
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-248-102/+121
| | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it
| | * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-232-11/+98
| | |
| | * Implement toJSON on ServiceDiscoveryResultStephen Paul Weber2016-01-231-0/+34
| | |
| | * Generate capHash from any discovery resultStephen Paul Weber2016-01-231-4/+80
| | |
| | * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-232-47/+114
| | | | | | | | | | | | And the parser from Element to this representation.
| * | fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
| | |
| * | get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-022-16/+4
| | |
| * | re-read common name from certificates on startupDaniel Gultsch2016-02-022-2/+32
| | |
| * | avoid npe when accessing the pgp connection serviceDaniel Gultsch2016-02-021-1/+1
| | |
| * | catch a few NPE when parsing invalid pep nodesDaniel Gultsch2016-02-021-3/+3
| | |
* | | Fixes FS#105: XHTML par for images addedsteckbrief2016-02-131-0/+12
| | |
* | | Fix flagging no more messages on server for conversationsteckbrief2016-02-131-16/+18
| | |
* | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-02-131-2/+13
| | |
* | | Partially implements FS#6: Conference ID changed to ↵steckbrief2016-02-131-2/+2
| | | | | | | | | | | | c+bugs@conference.thedevstack.de
* | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-131-1/+1
| | | | | | | | | | | | should be shown for a message
* | | Unused preference 'picture_compression'. This feature is configured in our ↵steckbrief2016-02-1320-56/+0
| | | | | | | | | | | | variant via 'resize_picture'
* | | Fixed overwriting of changes for fixing FS#70. Unused method removed from ↵steckbrief2016-02-136-79/+5
| | | | | | | | | | | | generator classes.
* | | Fixed settings synchronizationsteckbrief2016-02-121-60/+66
| | |
* | | Imports organizedsteckbrief2016-02-1273-293/+56
| | |
* | | Fixed parent activity for logoutput activitysteckbrief2016-02-121-3/+3
| | |
* | | Simplification of DNS requests.steckbrief2016-02-123-254/+130
| | | | | | | | | | | | Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html)
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-1224-67/+5
| | |
* | | Fixed placeholder string for message input boxsteckbrief2016-02-122-2/+2
| | |
* | | Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
| | |
* | | Fixed NPE while loading messages via MAMsteckbrief2016-02-121-1/+1
| | |
* | | database error while upgrading from db version 14 fixedsteckbrief2016-02-121-1/+1
| | |
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-1124-728/+358
| | |
* | | Fixed XML errors after mergesteckbrief2016-02-116-8/+14
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-11270-5044/+18189
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml 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/Conversation.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/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.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/generator/PresenceGenerator.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/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.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/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ConferenceDetailsActivity.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/ManageAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.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/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.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/JingleConnectionManager.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/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.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/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.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-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/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/values/themes.xml src/main/res/xml/preferences.xml
| * | respect autojoin setting on newly created bookmarks as wellDaniel Gultsch2016-02-011-1/+1
| | |
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-015-5/+20
| | |
| * | made create context menu call in StartConversationsActivity more failsafeDaniel Gultsch2016-02-011-1/+1
| | |
| * | refactored user handling in conferences. show try again button when ↵Daniel Gultsch2016-02-014-86/+70
| | | | | | | | | | | | conference has errors
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:15:57 +0000