aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-161-19/+30
| | | | distinguishes between image resizing and compressing/saving
* Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-201-0/+3
| | | | activity to show logcat output and button to copy contents
* Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+8
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-2/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-2/+24
| |
* | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-3/+3
|/ | | | | | "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-61/+62
| | | | settings class
* added settings for accepting and downloading fileslookshe2015-04-121-6/+25
| | | | fix in Settings, initialize with same values like in preferences.xml
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵steckbrief2015-04-111-0/+6
|\ | | | | | | trz/master
| * differ between received and read messagelookshe2015-04-111-0/+6
| |
* | Color choose dialogsteckbrief2015-04-111-3/+5
|/
* Configurable LED color (Attention: Expert setting because currently only ↵steckbrief2015-03-311-0/+5
| | | | text input)
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-0/+6
|\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+7
| |
* | Merge master-originsteckbrief2015-02-201-5/+12
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * Remove legacy SSL supportSam Whited2015-01-191-5/+0
| |
| * Add option to swap enter/emoticon keySam Whited2015-01-141-0/+5
| |
| * Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-091-0/+7
| | | | | | | | (default == off)
* | Setting added for parsing emoticons or notTristan Zur2015-01-111-0/+5
|/
* Add quiet hours featureSam Whited2014-12-141-2/+23
|
* happy hanukkahiNPUTmice2014-11-161-0/+5
|
* turn on foreground service in expert settingsiNPUTmice2014-11-151-0/+5
|
* Convert about dialog to activitySam Whited2014-11-041-6/+2
|
* Add about dialog with license infoSam Whited2014-11-041-0/+7
|
* Make conversations the root projectSam Whited2014-10-221-0/+114
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 05:42:11 +0000