aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-226-32/+112
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * show load more messages when auto loading is disabled and messages are still ↵Daniel Gultsch2016-02-211-6/+10
| | | | | | | | left on server
| * skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5
| |
| * don't reset whisper on reInit. fixes #1637Daniel Gultsch2016-02-191-3/+0
| |
| * only offer message correction for the very last messageDaniel Gultsch2016-02-171-3/+6
| |
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-1/+1
| |
| * added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-161-1/+2
| | | | | | | | options to settings
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-153-15/+74
| |
| * removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| |
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-142-1/+6
| | | | | | | | also update ui after that button has been pressed. fixes #1695
| * fixed server info push not showing up when unavailableDaniel Gultsch2016-02-141-2/+2
| |
| * fixed compile bug in free versionDaniel Gultsch2016-02-131-1/+1
| |
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+13
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-165-41/+155
|\| | | | | | | | | | | | | | | | | | | | | | | 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
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-1/+63
| |
| * fixed performance regression in on scroll listenerDaniel Gultsch2016-02-041-1/+6
| |
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-043-9/+49
| |
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵Daniel Gultsch2016-02-022-35/+39
| |\ | | | | | | | | | into singpolyma-disco-caps
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-242-35/+39
| | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it
| * | fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
| | |
* | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-02-131-2/+13
| | |
* | | Fixed settings synchronizationsteckbrief2016-02-121-60/+66
| | |
* | | Imports organizedsteckbrief2016-02-1220-110/+28
| | |
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-123-20/+1
| | |
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-118-140/+58
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1133-983/+3785
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-012-2/+2
| | |
| * | 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-011-1/+4
| | | | | | | | | | | | conference has errors
| * | show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-265-4/+55
| | |
| * | 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-251-7/+23
| | |
| * | added FormWrapper and form field validationDaniel Gultsch2016-01-236-4/+144
| |/
| * introduced boolean form field wrapperDaniel Gultsch2016-01-234-13/+62
| |
| * added support for field types jid-single and text-privateDaniel Gultsch2016-01-234-4/+59
| |
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-231-1/+2
| |
| * 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-223-0/+123
| |
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| |
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| |
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-222-17/+32
| |
| * add convenience to get an account object from a spinnerDaniel Gultsch2016-01-211-15/+19
| |
| * add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
| |
| * 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
| | |
| * | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
| |/
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| |
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+7
| |
| * fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 23:53:34 +0000