Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of repos.thedevstack.de:conversations-plus | steckbrief | 2018-05-07 | 1 | -1/+1 |
|\ | |||||
| * | version code increased0.0.8-beta3 | steckbrief | 2018-05-07 | 1 | -1/+1 |
| | | |||||
| * | introduces new message state model | steckbrief | 2018-05-06 | 60 | -1147/+1905 |
| | | |||||
* | | adds missing class | steckbrief | 2018-05-06 | 1 | -0/+26 |
| | | |||||
* | | introduces new message state model | steckbrief | 2018-05-05 | 59 | -1147/+1879 |
|/ | |||||
* | Avoids going to sleep for at most 2000ms while retrieving file size via HTTP ↵ | steckbrief | 2018-05-05 | 1 | -2/+18 |
| | | | | HEAD | ||||
* | removes XmppConnectionService access from IqParser | steckbrief | 2018-03-29 | 1 | -2/+2 |
| | |||||
* | introduces XmlContainerElement to ease searching for child elements and ↵ | steckbrief | 2018-03-29 | 4 | -3/+17 |
| | | | | moves XmlHelper to xml package because it is only needed for xml handling | ||||
* | improves TextViewUtil | steckbrief | 2018-03-11 | 1 | -6/+29 |
| | |||||
* | fixes problems while loading FileParams from db | steckbrief | 2018-03-05 | 1 | -10/+12 |
| | |||||
* | moves xmpp url linkify to TextViewUtil | steckbrief | 2018-03-05 | 2 | -49/+56 |
| | |||||
* | improves remote file status display and loading of remote files | steckbrief | 2018-02-26 | 13 | -414/+479 |
| | |||||
* | fixes FS#257 - Fix policy 31 violation | steckbrief | 2018-02-26 | 1 | -1/+3 |
| | |||||
* | improves ViewUtil | steckbrief | 2018-02-26 | 2 | -0/+31 |
| | |||||
* | introduces cancel status for file transfers, fixes NPE in file sharing after ↵ | steckbrief | 2018-02-16 | 15 | -16/+56 |
| | | | | picture resize | ||||
* | properly handle downloadable links0.0.8-beta2 | steckbrief | 2018-01-31 | 3 | -4/+13 |
| | |||||
* | Introducing product flavor 'beta' and removing product flavor 'playstore'0.0.8-beta1 | steckbrief | 2018-01-28 | 15 | -196/+16 |
| | |||||
* | Simplifying introduction of new XEP implementations, implements FS#250 and ↵ | steckbrief | 2017-08-07 | 60 | -400/+1280 |
| | | | | FS#251 (Privacy and Security settings), refactoring of location of some interfaces | ||||
* | Implements XEP-0202 Entity Time, moves Software Version to xmpp package, ↵ | steckbrief | 2017-08-06 | 18 | -58/+225 |
| | | | | moves namespace definitions for mam, carbons and avatar to xmpp package | ||||
* | Refactoring: Avatar class moved from package xmpp.pep to dto | steckbrief | 2017-08-06 | 20 | -21/+20 |
| | |||||
* | avatar handling refactored | steckbrief | 2017-08-06 | 32 | -903/+1086 |
| | |||||
* | Implements FS#249: Remove code duplication for avatar creation | steckbrief | 2017-08-05 | 8 | -189/+140 |
| | |||||
* | Implements FS#217: Rework display of /me messages | steckbrief | 2017-08-02 | 8 | -497/+744 |
| | |||||
* | Using a generator approach for generating PresencePackets | steckbrief | 2017-08-02 | 7 | -100/+133 |
| | |||||
* | Implements FS#247 and FS#248: Show online status and typing notification in ↵ | steckbrief | 2017-08-02 | 6 | -19/+109 |
| | | | | title | ||||
* | Implements FS#106: Add expert setting to log xml trace | steckbrief | 2017-08-01 | 5 | -1/+19 |
| | |||||
* | Implements FS#245: Implement FiletransferHttp (upload and delete), some ↵ | steckbrief | 2017-07-31 | 30 | -207/+278 |
| | | | | minor bug fixes including to fail a JingleTransfer in case criterias are not met | ||||
* | Fixed 'Only one Looper may be created per thread' RuntimeException according ↵ | steckbrief | 2017-07-06 | 1 | -1/+4 |
| | | | | to https://stackoverflow.com/questions/23038682/java-lang-runtimeexception-only-one-looper-may-be-created-per-thread/24115631#24115631 | ||||
* | 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 | 45 | -807/+1053 |
| | |||||
* | Formatting of remote file status adjusted | steckbrief | 2017-01-11 | 2 | -3/+3 |
| | |||||
* | Improved error handling for filetransfer:http:delete, Check for httpupload ↵ | steckbrief | 2017-01-11 | 14 | -79/+160 |
| | | | | 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 | 7 | -0/+601 |
| | |||||
* | 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 notifications | steckbrief | 2017-01-04 | 2 | -5/+8 |
| | | | |||||
| * | | Version set to 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 iv | 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 URL | 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-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 |
| |\ \ \ \ \ |