aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-065-0/+560
|\
| * FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-0622-580/+771
| | | | | | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-038-1/+296
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-0314-173/+521
| | | | | | | | picture or not
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-303-0/+24
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-232-0/+19
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-238-13/+36
| | | | | | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* | Merge trz/rename into trz/rebasesteckbrief2015-10-222-0/+296
|\|
| * Access to preferences moved to global utility class ↵steckbrief2015-10-2123-343/+528
| | | | | | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
| * added comment for clarification, why the timestamp of the first msg of msg ↵steckbrief2015-10-171-1/+1
| | | | | | | | list is needed to query older msgs with mam
| * Removed unused importssteckbrief2015-10-151-4/+0
| |
| * Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-152-32/+64
| |
* | fix imports and namespacessteckbrief2015-10-051-0/+2
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-0/+62
|\| | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-056-35/+74
| | | | | | | | access to app information
* | fixed importstrz/1.5.2.2lookshe2015-10-054-10/+10
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-05131-27895/+0
|/ | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-18/+142
| | | | type and message status
* Note added where to change sth. for FS#70steckbrief2015-10-041-1/+2
|
* Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-048-3/+321
| | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-022-6/+9
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-211-3/+3
|
* moved merged files to correct locationlookshe2015-08-163-0/+167
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1614-409/+222
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* resolve of some compiler errorslookshe2015-08-133-1/+3
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1161-2115/+3783
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+5
|
* Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-195-0/+34
|
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19126-0/+26180
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 12:27:50 +0000