aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-203-145/+40
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-3/+15
|\| | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-12/+0
|\|
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-172-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.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/ConversationActivity.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/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java 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-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| * | always notify by default in conferencesDaniel Gultsch2016-04-141-1/+1
| | |
| * | return own jid as true counterpart on self messages in mucDaniel Gultsch2016-04-131-0/+3
| | |
| * | don't show contact details when in conversations with selfDaniel Gultsch2016-04-091-0/+4
| | |
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-054-17/+45
|\| |
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-312-1/+18
| | |
| * | save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
| | |
| * | include form fields into caps hash calculationDaniel Gultsch2016-03-311-2/+17
| | |
| * | made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
|\| |
* | | Merge branch 'trz/rebase' into trz/merge_1.11.1lookshe2016-03-201-9/+31
|\ \ \
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-9/+31
| |\| |
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-11/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
| * | simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
| | |
* | | small bugfixeslookshe2016-03-121-0/+3
| | |
* | | removed duplicated sourcelookshe2016-03-121-8/+5
| | |
* | | Added method to get body from message if hasMeCommand and harmonized ↵lookshe2016-03-122-10/+23
| | | | | | | | | | | | extraction of fileextension (FS#38)
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-106/+3
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-085-36/+118
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-041-3/+15
| | |
| * | add a few more know file extensionsDaniel Gultsch2016-03-042-6/+9
| | |
| * | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-011-9/+63
| | | | | | | | | | | | already trusted
| * | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-291-1/+1
| | |
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-8/+23
| | |
| * | made hashtable in roster store jids instead of stringsDaniel Gultsch2016-02-281-9/+7
| | |
* | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-061-4/+4
| | |
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-4/+12
| | |
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-4/+0
| | |
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-286-28/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.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/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-243-5/+31
| | |
| * | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-3/+7
| | |
| * | Merge pull request #1715 from fiaxh/gpg_decryption_failedDaniel Gultsch2016-02-241-0/+1
| |\ \ | | | | | | | | PGP Retry decryption from message menu
| | * | Retry decryption from message menufiaxh2016-02-231-0/+1
| | | |
| * | | reset pending subscription request when receiving roster updateDaniel Gultsch2016-02-231-0/+2
| | | |
| * | | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| |/ /
| * | turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-15/+19
| | |
* | | Reviewed commit for FS#34 after mergesteckbrief2016-02-242-2/+2
| | |
* | | Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-232-20/+0
| | | | | | | | | | | | already done with a more convenient method
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-224-21/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
| | |
| * | never parse show in presences as offlineDaniel Gultsch2016-02-191-11/+15
| | |
| * | only offer message correction for the very last messageDaniel Gultsch2016-02-172-4/+26
| | |
| * | added some OTR loggingDaniel Gultsch2016-02-161-4/+7
| | |
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-5/+53
| | |
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-167-50/+410
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 02:01:57 +0000