aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/entities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-11/+2
|
* completely implements FS#161lookshe2016-03-171-9/+31
| | | | save state of treatAsDownloadable() and set on error to specified value
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-122-9/+22
|
* Fixes FS#139: Do not merge messages at allsteckbrief2016-03-112-106/+3
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-085-36/+118
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0612-543/+1166
|
* Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-101-2/+1
|
* Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-201-11/+11
| | | | activity to show logcat output and button to copy contents
* Access to preferences moved to global utility class ↵steckbrief2015-10-211-1/+2
| | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-164-29/+51
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* resolve of some compiler errors0.0.2lookshe2015-08-131-1/+1
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1111-218/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
* Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-193-0/+15
|
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1914-0/+3447
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 11:22:45 +0000