aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-152-0/+2
|\
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-152-0/+2
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-145-0/+0
|\|
| * Fixes FS#76: Notification adapted to new logosteckbrief2016-01-145-0/+0
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-081-1/+18
|\|
| * Fixes FS#107, Implements FS#77steckbrief2016-01-081-1/+18
| | | | | | | | Show the number of online resources in account view and enable show resources by clicking on the account jid
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-172-0/+2
|\|
| * Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-172-0/+2
| | | | | | | | nothing is copied
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-163-19/+40
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-163-19/+40
| | | | | | | | distinguishes between image resizing and compressing/saving
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-4/+6
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-041-4/+6
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-3/+6
|\|
| * Implements FS#89 - Change about informationsteckbrief2015-12-041-3/+6
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0420-108/+115
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-0420-108/+115
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-025-0/+40
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-0/+1
| | | | | | | | nce.thedevstack.de
| * Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-205-0/+39
| | | | | | | | activity to show logcat output and button to copy contents
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-035-1/+56
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-033-0/+28
| | | | | | | | picture or not
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-304-1/+28
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-232-3/+3
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-232-3/+3
| | | | | | | | 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-162-1/+4
|\|
| * Fixes FS#82: Background color of conversation list item set to primary ↵steckbrief2015-10-162-1/+4
| | | | | | | | background color
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0513-7/+242
|\| | | | | | | | | | | | | 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-043-10/+93
| | | | | | | | type and message status
| * Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-045-1/+152
| | | | | | | | | | | | | | 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-045-0/+0
| |
| * Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-021-4/+5
| |
| * Fixes FS#50: Replace phone numbers and email addresses in messages with linkssteckbrief2015-09-022-2/+2
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1619-0/+8
| |\ | |/ |/| | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11351-584/+3349
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-1/+1
| | |
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
| | |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-193-6/+6
| | | | | | | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-1618-0/+0
| | |
* | | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-121-0/+8
| |/ |/| | | | | | | - OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-11351-584/+3349
| |
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
|/
* moved color picker to libslookshe2015-04-1517-151/+0
|
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-144-68/+83
| | | | settings class
* changed last message in overview also to EmojiconTextView for displaying ↵lookshe2015-04-121-3/+6
| | | | smileys correctly
* added settings for accepting and downloading fileslookshe2015-04-1221-26/+57
| | | | fix in Settings, initialize with same values like in preferences.xml
* add missing resource fileslookshe2015-04-128-0/+0
|
* whatsapp-like smiley implementationlookshe2015-04-123-7/+22
|
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵steckbrief2015-04-113-3/+13
|\ | | | | | | trz/master
| * differ between received and read messagelookshe2015-04-113-3/+13
| |
* | Color choose dialogsteckbrief2015-04-1120-4/+164
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:36:56 +0000