aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
* | | | | externalized string 'Retry decryption'trz/merge_1.10.1steckbrief2016-02-283-1/+3
* | | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-2823-98/+230
|\| | | |
| * | | | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-262-2/+2
| * | | | execute pending mam queries every time we come onlineDaniel Gultsch2016-02-261-1/+1
| * | | | hide add account icons when single_account is set to trueDaniel Gultsch2016-02-242-1/+5
| * | | | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-2410-22/+76
| * | | | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-246-26/+66
| | |/ / | |/| |
| * | | Merge pull request #1715 from fiaxh/gpg_decryption_failedDaniel Gultsch2016-02-245-2/+21
| |\ \ \
| | * | | Retry decryption from message menufiaxh2016-02-235-2/+21
| | |/ /
| * | | set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-232-2/+2
| * | | update notification after message correctionDaniel Gultsch2016-02-231-0/+1
| * | | reset pending subscription request when receiving roster updateDaniel Gultsch2016-02-231-0/+2
| * | | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| |/ /
| * | properly trigger show load more messages in mucsDaniel Gultsch2016-02-221-2/+10
| * | turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-226-39/+54
* | | Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-285-24/+3
* | | 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 f...steckbrief2016-02-242-11/+1
* | | 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 XmppConnectionServ...steckbrief2016-02-232-18/+17
* | | Removed stupid message correctionsteckbrief2016-02-2334-167/+10
* | | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-2321-92/+8
* | | Changed access to presences according to new Presence representation in Csteckbrief2016-02-233-14/+15
* | | Removed non-existing member variablesteckbrief2016-02-231-1/+1
* | | 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 allowMess...steckbrief2016-02-235-43/+11
* | | merged string resourcessteckbrief2016-02-232-6/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-2283-346/+2218
|\| |
| * | show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-212-6/+14
| * | 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
| * | made clear that archiving preferences are server sideDaniel Gultsch2016-02-162-5/+5
| * | added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-166-19/+36
| * | added some OTR loggingDaniel Gultsch2016-02-162-5/+14