aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
| |
| * pulled more translationsiNPUTmice2015-03-191-0/+5
| |
| * 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-184-6/+134
| |\ \ | | | | | | | | Added multiple select to Choose Contact Activity (squashed)
| | * | Added multiple select to Choose Contact ActivityAndreas Straub2015-03-184-6/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |/ / | |/| |
| * | | pulled new translations from transifexiNPUTmice2015-03-1610-11/+348
| | | |
| * | | Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-114-11/+13
| | | |
| * | | add context menu entries for geo urisiNPUTmice2015-03-111-17/+33
| | | |
| * | | open location directly from notificationiNPUTmice2015-03-106-0/+25
| | | |
| * | | show geo uris as 'location' in overviewiNPUTmice2015-03-102-1/+9
| | |/ | |/|
| * | Merge pull request #1022 from Boris-de/cipher_blacklistDaniel Gultsch2015-03-082-0/+25
| |\ \ | | | | | | | | disable all really weak cipher suites
| | * | disable all really weak cipher suitesBoris Wachtmeister2015-03-072-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 ↵iNPUTmice2015-03-077-53/+230
| |/ / | | | | | | | | | location intent can be resolved
| * | fixed enter is send optioniNPUTmice2015-03-062-6/+10
| | |
| * | fixed npe in message parseriNPUTmice2015-03-061-4/+4
| | |
| * | avoid unnecessary thread creationiNPUTmice2015-03-053-17/+29
| | |
| * | added config option to disable string prep in jidsiNPUTmice2015-03-052-3/+5
| | |
| * | experimantal in memory jid cachingiNPUTmice2015-03-041-0/+15
| |/
| * added methods to count number of unread messagesDaniel Gultsch2015-03-022-0/+21
| |
| * mark all sent messages up to a marker as displayedDaniel Gultsch2015-03-012-13/+19
| |
| * merge messages with related status (unsend, send, send_received)iNPUTmice2015-03-011-1/+17
| |
| * catching out of memory run time exception in hasEnabledAccounts()iNPUTmice2015-02-281-0/+2
| |
| * pulled new translations from transifexiNPUTmice2015-02-275-23/+191
| |
| * use conversations green in notification lediNPUTmice2015-02-271-1/+1
| |
| * Merge pull request #1006 from QuentinC/developmentDaniel Gultsch2015-02-271-0/+1
| |\ | | | | | | Some changes to the LED color in notifications !
| | * Update NotificationService.javaQuentinC2015-02-271-1/+1
| | | | | | | | | Revert led light color
| | * - Update mBuilder in NotificationService.java to ensure that the led is ↵Quentin2015-02-271-1/+2
| | | | | | | | | | | | | | | | | | | | | displayed at the right color. CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 - Changed led Color to green to remember the icon color and led times
| * | don't add users with null nicks to muc user listiNPUTmice2015-02-271-1/+1
| | |
| * | hide change password menu item if server feature is unavailableiNPUTmice2015-02-271-7/+8
| |/
| * reset error status in edit account when reconnectingiNPUTmice2015-02-261-0/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 17:44:57 +0000