aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #31 from siacs/masterChristian S.2015-08-302-1/+10
|\
| * fixed bug that prevented newly opened conversations to load the entire histor...Daniel Gultsch2015-08-302-1/+10
* | copy commitsChristian S2015-08-291-2/+2
|\|
| * use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-261-1/+1
* | Version 1.6.5Christian S2015-08-261-6/+4
|\|
| * Only announce device after publishing bundleAndreas Straub2015-08-261-2/+1
| * be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-261-3/+2
| * remove unused imports.Michael2015-08-251-1/+1
* | Merge pull request #27 from siacs/developmentChristian S.2015-08-242-30/+29
|\|
| * Merge branch 'master' into developmentDaniel Gultsch2015-08-232-9/+7
| |\
| | * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-232-9/+7
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-231-21/+22
| |\|
| | * don't make subsequent iq request when original stanza returned an errorDaniel Gultsch2015-08-231-21/+22
* | | some little image preview changesChristian S2015-08-191-21/+21
* | | forked NotificationService from siacs/developmentChristian S2015-08-191-16/+18
* | | copy commitsChristian S2015-08-191-1/+1
|\| |
| * | simulate old behaviour with messages being set to waiting while offlineDaniel Gultsch2015-08-191-1/+0
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-191-0/+1
| |\|
| | * fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d28668b7f3...Daniel Gultsch2015-08-191-0/+1
* | | reduced image preview sizeChristian S.2015-08-161-1/+1
* | | Merge branch 'siacs/development' into developmentChristian S2015-08-151-26/+24
|\| |
| * | fully depend on smDaniel Gultsch2015-08-151-26/+24
| |/
* | version 1.6.0Christian S2015-08-151-2/+1
|\|
| * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-151-2/+1
* | version 1.6.0 beta 3Christian S2015-08-122-14/+31
|\|
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-112-13/+22
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-101-0/+7
| * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-101-1/+2
* | copy commitsChristian S2015-08-023-17/+112
|\|
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-012-1/+98
| * Refactor axolotl message processing workflowAndreas Straub2015-07-311-1/+1
| * improved 'next encryption' selectionDaniel Gultsch2015-07-311-12/+8
| * show http downloaded images in notificationDaniel Gultsch2015-07-291-2/+3
| * set time on resend to current timeDaniel Gultsch2015-07-281-1/+2
* | copy commitsChristian S2015-07-232-25/+29
|\|
| * treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-1/+1
| * Add INACTIVE state for removed keysAndreas Straub2015-07-211-15/+16
| * Refactor axolotl send processing/caching flowAndreas Straub2015-07-201-4/+7
* | copy commitsChristian S2015-07-202-27/+86
|\|
| * attempt to fix the delay problemDaniel Gultsch2015-07-201-16/+20
| * Optimize importsAndreas Straub2015-07-202-3/+4
| * Fix set/remove OnUpdateBlocklistListenerAndreas Straub2015-07-201-5/+5
| * Ask for key trust when sending messagesAndreas Straub2015-07-191-6/+40
| * Handle file transmission properly in axolotlAndreas Straub2015-07-191-4/+12
| * Remove unneccessary codeAndreas Straub2015-07-191-2/+1
| * Fix trust status for outgoing messagesAndreas Straub2015-07-191-0/+4
| * Postpone initAccountService until roster loadedAndreas Straub2015-07-191-3/+1
| * Fix asynchronous axolotl message sendingAndreas Straub2015-07-191-2/+4
| * Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-8/+5
| * Migrate to new PEP layoutAndreas Straub2015-07-191-2/+1