aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-02-2310-62/+92
|\
| * 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
| |
| * 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-2052-121/+398
|\|
| * 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 ↵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-141-2/+2
| |
* | try to automatically rejoin muc after beeing kickedChristian S2016-02-141-1/+2
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-1412-69/+291
|\|
| * optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-143-29/+63
| | | | | | | | acts only when push is available. disable all non-push accounts to test properly
| * send push enable to server. simplified loggingDaniel Gultsch2016-02-133-2/+22
| |
| * fixed compile bug in free versionDaniel Gultsch2016-02-132-3/+3
| |
| * push gcm token on bind instead of every connectDaniel Gultsch2016-02-121-5/+3
| |
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-127-17/+82
| |
| * pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
| |
| * catch all axolotl parse exception at once. fixes #1692Daniel Gultsch2016-02-111-5/+4
| |
| * send muc messages after joinDaniel Gultsch2016-02-101-1/+2
| |
| * allow user to set MAM preferencesDaniel Gultsch2016-02-095-16/+119
| |
* | added missing strings/translationsChristian S2016-02-062-1/+10
| |
* | optimized subtitle in MUCsChristian S2016-02-062-22/+19
| |
* | match new presence modificationsChristian S2016-02-042-9/+2
| |
* | Add device name to client infoArtem Shipovskiy2016-02-043-0/+15
| |
* | removed duplicate stringChristian S2016-02-041-1/+0
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-0430-326/+892
|\|