aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* added nick to conference jid exampleDaniel Gultsch2016-09-281-1/+1
|
* Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notificationDaniel Gultsch2016-09-282-10/+20
|\ | | | | Dismiss the notification when replying from a wear notification [needs review!]
| * Allow to dismiss the notification from a wear reply.Daniele Gobbetti2016-09-272-10/+20
| | | | | | | | | | - use different IDs in the same method for the PendingIntent - fix reply for GPG encrypted replies (untested)
* | simplified code that invokes the export logs serviceDaniel Gultsch2016-09-283-39/+9
| |
* | expert 'setting' to remove omemo identity. fixes #2038Daniel Gultsch2016-09-284-4/+68
|/
* always use ipv4 localhost for Orbot connectionsDaniel Gultsch2016-09-271-1/+3
|
* don't reset encryption choice to auto on archivingDaniel Gultsch2016-09-241-2/+0
|
* don't react to null and empty voice repliesDaniel Gultsch2016-09-211-3/+4
|
* don't use file provider for photo uris on android < N. fixes #2030Daniel Gultsch2016-09-211-1/+5
|
* don't wait for disco when not having stream managmentDaniel Gultsch2016-09-211-1/+1
|
* add timeouts to HTTPUrlConnections and allow cancelation of all sending filesDaniel Gultsch2016-09-203-4/+11
|
* Merge pull request #2028 from Mishiranu/feature-more-tablesDaniel Gultsch2016-09-204-21/+73
|\ | | | | Fix "Server info" table layout
| * Update Russian translationMishiranu2016-09-201-8/+8
| |
| * Fix "More table" layoutMishiranu2016-09-203-13/+65
| | | | | | | | Retain "More table" visibility on screen orientation change
* | fixed styling in blocking dialogDaniel Gultsch2016-09-202-5/+16
| |
* | pulled translations from transifexDaniel Gultsch2016-09-202-5/+15
|/
* add support for XEP-0377: Spam ReportingDaniel Gultsch2016-09-186-7/+53
|
* don't simply ignore null in message body but try to avoid itDaniel Gultsch2016-09-183-5/+10
|
* recreate activities when theme changedDaniel Gultsch2016-09-185-5/+36
|
* use proper paddings in dialogs on android < 5Daniel Gultsch2016-09-187-20/+43
|
* catch all throwables when loading contactsDaniel Gultsch2016-09-172-3/+3
|
* pulled translations from transifexDaniel Gultsch2016-09-1610-4/+68
|
* dont show delete file button when outside conversations directory. fixes #2007Daniel Gultsch2016-09-161-2/+5
|
* Merge branch 'master' of https://github.com/Mishiranu/Conversations into ↵Daniel Gultsch2016-09-162-37/+56
|\ | | | | | | Mishiranu-master
| * Allow text selection with multiple links in messageMishiranu2016-09-162-37/+56
| |
* | use history clear date as minimum date for mamDaniel Gultsch2016-09-165-10/+40
| |
* | deal with null bodys in message previewDaniel Gultsch2016-09-151-5/+3
| |
* | store jid if it was changed during bindDaniel Gultsch2016-09-142-3/+8
|/
* Merge pull request #2018 from SamWhited/sasl_anonymousDaniel Gultsch2016-09-142-1/+32
|\ | | | | SASL ANONYMOUS (no UI)
| * Use JID returned by the server during bindSam Whited2016-09-121-1/+1
| | | | | | | | Not just the resourcepart
| * Support ANONYMOUS SASLSam Whited2016-09-122-0/+31
| |
* | Merge branch 'pebble-notification' of ↵Daniel Gultsch2016-09-121-1/+1
|\ \ | | | | | | | | | https://github.com/danielegobbetti/Conversations into danielegobbetti-pebble-notification
| * | Use the last message in the content text instead of the first.Daniele Gobbetti2016-09-111-1/+1
| |/ | | | | | | | | | | | | | | This fixes the issue where the first message in the notification was sent to pebble (and possibly to other wear devices) for every update in the conversation, as reported in #1249. This is the same patch propoed in https://github.com/siacs/Conversations/issues/1249#issuecomment-245878335
* | don't use display version of jidsDaniel Gultsch2016-09-122-95/+99
| |
* | remember scroll position on rotate. fixes #2011Daniel Gultsch2016-09-122-11/+57
|/
* Fix typolicaon-kter2016-09-101-1/+1
|
* download own vcard avatar if none is set. fixes #2008Daniel Gultsch2016-09-094-11/+23
|
* pulled translations from transifexDaniel Gultsch2016-09-0814-2/+109
|
* provide hint on why conference can not be encryptedDaniel Gultsch2016-09-083-2/+71
|
* be a bit more careful when deleting and deactivating accountsDaniel Gultsch2016-09-076-22/+47
|
* show server not found muc errorDaniel Gultsch2016-09-064-2/+11
|
* remove explicit pebble support. treat as wear deviceDaniel Gultsch2016-09-061-25/+0
|
* show reply action on wear devicesDaniel Gultsch2016-09-061-2/+4
|
* don't use fileprovider when opening files on android M and belowDaniel Gultsch2016-09-042-7/+18
|
* don't crash when correcting waiting pgp encrypted messagesDaniel Gultsch2016-09-041-4/+12
|
* fixed recreation issues in StartConversationActivityDaniel Gultsch2016-08-313-977/+1031
|
* fixed typoDaniel Gultsch2016-08-311-2/+2
|
* don't show duplicate nofications on android 4Daniel Gultsch2016-08-311-15/+14
|
* broader exception catchersDaniel Gultsch2016-08-301-1/+1
|
* use file provider for taking picturesDaniel Gultsch2016-08-302-3/+5
|