| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Implements FS#245: Implement FiletransferHttp (upload and delete), some ↵ | steckbrief | 2017-07-31 | 1 | -1/+2 |
| | | | | | minor bug fixes including to fail a JingleTransfer in case criterias are not met | ||||
| * | Fix wrong id for setColorColorAndText | steckbrief | 2017-06-11 | 1 | -2/+11 |
| | | |||||
| * | relates FS#241: Implementation of http download based on okhttp | steckbrief | 2017-02-06 | 6 | -42/+283 |
| | | |||||
| * | Improved error handling for filetransfer:http:delete, Check for httpupload ↵ | steckbrief | 2017-01-11 | 2 | -3/+34 |
| | | | | | feature available extended to include filetransfer:http as well, method to check if http upload is available moved from data class 'Account' to 'AccountUtil' | ||||
| * | Generic view util added to change the visibility of subclasses of View | steckbrief | 2017-01-11 | 2 | -2/+41 |
| | | |||||
| * | Custom toast view added | steckbrief | 2017-01-11 | 1 | -0/+101 |
| | | |||||
| * | Merge branch 'trz/rebase' into trz/rename | steckbrief | 2017-01-05 | 4 | -8/+126 |
| |\ | |||||
| | * | Added columns to fileparams table: url, original file name, key and iv | steckbrief | 2017-01-04 | 2 | -3/+91 |
| | | | | | | | | | | | auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up | ||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-10-20 | 4 | -34/+176 |
| | |\ | |/ |/| | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-05-09 | 2 | -0/+93 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 3 | -0/+62 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | Implements FS#235: Deletion of remote files uploaded via httpupload | steckbrief | 2016-09-29 | 4 | -34/+78 |
| | | | | | |||||
| * | | | | Fixes FS#230: Uncaught NullPointerException in DNSHelper | steckbrief | 2016-08-26 | 1 | -7/+12 |
| | | | | | |||||
| * | | | | Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵ | steckbrief | 2016-08-22 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | added | ||||
| * | | | | Implements FS#227: Store password encrypted in internal database | steckbrief | 2016-07-16 | 1 | -0/+110 |
| | |_|/ |/| | | |||||
| * | | | XmppConnectionService.markMessage moved to MessageUtil | steckbrief | 2016-05-09 | 2 | -0/+91 |
| | |/ |/| | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil | ||||
| * | | Fixes FS#204: Observe all used directories | steckbrief | 2016-04-23 | 2 | -0/+44 |
| | | | | | | | | | | | | | | | - 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 | ||||
| * | | Merge branch 'master' into introduce_cplus_database_version | steckbrief | 2016-04-18 | 2 | -1/+41 |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml | ||||
| | * | | Implements FS#137: build flavors | steckbrief | 2016-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | moved Config.java parameters to a flavorable configuration file | ||||
| | * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-17 | 1 | -0/+40 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Merge tag '1.11.7' into trz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -0/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-07 | 1 | -0/+48 |
| | | |\ | | |/ | |/| | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java | ||||
| * / | | DatabaseBackend updated to serve Conversatiosn Database version and ↵ | steckbrief | 2016-04-17 | 1 | -0/+16 |
| |/ / | | | | | | | | | | | | | 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) | ||||
| * | | Implements FS#187: Add single line copy to logcat view | steckbrief | 2016-04-07 | 1 | -0/+47 |
| | | | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-05 | 1 | -0/+36 |
| |\| | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-29 | 1 | -0/+75 |
| | |\ | |/ |/| | | | | | | | | | | | | | 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 | ||||
| * | | Introduction of a TextViewUtil to easily set attributes for TextViews | steckbrief | 2016-03-29 | 1 | -0/+75 |
| | | | |||||
| * | | Implements FS#173: Move access to colors to separate helper class | steckbrief | 2016-03-29 | 1 | -13/+16 |
| | | | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-25 | 1 | -4/+5 |
| |\| | |||||
| * | | Show file name instead of mime type (FS#102) | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 1 | -0/+2 |
| |\| | |||||
| * | | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 1 | -1/+8 |
| |\| | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 1 | -82/+0 |
| | |\ | |/ |/| | |||||
| * | | Fixes FS#155: Check FileHelper vs. FileUtils | steckbrief | 2016-03-12 | 2 | -87/+10 |
| | | | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-12 | 2 | -3/+31 |
| |\| | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 1 | -1/+2 |
| | |\ | |/ |/| | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | ||||
| * | | Fixes FS#139: Do not merge messages at all | steckbrief | 2016-03-11 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 1 | -1/+4 |
| |\| | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 1 | -1/+2 |
| |\| | |||||
| | * | use Build.VERSION_CODES.KITKAT instead of hard coded 19 | lookshe | 2016-03-08 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-07 | 2 | -4/+43 |
| |\| | |||||
| | * | corrected getRealPathFromUri | lookshe | 2016-03-07 | 1 | -2/+40 |
| | | | |||||
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 19 | -177/+662 |
| |\| | |||||
| | * | Packet sending helper moved to XmppSendUtil and methods in ↵ | steckbrief | 2016-02-23 | 1 | -0/+8 |
| | | | | | | | | | XmppConnectionService marked as deprecated | ||||
| | * | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) | steckbrief | 2016-02-23 | 1 | -0/+15 |
| | | | |||||
| | * | Imports organized | steckbrief | 2016-02-12 | 3 | -5/+0 |
| | | | |||||
| | * | Compilation errors and merge mixups fixed | steckbrief | 2016-02-11 | 1 | -0/+22 |
| | | | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-13 | 2 | -0/+79 |
| | |\ | |/ |/| | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 2 | -0/+132 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 3 | -126/+3 |
| | |\ \ | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |