Commit graph

Select branches

Hide pull requests

4.2

4.3

4.4

BodyProvider

GSO-006

OmemoManagerGetInstanceJid

avatars

bodyElement

bumpPGPainless

chat2IntTest

chatStatesChat2

clusterIntTest

cmeng_chatstates

documentation

exposeOxGenerateKeys

file_metadata

filetransferTypos

fixDeliveryReceipts

fixDocu

fixDocuLinks

fixGetUndecidedDevices

fixtable

idle

inbox

invitation

itemNotFoundFix

jetPR

jftPR

jingle

jingle2

jingle3

jinglePR

jinglePR1

libsignal

listEqualsHashcode

master

mercury_master

mix

muc_joined_rooms_bookmarks_note

omemo-legacy

omemoMaster

omemo_converse

omemo_media_sharing

open

openpgp

openpgpContactRework

ox_backup_code_generator

ox_provider_elements

ramabit.avatar

references

reorderProviders

reworkedStore

rosterStoreImp

sint-pubsub-moretests

smack-messenger

staleness

stateless_file_sharing

storerework

typos

url_address_information

xhtml_fix

#33

3.2.0

3.2.1

3.2.2

3.3.0

3.3.1

3.4.0

3.4.1

4.0.0

4.0.0-rc1

4.0.0-rc2

4.0.1

4.0.2

4.0.3

4.0.4

4.0.5

4.0.6

4.0.7

4.1.0

4.1.1

4.1.2

4.1.3

4.1.4

4.1.5

4.1.6

4.1.7

4.1.8

4.1.9

4.2.0

4.2.0-rc2

4.2.1

4.2.2

4.2.3

4.2.4

4.3.0

4.3.1

Mono Color

• e271532804
  
  More tests vanitasvitae 2017-07-06 17:44:02 +02:00
• 09f35f1613 Merge pull request #152 from vanitasvitae/filetransferTypos Florian Schmaus 2017-07-06 16:59:33 +02:00
• f3244f507e Merge branch 'fixReason' into jingle2 vanitasvitae 2017-07-06 16:57:36 +02:00
• 58c32639b5
  
  Allow parsing of JingleReason.AlternativeSession vanitasvitae 2017-07-06 16:55:12 +02:00
• bbaa367dfb
  
  Better test vanitasvitae 2017-07-06 16:54:21 +02:00
• 92117ec00b
  
  Temp vanitasvitae 2017-07-06 16:53:45 +02:00
• a11552eb63 Merge branch 'filetransferTypos' into jingle2 vanitasvitae 2017-07-06 14:15:33 +02:00
• 5479938052
  
  merge origin vanitasvitae 2017-07-06 14:11:20 +02:00
• 8bd3856fa1
  
  Fix typos in filetransfer package filetransferTypos vanitasvitae 2017-07-06 14:01:28 +02:00
• 87949f94b9
  
  Temp vanitasvitae 2017-07-06 14:00:36 +02:00
• aae2c7304d
  
  Add SendFileHandler vanitasvitae 2017-07-06 00:10:04 +02:00
• 428e077f52
  
  F omemo-legacy vanitasvitae 2017-07-05 21:01:11 +02:00
• 9d63baf55a Use assertXMLEqual() in SlotRequestCreateTest Florian Schmaus 2017-07-05 19:09:30 +02:00
• 858ba3f82a Fix HTTP File Upload's SlotRequest Florian Schmaus 2017-07-05 18:27:47 +02:00
• a3bb7e3f59
  
  Merge master vanitasvitae 2017-07-05 13:00:21 +02:00
• 6775cf862d Merge pull request #146 from vanitasvitae/fixProxyTest Florian Schmaus 2017-07-05 08:33:12 +02:00
• 99c1c93c2a Fix shouldPreserveAddressOrderOnInsertions test vanitasvitae 2017-07-03 17:26:57 +02:00
• 55d41e3390
  
  More tests vanitasvitae 2017-07-03 15:22:34 +02:00
• 12a8645864 Merge pull request #148 from vanitasvitae/js5btbFixes Florian Schmaus 2017-07-03 11:48:17 +02:00
• e87c463927 Merge pull request #147 from vanitasvitae/fixMUC Florian Schmaus 2017-07-03 11:48:03 +02:00
• cd2d55944f Merge pull request #144 from vanitasvitae/jingleFTElements Florian Schmaus 2017-07-03 11:46:23 +02:00
• ddabe439b4 build.gradle: Add hint about obtaining system console Florian Schmaus 2017-07-03 10:36:05 +02:00
• b0298619ba build.gradle: Use "def console" Florian Schmaus 2017-07-03 10:32:20 +02:00
• 80b6e30196 build.gradle: Do not resolve runtime configuration to early Florian Schmaus 2017-07-03 10:29:57 +02:00
• 3a79566f1c OmemoManager: Fix typo s/defaulDeviceId/defaultDeviceId/ Florian Schmaus 2017-06-24 10:02:41 +02:00
• 2d4312272c Allow roster pushes from our full JID Florian Schmaus 2017-07-02 22:11:14 +02:00
• 7e76bc1ae5
  
  More changes to the Jingle package: vanitasvitae 2017-07-03 10:35:46 +02:00
