| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
moves XmlHelper to xml package because it is only needed for xml handling
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
picture resize
|
| |
|
|
|
|
| |
FS#251 (Privacy and Security settings), refactoring of location of some interfaces
|
| |
|
|
|
|
| |
title
|
|
|
|
| |
minor bug fixes including to fail a JingleTransfer in case criterias are not met
|
| |
|
| |
|
|
|
|
| |
feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil'
|
| |
|
| |
|
|\ |
|
| |
| |
| |
| |
| | |
auto download of files moved from MessageParser to MessageAdapter
download and open file representation cleaned up
|
| |\
| |/
|/| |
|
| |\ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
added
|
| |_|/
|/| | |
|
| |/
|/|
| |
| | |
XmppConnectionService.attachLocationToConversation moved to ConversationUtil
|
| |
| |
| |
| |
| |
| |
| | |
- Implementing the FileObserver in a separate class, with mask to watch only deletions not everything
- Add observation of all directories which could contain a sent/received file
- Change observers if the folder names are changed via settings
- markMessage method moved from XmppConnectionService to MessageUtil
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
gradle/wrapper/gradle-wrapper.properties
src/main/res/values/strings.xml
|
| | |
| | |
| | |
| | | |
moved Config.java parameters to a flavorable configuration file
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
src/main/res/values-bg/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |\
| | |/
| |/|
| | |
| | | |
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
|
|/ /
| |
| |
| |
| |
| |
| | |
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)
|
| | |
|
|\| |
|
| |\
| |/
|/|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.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/TrustKeysActivity.java
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
|
| | |
|
| | |
|
|\| |
|
| | |
|
|\| |
|
|\| |
|
| |\
| |/
|/| |
|
| | |
|
|\| |
|
| |\
| |/
|/|
| |
| | |
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
|
| | |
|
|\| |
|