| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'trz/rebase' into trz/rename | steckbrief | 2017-01-05 | 22 | -314/+584 |
| |\ | |||||
| | * | related to FS#237 | steckbrief | 2017-01-05 | 1 | -1/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/trz/rename' into trz/rebase | steckbrief | 2017-01-05 | 5 | -58/+68 |
| | |\ | |||||
| | * | | Fixed errors with notificationstrz/beta-7 | steckbrief | 2017-01-04 | 2 | -5/+8 |
| | | | | |||||
| | * | | Version set to beta-6trz/beta-6 | steckbrief | 2017-01-04 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed NPE in FileParams.setKeyAndIv | steckbrief | 2017-01-04 | 1 | -11/+13 |
| | | | | |||||
| | * | | Added columns to fileparams table: url, original file name, key and ivtrz/beta-5 | steckbrief | 2017-01-04 | 22 | -312/+579 |
| | | | | | | | | | | | | | | | | auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up | ||||
| | * | | Adjusted maven URLtrz/beta-4 | steckbrief | 2017-01-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | versioncode and versionname updated in build.gradle | steckbrief | 2016-11-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'trz/rebase' (early part) into trz/rename | steckbrief | 2017-01-05 | 0 | -0/+0 |
| |\| | | |/ |/| | |||||
| | * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-10-20 | 100 | -846/+3421 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-05-09 | 13 | -111/+140 |
| | |\ \ | |||||
| | * | | | version name set to beta-3trz/beta-3 | steckbrief | 2016-05-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-04-23 | 22 | -71/+560 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/rebase | steckbrief | 2016-04-18 | 10 | -80/+94 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge commit 'remotes/origin/trz/rename~4' into trz/rebase | steckbrief | 2016-04-18 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | Hide number of unread message counter if there are no new messages | steckbrief | 2016-12-29 | 1 | -3/+5 |
| | | | | | | | | |||||
| * | | | | | | | Implement FS#239: Show number of unread messages in conversations overview | steckbrief | 2016-12-28 | 2 | -44/+59 |
| | | | | | | | | |||||
| * | | | | | | | Fixes FS#237: Enable long click in layout instead of programmatically | steckbrief | 2016-10-23 | 3 | -15/+7 |
| | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | | Fixes FS#29: Own Avatar not loaded | steckbrief | 2016-09-29 | 1 | -3/+9 |
| | | | | | | | |||||
| * | | | | | | Implements FS#235: Deletion of remote files uploaded via httpupload | steckbrief | 2016-09-29 | 38 | -631/+790 |
| | | | | | | | |||||
| * | | | | | | Fixes FS#230: Uncaught NullPointerException in DNSHelper | steckbrief | 2016-08-26 | 1 | -7/+12 |
| | | | | | | | |||||
| * | | | | | | Fixes conditions for cplus db upgrades | steckbrief | 2016-08-23 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Javadoc added and access to xmppConnectionService moved | steckbrief | 2016-08-23 | 2 | -5/+14 |
| | | | | | | | |||||
| * | | | | | | Fixes FS#229: prompt for confirmation before deleting a file | steckbrief | 2016-08-23 | 4 | -9/+41 |
| | | | | | | | |||||
| * | | | | | | Confirmation dialog added before sending delete command for remote file | steckbrief | 2016-08-23 | 6 | -23/+84 |
| | | | | | | | |||||
| * | | | | | | services.filetransfer.httpupload moved to new namespace ↵ | steckbrief | 2016-08-23 | 11 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | services.filetransfer.http.upload; delete parts of services.filetransfer.http moved to .delete package | ||||
| * | | | | | | xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ↵ | steckbrief | 2016-08-23 | 15 | -28/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | parts of xmpp.filetransfer.http moved to .delete package | ||||
| * | | | | | | Improved error handling for httpupload | steckbrief | 2016-08-22 | 1 | -4/+7 |
| | | | | | | | |||||
| * | | | | | | Basic filetransfer http delete implementation; Exceptions for IqPacketError ↵ | steckbrief | 2016-08-22 | 25 | -16/+550 |
| | | | | | | | | | | | | | | | | | | | | | | | | | added | ||||
| * | | | | | | Merge remote-tracking branch 'remotes/origin/filetransfer' | steckbrief | 2016-08-22 | 46 | -205/+1679 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Related to FS#131, FS#129, FS#220: | steckbrief | 2016-06-06 | 14 | -83/+472 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FileTransferFailureReason including types introduced. A failure can be recoverable, non-recoverable or limited recoverable - in case file transfer with the highest weight factor fails, the next file transfer method is used - improved logging - javadoc comments added | ||||
| | * | | | | | | FileTransfer reworked (first steps - functionality as is), HttpUpload | steckbrief | 2016-05-29 | 39 | -199/+1165 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separated, some bugfixes - HttpUpload moved into own package - FileTransfer managed by a central manager class, several FileTransferService implementation can be used - Security initializations moved to ConversationsPlusApplication - Access to PowerManager moved to ConversationsPlusApplication - Removed unused code fragments - Access to HttpConnectionManager is now static | ||||
| | * | | | | | | Fixed javadoc of HttpUploadHint | steckbrief | 2016-05-26 | 1 | -1/+11 |
| | | | | | | | | |||||
| | * | | | | | | Fixed javadoc of PubSub Element Generation/Parsing | steckbrief | 2016-05-26 | 3 | -5/+114 |
| | | |_|_|_|/ | |/| | | | | |||||
| * / | | | | | Implements FS#227: Store password encrypted in internal database | steckbrief | 2016-07-16 | 5 | -4/+280 |
| |/ / / / / | |||||
| * | | | / | XmppConnectionService.markMessage moved to MessageUtil | steckbrief | 2016-05-09 | 13 | -108/+132 |
| | |_|_|/ |/| | | | | | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil | ||||
| * | | | | Fixes FS#204: Observe all used directories | steckbrief | 2016-04-23 | 8 | -48/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | | | Related to FS#134: check if oldversion is smaller then new version on ↵ | steckbrief | 2016-04-23 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | upgrading c+ db | ||||
| * | | | | Removed download decision MUST if the message contains jabber:x:oob:oob/url | steckbrief | 2016-04-19 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Persist Message.treatAsDownloadable | steckbrief | 2016-04-19 | 2 | -2/+15 |
| | | | | | |||||
| * | | | | Related to FS#134: Set Message flags according to httpupload hint | steckbrief | 2016-04-19 | 3 | -0/+9 |
| | | | | | |||||
| * | | | | Merge branch 'master' into introduce_cplus_database_version | steckbrief | 2016-04-18 | 70 | -312/+638 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml | ||||
| | * | | | Implements FS#137: build flavors | steckbrief | 2016-04-18 | 4 | -50/+89 |
| | | | | | | | | | | | | | | | | | moved Config.java parameters to a flavorable configuration file | ||||
| | * | | | Related to FS#199: fixed merge hickups (message correction setting removed, ↵ | steckbrief | 2016-04-18 | 2 | -8/+1 |
| | | | | | | | | | | | | | | | | | key for other expert settings readded) | ||||
| | * | | | Related to FS#199: Removed unnecessary build configuration variable to hide ↵ | steckbrief | 2016-04-18 | 2 | -6/+3 |
| | | | | | | | | | | | | | | | | | disable button on foreground service notification | ||||
| | * | | | Related to FS#199: Removed unnecessary differentiation between a ↵ | steckbrief | 2016-04-18 | 3 | -16/+1 |
| | | |/ | |/| | | | | | | | conversation with the own account | ||||
| | * | | removed unused string | lookshe | 2016-04-17 | 1 | -1/+0 |
| | | | | |||||
| | * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-04-17 | 71 | -275/+573 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | @Overrides addedtrz/merge_1.11.7 | lookshe | 2016-04-17 | 1 | -0/+6 |
| | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |