| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 61 | -2117/+3770 |
| | | |||||
| * | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference | steckbrief | 2015-06-19 | 1 | -2/+4 |
| | | |||||
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 5 | -0/+33 |
| | | |||||
| * | moved color picker to libs | lookshe | 2015-04-15 | 4 | -514/+0 |
| | | |||||
| * | changed received and read confirmation setting to one list and put it to ↵ | lookshe | 2015-04-14 | 5 | -14/+26 |
| | | | | | settings class | ||||
| * | check with lowercase to also match JPEG, JPeg ... | lookshe | 2015-04-13 | 1 | -1/+1 |
| | | |||||
| * | changed last message in overview also to EmojiconTextView for displaying ↵ | lookshe | 2015-04-12 | 1 | -1/+3 |
| | | | | | smileys correctly | ||||
| * | better and perhaps faster way for checking if a message is downloadable | lookshe | 2015-04-12 | 1 | -10/+18 |
| | | |||||
| * | new settings to initialisation of Settings | lookshe | 2015-04-12 | 1 | -1/+1 |
| | | |||||
| * | implementation for downloading only when enabled wlan | lookshe | 2015-04-12 | 4 | -3/+30 |
| | | |||||
| * | added settings for accepting and downloading files | lookshe | 2015-04-12 | 2 | -3/+18 |
| | | | | | fix in Settings, initialize with same values like in preferences.xml | ||||
| * | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 3 | -19/+143 |
| | | |||||
| * | whatsapp-like smiley implemantation | lookshe | 2015-04-12 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵ | steckbrief | 2015-04-11 | 4 | -19/+25 |
| |\ | | | | | | | trz/master | ||||
| | * | show online status under avatar in same way for muc as the send button does | lookshe | 2015-04-11 | 1 | -13/+18 |
| | | | |||||
| | * | differ between received and read message | lookshe | 2015-04-11 | 3 | -6/+7 |
| | | | |||||
| * | | Color choose dialog | steckbrief | 2015-04-11 | 6 | -11/+524 |
| |/ | |||||
| * | no trim of messages or password | lookshe | 2015-04-11 | 5 | -9/+11 |
| | | | | | check password with only spaces separately | ||||
| * | correct parsing of led color | lookshe | 2015-04-11 | 1 | -1/+1 |
| | | |||||
| * | timestamp parsing reverted | steckbrief | 2015-03-31 | 1 | -5/+20 |
| | | |||||
| * | Configurable LED color (Attention: Expert setting because currently only ↵ | steckbrief | 2015-03-31 | 1 | -1/+10 |
| | | | | | text input) | ||||
| * | Changes for emoticon parser reactivated | steckbrief | 2015-03-31 | 2 | -6/+8 |
| | | |||||
| * | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 48 | -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 messages | iNPUTmice | 2015-03-21 | 1 | -1/+1 |
| | | | |||||
| | * | respond to unreadable OTR messages with error message. fixed #1021 | iNPUTmice | 2015-03-21 | 5 | -3/+42 |
| | | | |||||
| | * | wait for session iq to return sucessfully before sending other stanzas. ↵ | iNPUTmice | 2015-03-20 | 1 | -26/+42 |
| | | | | | | | | | fixed #1017 | ||||
| | * | don't update presence for muc messages | iNPUTmice | 2015-03-19 | 1 | -5/+2 |
| | | | |||||
| | * | Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen | Daniel Gultsch | 2015-03-19 | 4 | -8/+24 |
| | |\ | | | | | | | add delivery receipts for private muc msgs & enable update last-seen for muc-msgs | ||||
| | | * | # add delivery receipts for private muc msgs | BrianBlade | 2015-03-18 | 4 | -8/+24 |
| | | | | | | | | | | | | | # enable update last-seen for muc-msgs | ||||
| | * | | Merge pull request #1043 from strb/choose_contact_multiple_squashed | Daniel Gultsch | 2015-03-18 | 2 | -6/+121 |
| | |\ \ | | | | | | | | | Added multiple select to Choose Contact Activity (squashed) | ||||
| | | * | | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 2 | -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/development | Daniel Gultsch | 2015-03-18 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Green led color is better with "full-green" | ||||
| | | * | | | Green led color is better with "full-green" | Quentin | 2015-03-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Set file size also for cached avatars | Holger Weiß | 2015-03-17 | 1 | -29/+31 |
| | | |/ / | |/| | | |||||
| | * | | | Do not Strigprep JIDs from database | Mateusz "maxmati" Nowoty?ski | 2015-03-11 | 4 | -11/+13 |
| | | | | | |||||
| | * | | | add context menu entries for geo uris | iNPUTmice | 2015-03-11 | 1 | -17/+33 |
| | | | | | |||||
| | * | | | open location directly from notification | iNPUTmice | 2015-03-10 | 1 | -0/+25 |
| | | | | | |||||
| | * | | | show geo uris as 'location' in overview | iNPUTmice | 2015-03-10 | 1 | -1/+7 |
| | | |/ | |/| | |||||
| | * | | Merge pull request #1022 from Boris-de/cipher_blacklist | Daniel Gultsch | 2015-03-08 | 2 | -0/+25 |
| | |\ \ | | | | | | | | | disable all really weak cipher suites | ||||
| | | * | | disable all really weak cipher suites | Boris Wachtmeister | 2015-03-07 | 2 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With #959 all ciphers of the platform were enabled, but this also includes several suites that are considered as very weak, even down to NULL- and anon-ciphers which disable completely disable encryption and/or authentication. Especially the anon-ciphers could be easily used for a mitm-attack. To remove all weak ciphers a blacklist with patterns of cipher-names was added to Config.java. The blacklist is based on the "mandatory discards" that Mozilla suggests to not use for TLS-servers because they are weak or known to be broken. https://wiki.mozilla.org/Security/Server_Side_TLS#Mandatory_discards | ||||
| | * | | | display geo uris as location. show 'send loction' in share menu if request ↵ | iNPUTmice | 2015-03-07 | 5 | -48/+215 |
| | |/ / | | | | | | | | | | location intent can be resolved | ||||
| | * | | fixed enter is send option | iNPUTmice | 2015-03-06 | 2 | -6/+10 |
| | | | | |||||
| | * | | fixed npe in message parser | iNPUTmice | 2015-03-06 | 1 | -4/+4 |
| | | | | |||||
| | * | | avoid unnecessary thread creation | iNPUTmice | 2015-03-05 | 3 | -17/+29 |
| | | | | |||||
| | * | | added config option to disable string prep in jids | iNPUTmice | 2015-03-05 | 2 | -3/+5 |
| | | | | |||||
| | * | | experimantal in memory jid caching | iNPUTmice | 2015-03-04 | 1 | -0/+15 |
| | |/ | |||||
| | * | added methods to count number of unread messages | Daniel Gultsch | 2015-03-02 | 2 | -0/+21 |
| | | | |||||
| | * | mark all sent messages up to a marker as displayed | Daniel Gultsch | 2015-03-01 | 2 | -13/+19 |
| | | | |||||
| | * | merge messages with related status (unsend, send, send_received) | iNPUTmice | 2015-03-01 | 1 | -1/+17 |
| | | | |||||
| | * | catching out of memory run time exception in hasEnabledAccounts() | iNPUTmice | 2015-02-28 | 1 | -0/+2 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |