aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* moved merged files to correct locationlookshe2015-08-163-15/+16
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1616-409/+388
|\ | | | | | | | | | | 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-164-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-124-169/+263
| | | | | | | | | | - 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-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
| * Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-1161-2117/+3770
| |
| * 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-195-0/+33
| |
* | 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-19132-739/+702
|/ | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* moved color picker to libslookshe2015-04-154-514/+0
|
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-145-14/+26
| | | | 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-121-1/+3
| | | | 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-122-3/+18
| | | | fix in Settings, initialize with same values like in preferences.xml
* whatsapp-like smiley implementationlookshe2015-04-123-19/+143
|
* whatsapp-like smiley implemantationlookshe2015-04-121-1/+2
|
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵steckbrief2015-04-114-19/+25
|\ | | | | | | 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-113-6/+7
| |
* | Color choose dialogsteckbrief2015-04-116-11/+524
|/
* no trim of messages or passwordlookshe2015-04-115-9/+11
| | | | 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-311-1/+10
| | | | text input)
* Changes for emoticon parser reactivatedsteckbrief2015-03-312-6/+8
|
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3048-517/+1609
|\ | | | | | | | | | | | | | | | | 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
| * properly set chat states when receiving otr status messagesiNPUTmice2015-03-211-1/+1
| |
| * respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-215-3/+42
| |
| * wait for session iq to return sucessfully before sending other stanzas. ↵iNPUTmice2015-03-201-26/+42
| | | | | | | | fixed #1017
| * don't update presence for muc messagesiNPUTmice2015-03-191-5/+2
| |
| * Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseenDaniel Gultsch2015-03-194-8/+24
| |\ | | | | | | add delivery receipts for private muc msgs & enable update last-seen for muc-msgs
| | * # add delivery receipts for private muc msgsBrianBlade2015-03-184-8/+24
| | | | | | | | | | | | # enable update last-seen for muc-msgs
| * | Merge pull request #1043 from strb/choose_contact_multiple_squashedDaniel Gultsch2015-03-182-6/+121
| |\ \ | | | | | | | | Added multiple select to Choose Contact Activity (squashed)
| | * | Added multiple select to Choose Contact ActivityAndreas Straub2015-03-182-6/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing the Choose Contact Activity a boolean called "multiple" set to true, it now allows the user to select multiple contacts. Long pressing a contact enters multiple selection mode and the selection is confirmed using a button in the CAB. The Activity returns whether or not multiple contacts were selected using the same boolean. If multiple contacts were selected, an array of JID strings called "contacts" is returned. The Choose Contact Activity now also honors "filter_contacts", an array of strings containing JIDs that should not be displayed in the picker. The invite to conference dialog now uses this feature to enable inviting multiple contacts at once. Additionally, Invite Contact uses "filter_contacts" to only display contacts that are not yet participating in the conversation
| * | | Merge pull request #1036 from QuentinC/developmentDaniel Gultsch2015-03-181-1/+1
| |\ \ \ | | | | | | | | | | Green led color is better with "full-green"
| | * | | Green led color is better with "full-green"Quentin2015-03-041-1/+1
| | | | |
| * | | | Set file size also for cached avatarsHolger Weiß2015-03-171-29/+31
| | |/ / | |/| |
| * | | Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-114-11/+13
| | | |