aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-285-24/+3
| | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage
* Unused imports / methods removedsteckbrief2016-02-243-27/+0
|
* Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6
|
* Fixed merge issue for resolving FS#47 (preferences involved in the decision ↵steckbrief2016-02-242-11/+1
| | | | for auto downloading image links moved to global Utility Class)
* Readded MessageDetailsDialog to message context menu after mergesteckbrief2016-02-241-0/+4
|
* Reviewed commit for FS#34 after mergesteckbrief2016-02-242-2/+2
|
* Packet sending helper moved to XmppSendUtil and methods in ↵steckbrief2016-02-232-18/+17
| | | | XmppConnectionService marked as deprecated
* Removed stupid message correctionsteckbrief2016-02-2334-167/+10
|
* Removed useless 'button-message' to load more messages. Implementation ↵steckbrief2016-02-2321-92/+8
| | | | already done with a more convenient method
* Changed access to presences according to new Presence representation in Csteckbrief2016-02-233-14/+15
|
* Removed non-existing member variablesteckbrief2016-02-231-1/+1
|
* Explicit applicationId removedsteckbrief2016-02-231-1/+0
|
* Fix visibility of updateStatusMessages method that LoadMoreMessages can worksteckbrief2016-02-231-1/+1
|
* Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
|
* Removed unnecessary dependencies to XmppConnectionService and added ↵steckbrief2016-02-235-43/+11
| | | | allowMessageCorrection to preferences
* merged string resourcessteckbrief2016-02-232-6/+0
|
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2293-359/+2460
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * version bump to 1.10.01.10.0Daniel Gultsch2016-02-211-2/+3
| |
| * show load more messages when auto loading is disabled and messages are still ↵Daniel Gultsch2016-02-212-6/+14
| | | | | | | | left on server
| * check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
| |
| * some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
| |
| * pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
| |
| * change uuid when replacing messagesDaniel Gultsch2016-02-202-1/+9
| |
| * decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| |
| * skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5
| |
| * don't reset whisper on reInit. fixes #1637Daniel Gultsch2016-02-191-3/+0
| |
| * pulled translations from transifexDaniel Gultsch2016-02-1929-253/+212
| |
| * never parse show in presences as offlineDaniel Gultsch2016-02-192-12/+16
| |
| * don't log start reasonDaniel Gultsch2016-02-171-1/+0
| |
| * only offer message correction for the very last messageDaniel Gultsch2016-02-174-8/+37
| |
| * fixed regression that caused messages in muc not being sendDaniel Gultsch2016-02-172-7/+8
| |
| * log reason why otr message won't be parsedDaniel Gultsch2016-02-161-1/+2
| |
| * fixed regression that caused ui to redraw a lotDaniel Gultsch2016-02-161-4/+8
| |
| * version bump to 1.10.0-beta and changelogDaniel Gultsch2016-02-162-2/+7
| |
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-162-5/+5
| |
| * Merge pull request #1700 from petmue/masterDaniel Gultsch2016-02-161-4/+4
| |\ | | | | | | Fixed some typos in the README.md
| | * Fixed some typos.petmue2016-02-161-4/+4
| |/
| * Update README.mdDaniel Gultsch2016-02-161-1/+10
| |
| * updated XEP listDaniel Gultsch2016-02-161-1/+5
| |
| * added gcm values file to gitignoreDaniel Gultsch2016-02-161-0/+2
| |
| * added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-166-19/+36
| | | | | | | | options to settings
| * added some OTR loggingDaniel Gultsch2016-02-162-5/+14
| |
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-1542-41/+228
| |
| * removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| |
| * add missing type='submit' attribute to enable push formDaniel Gultsch2016-02-151-0/+1
| |
| * pulled translations from transifexDaniel Gultsch2016-02-1511-9/+656
| |
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-142-1/+6
| | | | | | | | also update ui after that button has been pressed. fixes #1695
| * fixed server info push not showing up when unavailableDaniel Gultsch2016-02-143-4/+12
| |
| * be more carefull when checking push availabilityDaniel Gultsch2016-02-141-1/+3
| |
| * deleted invalid gcm stringsDaniel Gultsch2016-02-141-5/+0
| |