aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-02-2721-58/+175
|\
| * Revert "disallow message correction by default. fixes #1720"Christian S2016-02-272-2/+2
| | | | | | | | This reverts commit 7fd6a37e670682e5e7cc3c0a4cb1939e09b0f291.
| * version bump to 1.10.1 and changelogDaniel Gultsch2016-02-262-2/+6
| |
| * 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
| |\ | | | | | | PGP Retry decryption from message menu
| | * Retry decryption from message menufiaxh2016-02-235-2/+21
| | |
* | | updated German translationChristian S2016-02-231-1/+2
| | |
* | | removed push from changlogChristian S2016-02-231-2/+0
| | | | | | | | | it isn't available in Pix-Art Messenger
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-2312-64/+97
|\| |
| * | 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
| | |
| * | Revert "disable predexing on travis"Daniel Gultsch2016-02-232-103/+95
| | | | | | | | | | | | This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28.
| * | disable predexing on travisDaniel Gultsch2016-02-232-95/+103
| | |
| * | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| | |
| * | fixed typo in travis.ymlDaniel Gultsch2016-02-231-1/+1
| | |
| * | fixed formating in travis configDaniel Gultsch2016-02-231-1/+1
| | |
| * | added remark that users don't need their own app serverDaniel Gultsch2016-02-231-1/+3
| | |
| * | tell travis to build free versionDaniel Gultsch2016-02-231-0/+2
| | |
| * | update build instructions in readmeDaniel Gultsch2016-02-231-2/+4
| |/
| * 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
| |
| * version bump to 1.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
| |
* | removed duplicate stringsChristian S2016-02-202-7/+0
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-2058-127/+426
|\|
| * 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
| |