• 63aa2f017c
  
  Fallback works like a charm vanitasvitae 2017-07-03 10:13:00 +02:00
• 4a8251fbe5
  
  Transport Fallback works, but does not save file vanitasvitae 2017-07-02 21:25:50 +02:00
• 3fbdcfee63 Smack 4.2.1-beta2-SNAPSHOT Florian Schmaus 2017-07-02 19:26:03 +02:00
• 7723210afb Smack 4.2.1-beta1 Florian Schmaus 2017-07-02 18:54:31 +02:00
• 685edde308 Don't hardcode "SunX509" as key algorithm Florian Schmaus 2017-07-02 18:30:53 +02:00
• 3d032298a5 Deal with cases wehre HostAddress.fqdn is null Florian Schmaus 2017-07-02 18:09:15 +02:00
• f26f3bb503
  
  Use static threadPool and start working on async file transfer method vanitasvitae 2017-07-02 15:42:16 +02:00
• 71486ab68e
  
  Merge moreJingleTests vanitasvitae 2017-06-30 18:56:56 +02:00
• 322587c0b5
  
  More jingle related tests vanitasvitae 2017-06-30 18:49:34 +02:00
• ff899d05e7
  
  Merge js5btbFixes vanitasvitae 2017-06-30 16:33:27 +02:00
• bae840ebf7
  
  Enforce jingle s5b transport invariants. vanitasvitae 2017-06-30 15:36:02 +02:00
• dec275aa4d
  
  Add methods to enable/disable proxy types vanitasvitae 2017-06-30 15:19:36 +02:00
• 5bd01b7385
  
  Add Jingle File Transfer elements and JingleUtil class vanitasvitae 2017-06-30 15:03:13 +02:00
• 248e76ff46
  
  Fix receiving OMEMO MUC messages vanitasvitae 2017-06-30 14:30:19 +02:00
• 59a600a0b6
  
  progress vanitasvitae 2017-06-29 21:53:57 +02:00
• 541c9ecfdd Fix compile errors in jingle code Florian Schmaus 2017-06-29 18:09:25 +02:00
• 1d53889874 Merge pull request #145 from vanitasvitae/singleJingleTransport Florian Schmaus 2017-06-28 21:02:52 +02:00
• 9be94ca474 Merge pull request #143 from vanitasvitae/jingleS5B Florian Schmaus 2017-06-28 21:00:15 +02:00
• a395b11ee9
  
  S5B Works now in both directions and with external proxy vanitasvitae 2017-06-28 14:48:39 +02:00
• d537463a42
  
  SOCKS5 works again :) vanitasvitae 2017-06-28 11:40:27 +02:00
• 3058ebe8b9
  
  Some debug output and small fixes vanitasvitae 2017-06-27 20:27:38 +02:00
• 9d6a858b23
  
  So close... vanitasvitae 2017-06-26 23:18:34 +02:00
• 69b3f5837e
  
  Rewrote S5BTransportSession vanitasvitae 2017-06-26 18:05:17 +02:00
• 5eba48b7d8 Merge branch 'singleJingleTransport' into jingle2 vanitasvitae 2017-06-26 15:05:40 +02:00
• 20eabca1b3
  
  Also replace list with single transport-info info vanitasvitae 2017-06-26 15:04:22 +02:00
• 0952c20a5c
  
  Coming closer... vanitasvitae 2017-06-25 23:19:35 +02:00
• daa6b6b999
  
  Some bugfixes vanitasvitae 2017-06-25 22:18:19 +02:00
• 04e898083c
  
  Much progress, such wow vanitasvitae 2017-06-25 16:59:09 +02:00
• d7cf19aca7
  
  Add createCandidateUsed vanitasvitae 2017-06-25 16:39:02 +02:00
• a3d6562791
  
  Even more progress vanitasvitae 2017-06-25 16:28:59 +02:00
• 5ebd07ac3c
  
  More progress vanitasvitae 2017-06-25 15:13:56 +02:00
• 09548855dd
  
  Progess vanitasvitae 2017-06-25 14:25:17 +02:00
• ad32393b61 Merge branch 'fixMUC' into jingle2 vanitasvitae 2017-06-25 12:32:57 +02:00
• 76e40e2682
  
  Fix muc receiving vanitasvitae 2017-06-25 11:31:11 +02:00
• 699a19d3c2
  
  Add S5B candidate accept/error vanitasvitae 2017-06-24 17:46:03 +02:00
