aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-057-36/+76
| | | | access to app information
* 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-045-0/+0
|
* 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
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-211-3/+3
|\
| * fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
| |
* | moved merged files to correct locationlookshe2015-08-163-15/+16
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1635-409/+396
|\| | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
| * fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-163-3/+15
| |
| * Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-1622-137/+8
| |
| * Fixes FS#15 - Adding smiley only possible at the endlookshe2015-08-161-21/+13
| | | | | | | | Removed unnecessary ClickedListeners
| * Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-167-29/+21
| | | | | | | | Fixes FS#34 - review all calls for String.trim()
| * - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-125-169/+271
| | | | | | | | | | - OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation
| * Fixes FS#38 - Issues with URLs with multiple dots in file namelookshe2015-08-121-7/+18
| |
| * Fixes FS#33 - Get back the commentlookshe2015-08-121-0/+5
| |
| * Fixes FS#20: Limitation of end conversation swipe to left sidesteckbrief2015-08-111-58/+59
| |
* | resolve of some compiler errorslookshe2015-08-133-1/+3
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11413-2699/+7139
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11413-2701/+7126
| |
| * Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+4
| |
| * Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-196-2/+42
| |
* | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-1/+1
| |
* | 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-19136-764/+727
|/ | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* moved color picker to libslookshe2015-04-1521-665/+0
|
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-149-82/+109
| | | | settings class
* check with lowercase to also match JPEG, JPeg ...lookshe2015-04-131-1/+1
|
* changed last message in overview also to EmojiconTextView for displaying ↵lookshe2015-04-122-4/+9
| | | | smileys correctly
* better and perhaps faster way for checking if a message is downloadablelookshe2015-04-121-10/+18
|
* new settings to initialisation of Settingslookshe2015-04-121-1/+1
|
* implementation for downloading only when enabled wlanlookshe2015-04-124-3/+30
|
* added settings for accepting and downloading fileslookshe2015-04-1223-29/+75
| | | | fix in Settings, initialize with same values like in preferences.xml
* add missing resource fileslookshe2015-04-128-0/+0
|
* whatsapp-like smiley implementationlookshe2015-04-126-26/+165
|
* whatsapp-like smiley implemantationlookshe2015-04-121-1/+2
|
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵steckbrief2015-04-117-22/+38
|\ | | | | | | trz/master
| * show online status under avatar in same way for muc as the send button doeslookshe2015-04-111-13/+18
| |
| * differ between received and read messagelookshe2015-04-116-9/+20
| |
* | Color choose dialogsteckbrief2015-04-1126-15/+688
|/
* no trim of messages or passwordlookshe2015-04-117-9/+15
| | | | check password with only spaces separately
* correct parsing of led colorlookshe2015-04-111-1/+1
|
* timestamp parsing revertedsteckbrief2015-03-311-5/+20
|
* Configurable LED color (Attention: Expert setting because currently only ↵steckbrief2015-03-313-1/+17
| | | | text input)
* Changes for emoticon parser reactivatedsteckbrief2015-03-312-6/+8
|
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3082-610/+2937
|\ | | | | | | | | | | | | | | | | 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
| * pulled translationsiNPUTmice2015-03-225-0/+21
| |