aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* optimize importsChristian Schneppe2016-05-313-5/+1
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-311-53/+54
|\
| * execute phone contact changes in singlethreadexecutorDaniel Gultsch2016-05-311-53/+44
| * handle app links for conferencesDaniel Gultsch2016-05-301-0/+10
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-281-8/+27
|\|
| * schedule first idle ping on service creationDaniel Gultsch2016-05-281-0/+4
| * added idle ping in 10min intervalsDaniel Gultsch2016-05-281-8/+23
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-272-11/+41
|\|
| * use first letter to draw tiles for avatarsDaniel Gultsch2016-05-271-1/+10
| * don't push default muc conf twiceDaniel Gultsch2016-05-271-0/+3
| * add 'create conference' dialogDaniel Gultsch2016-05-261-3/+20
| * show contact avatar in muc users unless that contact has its own avatarDaniel Gultsch2016-05-261-1/+1
| * make newly created conferences private by defaultDaniel Gultsch2016-05-261-9/+10
* | Revert "Prevent presences from being cleared on connection"Christian Schneppe2016-05-231-1/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-221-0/+3
|\|
| * update ui after affiliation changesDaniel Gultsch2016-05-211-0/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-202-8/+15
|\|
| * also save form elements in disco storageDaniel Gultsch2016-05-191-2/+2
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-171-14/+4
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-161-0/+1
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-162-6/+22
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-151-6/+1
|\|
| * send caps hash in muc joinDaniel Gultsch2016-05-151-6/+1
| * show presence of other resources as templateDaniel Gultsch2016-05-131-0/+10
| * reset attempt count when reconnecting because of timeoutDaniel Gultsch2016-05-121-0/+3
| * use 'phone' or 'tablet' as default resourceDaniel Gultsch2016-05-121-1/+1
| * add lock domain and magic create domain to known hostsDaniel Gultsch2016-05-101-0/+6
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-4/+2
* | show presence of other resources as templateDaniel Gultsch2016-05-131-0/+10
* | reset attempt count when reconnecting because of timeoutDaniel Gultsch2016-05-131-0/+3
* | use 'phone' or 'tablet' as default resourceDaniel Gultsch2016-05-131-1/+1
* | add lock domain and magic create domain to known hostsDaniel Gultsch2016-05-131-0/+6
* | do not show last-seen metric in UIDaniel Gultsch2016-05-131-4/+2
* | changed LED notification color to blueChristian S2016-05-051-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-7/+8
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-5/+5
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-051-2/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-041-8/+61
|\|
| * spelling fixesklemens2016-05-041-1/+1
| * ping all accounts at the same timeDaniel Gultsch2016-05-021-5/+17
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-0/+1
| * don't create templates for empty status messagesDaniel Gultsch2016-04-231-2/+6
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-2/+38
* | changed updater a bitChristian S2016-04-232-6/+5
* | hide disable account via config switchChristian S2016-04-231-3/+5
* | Prevent presences from being cleared on connectionChristian S2016-04-231-2/+1
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-0/+12
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+12
* | changed default values to match preferences.xmlChristian S2016-04-162-4/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-5/+11
|\|