aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+22
|\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
| * DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-171-0/+22
| | | | | | | | | | | | | | Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-1/+1
|\|
| * no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-204-4/+5
|\|
| * Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-204-4/+5
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
|\|
| * Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
| | | | | | | | hide own avatar in message display
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-6/+3
|\| | | | | | | | | | | | | | | | | Conflicts: 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/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-112-5/+3
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-8/+0
|\| | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
| * Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-101-8/+0
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|\| | | | | | | | | Conflicts: build.gradle
| * Merge remote branch 'master'steckbrief2016-03-082-4/+0
| |\
| * | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
| | |
* | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-082-4/+0
|\ \ \ | | |/ | |/|
| * | reset link and highlight colors to system defaultsteckbrief2016-03-082-4/+0
| |/
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-082-26/+42
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-298/+945
| |\
* | \ Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-082-26/+42
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/PublishProfilePictureActivity.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/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-011-26/+34
| | | | | | | | | | | | already trusted
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-26/+34
| | |
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-1/+2
| | |
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-1/+1
| | |
* | | Removed stupid message correctionsteckbrief2016-02-232-20/+0
| | |
* | | Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-231-9/+0
| | | | | | | | | | | | already done with a more convenient method
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-223-2/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-2/+22
| | |
| * | client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-2/+21
| | |
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+9
| | |
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-4/+4
| | |
* | | Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
| | |
* | | Fixed XML errors after mergesteckbrief2016-02-113-8/+9
| | |
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1119-297/+923
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | introduced boolean form field wrapperDaniel Gultsch2016-01-232-1/+14
| | |
| * | added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-221-0/+21
| | |
| * | changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-222-6/+10
| | |
| * | increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| | |
| * | use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
| | |
| * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-169/+212
| | |
| * | show per conference notification settings in details activityDaniel Gultsch2016-01-081-0/+27
| | |
| * | show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-081-76/+97
| | |
| * | Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+0
| | | | | | | | | | | | | | | fixes #1611 fixes #1602
| * | properly rotate avatarsDaniel Gultsch2016-01-041-2/+2
| | |
| * | show certificate informationDaniel Gultsch2015-12-231-0/+88
| | |
| * | initial tor supportDaniel Gultsch2015-12-011-1/+53
| | |
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-292-4/+4
| | |
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+11
| | |
| * | Reset the margins manually after rotatingsaqura2015-10-263-0/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 03:43:25 +0000