• a101de29fd
  
  JIBB works vanitasvitae 2017-06-24 12:14:05 +02:00
• c4ef2c9552
  
  Temp vanitasvitae 2017-06-23 23:41:40 +02:00
• 136af25342
  
  Add JingleTransportSession classes vanitasvitae 2017-06-23 22:48:28 +02:00
• ab82a58e0f Merge branch 'fixProxyTest' into jingle2 vanitasvitae 2017-06-23 13:01:50 +02:00
• 847a39b6ab
  
  Fix shouldPreserveAddressOrderOnInsertions test vanitasvitae 2017-06-23 12:51:07 +02:00
• cb3583e510
  
  IBB sending works using worker thread vanitasvitae 2017-06-22 14:47:39 +02:00
• 5dc37ab239
  
  Fixed some sending issues vanitasvitae 2017-06-21 18:03:31 +02:00
• 4f03cf9a24
  
  Add send method vanitasvitae 2017-06-21 17:34:34 +02:00
• 4649defe4f
  
  Add license vanitasvitae 2017-06-21 16:16:52 +02:00
• 4c7feeb11b
  
  Receive in thread vanitasvitae 2017-06-21 16:16:27 +02:00
• 6a4695b6c6
  
  Receive file vanitasvitae 2017-06-21 16:11:13 +02:00
• 7f04265bb9
  
  Some improvements vanitasvitae 2017-06-21 15:54:20 +02:00
• ecd29a1ea8
  
  s5b createTransport vanitasvitae 2017-06-21 15:42:00 +02:00
• 4c1ee37ea7
  
  Reuse S5B methods vanitasvitae 2017-06-21 15:28:32 +02:00
• 6023350364
  
  Progress vanitasvitae 2017-06-21 14:11:42 +02:00
• 9da555f57e Merge branch 'singleJingleTransport' into jingle2 vanitasvitae 2017-06-21 13:44:27 +02:00
• e2b8ffdf22
  
  Switch to single transport instead of list vanitasvitae 2017-06-21 13:42:02 +02:00
• 16a7f31a46
  
  Add sendingThread vanitasvitae 2017-06-21 00:16:47 +02:00
• 96197d4092
  
  Add transport replace actions vanitasvitae 2017-06-19 19:22:59 +02:00
• 2bac6297ee
  
  Split JingleFileTransferSession in incoming and outgoing vanitasvitae 2017-06-19 17:55:04 +02:00
• 73f9af474e
  
  Send session-accept/decline vanitasvitae 2017-06-19 15:26:10 +02:00
• e0a54c19d6
  
  First state representing stuff vanitasvitae 2017-06-19 14:44:35 +02:00
• 1912ebb8d0
  
  Join JingleSession and Handler in JingleFT vanitasvitae 2017-06-19 10:47:24 +02:00
• b14aca744f
  
  Add Jingle SOCKS5Bytestream transport method vanitasvitae 2017-06-19 10:11:08 +02:00
• b91a9c120f
  
  More ground work vanitasvitae 2017-06-18 16:47:49 +02:00
• dcb5da76d6 Merge branch 'jingleFTElements' into jingle2 vanitasvitae 2017-06-18 14:12:04 +02:00
• e5502564b1
  
  Add more errors vanitasvitae 2017-06-18 14:11:37 +02:00
• 49868ecdaf Merge branch 'jingleFTElements' into jingle2 vanitasvitae 2017-06-18 13:08:56 +02:00
• d3af7cd9c1
  
  Add creating methods to JingleUtil vanitasvitae 2017-06-18 13:08:09 +02:00
• d0701f8fd1 Merge branch 'jingleS5B' into jingle2 vanitasvitae 2017-06-18 12:32:08 +02:00
• 781e809390
  
  Merge jingleFTElements vanitasvitae 2017-06-18 12:31:54 +02:00
• 21435a72c5
  
  Reorder imports vanitasvitae 2017-06-18 12:29:44 +02:00
• 20e6580469 Merge remote-tracking branch 'upstream/master' into jingleFTElements vanitasvitae 2017-06-18 12:11:17 +02:00
• 3c4441af4f
  
  Reorder imports vanitasvitae 2017-06-18 12:08:47 +02:00
• 93a363377e Merge remote-tracking branch 'upstream/master' into jingleS5B vanitasvitae 2017-06-18 12:05:15 +02:00
• d34539126b
  
  Fix import order vanitasvitae 2017-06-18 11:52:56 +02:00
• 1e6b9b8257 Merge remote-tracking branch 'upstream/master' into jingle2 vanitasvitae 2017-06-18 11:28:39 +02:00
• 08a4ee4eb2 Reworked some Jingle unit tests to use Junit's "expected=" Florian Schmaus 2017-06-17 16:08:32 +02:00