aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-054-0/+418
|\| | | | | | | | | | | | | 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
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-1/+19
| | | | settings class
* new settings to initialisation of Settingslookshe2015-04-121-1/+1
|
* added settings for accepting and downloading fileslookshe2015-04-121-2/+16
| | | | fix in Settings, initialize with same values like in preferences.xml
* Color choose dialogsteckbrief2015-04-111-1/+8
|
* - Avoiding accessing shared preferences to know if emoticons should be ↵steckbrief2015-01-201-0/+55
parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")