aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0622-579/+786
|\
| * 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-0321-172/+603
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-0318-173/+551
| | | | | | | | picture or not
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-307-1/+52
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-2312-30/+43
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-2312-30/+41
| | | | | | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-221-1/+2
|\|
| * Implements FS#78: Allow installation on SD cardsteckbrief2015-10-221-1/+2
| |
* | Merge trz/rename into trz/rebasesteckbrief2015-10-2225-351/+536
|\|
| * Access to preferences moved to global utility class ↵steckbrief2015-10-2124-350/+532
| | | | | | | | 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
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-163-1/+18
|\|
| * C+ changelog updatedsteckbrief2015-10-161-1/+2
| |
| * Fixes FS#82: Background color of conversation list item set to primary ↵steckbrief2015-10-162-1/+4
| | | | | | | | background color
| * Conversations Plus ChangeLog addedsteckbrief2015-10-161-0/+13
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-153-36/+64
|\|
| * Removed unused importssteckbrief2015-10-151-4/+0
| |
| * Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-152-32/+64
| |
* | fix imports and namespacessteckbrief2015-10-052-1/+3
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-057-36/+76
|\| | | | | | | | | | | | | | | 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
| * Merge branch 'master' of ssh://git.fucktheforce.de/conversations-plussteckbrief2015-10-051-2/+2
| |\
| * | Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-057-36/+76
| | | | | | | | | | | | access to app information
* | | fixed importslookshe2015-10-055-11/+11
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0526-19/+1151
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * | version bump to 0.0.50.0.5lookshe2015-10-051-2/+2
| |/
| * Publishing additional information in message details dialog such as message ↵steckbrief2015-10-044-28/+235
| | | | | | | | 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-0413-4/+473
| | | | | | | | | | | | | | 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
| * New logo added, fixes FS#56steckbrief2015-10-047-1/+449
| |
| * Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-023-10/+14
| |
| * Fixes FS#50: Replace phone numbers and email addresses in messages with linkssteckbrief2015-09-022-2/+2
| |
| * version bump to 0.0.40.0.4lookshe2015-08-211-2/+2
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-212-4/+28
| |\
* | | Merge branch 'trz/rename' (early part) into trz/rebaselookshe2015-10-050-0/+0
|\| | | |/ |/|
| * modified readmelookshe2015-08-171-328/+15
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-2/+1
| |\
| * | moved merged files to correct location0.0.3lookshe2015-08-163-15/+16
| | |
| * | version bump to 0.0.3lookshe2015-08-161-2/+2
| | |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1638-413/+519
| |\ \ | | | | | | | | | | | | | | | | | | | | 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-133-1/+3
| | | |
| * | | adjust version code to match fdroid regexlookshe2015-08-131-1/+1
| | | |
| * | | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11446-2761/+8554
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-192-4/+4
| | | | |
| * | | | 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-196-2/+43
| | | | |
| * | | | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19137-780/+743
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | | | fixes FS#42 - Smilie replacement in urllookshe2015-08-211-1/+25
| | | | |
* | | | | fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
| |_|_|/ |/| | |
* | | | fix wrong class type usagelookshe2015-08-161-2/+1
| |_|/ |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 21:21:28 +0000