aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
* | added condition to show 'disable foreground service' buttonChristian S2016-04-151-1/+1
* | make foreground service always enabledChristian S2016-04-152-6/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-144-37/+106
|\|
| * removed unused call to cancel eventsDaniel Gultsch2016-04-141-1/+0
| * create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-131-3/+5
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-131-2/+2
| * reverse order in contact chooserDaniel Gultsch2016-04-121-1/+1
| * minor code cleanupDaniel Gultsch2016-04-121-3/+1
| * republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-112-30/+97
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-111-1/+4
|\|
| * introduced setting to turn of notification ledDaniel Gultsch2016-04-091-1/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-092-8/+18
|\|
| * use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * use last received message id when querying archiveDaniel Gultsch2016-04-091-7/+17
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+10
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-071-0/+1
|\|
| * better detect broken pepDaniel Gultsch2016-04-051-0/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-041-6/+0
|\|
| * removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-031-7/+9
|\|
| * check max http file size when attaching filesDaniel Gultsch2016-04-011-4/+7
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-311-2/+1
| * save otr fingerprint in messageDaniel Gultsch2016-03-311-2/+2
| * Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
* | fixed crashes during updates on Android 6Christian S2016-03-301-0/+1
* | fixed bug in ShortcutBadgerChristian S2016-03-271-2/+2
* | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into developmentChristian S2016-03-271-2/+2
|\ \
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-1/+1
|\|
| * Typo `attempt`licaon-kter2016-03-221-1/+1
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-0/+1
|\|
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-201-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-042-20/+64
|\|
| * moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| * avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| * expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-1/+9
| * use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-291-5/+5
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-2/+38
| * Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-271-1/+1
| |\
| | * No possibility of multiple invocation of log exportfiaxh2016-02-241-1/+1
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-271-13/+18
|\ \ \
| * | | Revert "disallow message correction by default. fixes #1720"Christian S2016-02-271-1/+1
| |/ /
| * | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
| * | execute pending mam queries every time we come onlineDaniel Gultsch2016-02-261-1/+1
| * | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-12/+17
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-232-3/+9
|\| |
| * | set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+2
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 16:00:52 +0000