aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * fixed false set of subject in conference with empty body tagDaniel Gultsch2016-01-311-1/+1
| |
| * prefer dns servers from networsk with the default routeDaniel Gultsch2016-01-291-2/+17
| |
| * be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
| |
| * try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
| |
| * show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-266-7/+58
| |
| * hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
| |
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-255-11/+48
| |
| * changed FileBackend API to allow files instead of messages to be copied and ↵Daniel Gultsch2016-01-241-33/+34
| | | | | | | | resized
| * added FormWrapper and form field validationDaniel Gultsch2016-01-238-4/+160
| |
| * introduced boolean form field wrapperDaniel Gultsch2016-01-236-14/+76
| |
| * added support for field types jid-single and text-privateDaniel Gultsch2016-01-234-4/+59
| |
| * reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| |
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-232-1/+15
| |
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-2213-70/+52
| |
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-226-1/+161
| |
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| |
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-224-5/+7
| |
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-225-23/+43
| |
| * increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| |
| * add convenience to get an account object from a spinnerDaniel Gultsch2016-01-211-15/+19
| |
| * pulled translations from transifexDaniel Gultsch2016-01-2015-13/+718
| |
| * catch security exception when user prevents access to address bookDaniel Gultsch2016-01-201-27/+45
| |
| * add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
| |
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-161-1/+4
| |\
| | * Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-161-1/+4
| | |\ | | | | | | | | Fixes having to choose PGP twice, upgrades openpgp-api to 10
| | | * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| | | |
| * | | pulled translations from transifexDaniel Gultsch2016-01-164-3/+49
| |/ /
| * | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
| | |
| * | reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-162-9/+17
| | |
| * | made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| | |
| * | removed some unused methods from db backendDaniel Gultsch2016-01-161-83/+0
| |/
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| |
| * show toast when image cropper get oomDaniel Gultsch2016-01-152-0/+8
| |
| * catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
| |
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-152-12/+27
| |
| * pulled translations for 1.9.0 release from transifex1.9.0Daniel Gultsch2016-01-1420-26/+169
| |
| * fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
| |
| * show /me messages in conference notifications without the name of the senderDaniel Gultsch2016-01-131-5/+10
| |
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-132-1/+9
| |
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-133-20/+40
| |
| * use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
| | | | | | | | Fixes https://github.com/siacs/Conversations/issues/1648
| * throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
| |
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-121-2/+2
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 09:27:53 +0000