aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
|\| | | |
| * | | | use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
* | | | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-079-22/+49
|\| | | |
| * | | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-074-5/+6
| * | | | corrected getRealPathFromUrilookshe2016-03-072-4/+43
| * | | | Finally fixes FS#142lookshe2016-03-073-13/+0
* | | | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06302-5778/+20658
|\| | | |
| * | | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-062-7/+5
| * | | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-0220-981/+1331
| * | | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0234-142/+13
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 02:16:40 +0000