1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-23 04:57:58 +01:00
Commit graph

213 commits

Author SHA1 Message Date
Florian Schmaus
f8f70bc5fb
Merge pull request #229 from fuentesj11/update-disco-doc
Update disco doc
2018-04-04 14:50:20 +02:00
Florian Schmaus
a0d769225c
Merge pull request #228 from fuentesj11/update-providers-doc
Update providers.md
2018-04-04 14:49:49 +02:00
Florian Schmaus
b1b2c49e18
Merge pull request #227 from fuentesj11/update-processing-doc
Update processing.md
2018-04-04 14:49:27 +02:00
Florian Schmaus
bcf6d3ecef
Merge pull request #226 from fuentesj11/update-hoxt-doc
Update hoxt.md
2018-04-04 14:48:53 +02:00
Florian Schmaus
fe157b1a2a
Merge pull request #225 from fuentesj11/update-filetransfer-doc
Update filetransfer.md
2018-04-04 14:48:04 +02:00
Florian Schmaus
5f83edb86b
Merge pull request #221 from fuentesj11/update-docs3
Update/Edit invitation.md and mam.md
2018-04-04 14:47:19 +02:00
Florian Schmaus
2756759f67
Merge pull request #220 from fuentesj11/update-docs2
Update/Edit caps.md and consistent_colors.md
2018-04-04 14:45:33 +02:00
Florian Schmaus
58141940e9
Merge pull request #219 from fuentesj11/update-doc1
Update/Edit blockingcommand.md
2018-04-04 14:45:06 +02:00
Jesus Fuentes
9bd88e0df5 Update disco.md 2018-04-03 08:46:50 -05:00
Jesus Fuentes
b13178ddfd Update providers.md 2018-04-03 08:26:14 -05:00
Jesus Fuentes
3acc94f7e6 Update processing.md 2018-04-03 08:14:45 -05:00
Jesus Fuentes
969a3729d5 Update hoxt.md 2018-04-03 07:51:18 -05:00
Jesus Fuentes
2e4e593a97 Update filetransfer.md 2018-04-03 07:30:09 -05:00
Jesus Fuentes
32f8c345fb Update disco.md 2018-04-03 07:15:16 -05:00
Florian Schmaus
d92f24ea66
Merge pull request #224 from fuentesj11/update-docs6
Update/Edit dataforms.md
2018-04-03 07:49:41 +02:00
Florian Schmaus
b472ba0dd2
Merge pull request #223 from fuentesj11/update-docs5
Update/Edit messaging.md
2018-04-03 07:48:44 +02:00
Florian Schmaus
8a83d2245f
Merge pull request #222 from fuentesj11/update-docs4
Update/Edit messagemarkup.md
2018-04-03 07:48:05 +02:00
Jesus Fuentes
f0c5d1db74 Update/Edit documentation 2018-04-01 09:57:13 -05:00
Jesus Fuentes
2a3b7ca4ff Update/Edit documentation 2018-04-01 09:23:09 -05:00
Jesus Fuentes
74a4828df9 Update/Edit documentation 2018-04-01 09:17:57 -05:00
Jesus Fuentes
fba36dbff6 Update/Edit documentation 2018-04-01 09:12:31 -05:00
Jesus Fuentes
63de8abde5 Update/Edit documentation 2018-04-01 09:05:56 -05:00
Jesus Fuentes
31706c503b Update/Edit documentation 2018-04-01 08:59:27 -05:00
Jesus Fuentes
d60f3d1ee6 Update/Edit documentation 2018-04-01 08:43:29 -05:00
Florian Schmaus
193688e553 Merge branch '4.2' 2018-03-28 12:51:28 +02:00
Florian Schmaus
f42d9137b5 Merge branch '4.2' 2018-03-21 15:22:22 +01:00
1ac918c8d5
Fix typos, reformat table and use https links 2018-03-12 15:34:23 +01:00
b81f8fe18e Add support for XEP-0372: References
Add support for XEP-0372: References

Fixes SMACK-799
2018-03-12 13:37:19 +01:00
Jesus Fuentes
7791e53454 Fix found typos
Fix found typos in the documentation -Jesus
2018-02-28 07:30:18 -06:00
Son Goku
32262a9c54 Proofread Getting Started documentation 2018-02-26 08:18:43 -06:00
Guus der Kinderen
1b58581ca0
Fixed typo. 2018-02-24 14:02:10 +01:00
Florian Schmaus
026f3a2f8c Merge branch '4.2' 2018-02-22 14:54:48 +01:00
ce19ea4114 Add support for XEP-0382: Spoiler Messages
Fixes SMACK-795.
2018-02-22 08:51:54 +01:00
a729a7c43b Add support for XEP-0394: Message Markup
Fixes SMACK-794.
2018-02-21 20:49:01 +01:00
b3b76b9ff4 Add support for XEP-0359: Stable and Unique Stanza IDs
Fixes SMACK-798
2018-02-21 20:43:56 +01:00
Florian Schmaus
a48e8ef843 Merge branch '4.2' 2018-02-21 20:13:05 +01:00
e0af3db189 Add support for XEP-0392: Consistent Color Generation
Fixes SMACK-800.
2018-02-10 21:09:07 +01:00
Killer
8e3d3a7d14 Fix copy and paste issue in processing.md 2018-02-10 20:32:36 +01:00
Florian Schmaus
6f7d6a7f50 Smack 4.2.3
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAlp7XzVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFKdbQf8CpKmvAUqThaxSKUZKOzlH71BkneT7gdjLvDyvVLXkxZt+arC/Sx9WHXs
 OqP6XxxcUKpP9SVItyikEiyq4A4EAlYbtnGcAnJ2Zc04MorEvYtfePgX29WVMKa6
 VGZv4PyILAqRMBgQP6+TW++sgqB8JvlVY29e2igfM7mFjOiZdKkEPr2TZ995/XiT
 07WFxo72Fe7xXWTVWx5e2hbgC+KPtUFbm0rEBQ3x3seBbRQkn2f3sm8AItj6NKvz
 3W9Fzc7n+NY0l+84lX4mSB4Xq851AtOhJPeuSBijgYNM6V8yAXdCAHd0XJSiE89e
 /WwRIJAxLy74WzXs0wN3IAieKQhHdw==
 =/ZOL
 -----END PGP SIGNATURE-----

Merge tag '4.2.3'

Smack 4.2.3
2018-02-10 11:56:52 +01:00
4ca2f84d41
Fix typo in example 2018-01-23 16:31:43 +01:00
Florian Schmaus
81002c4fbd Merge branch '4.2' 2017-11-22 08:37:47 +01:00
Florian Schmaus
af0c1832fd Update gettingstarted.md 2017-11-21 22:57:10 +01:00
Yash Thakkar
efa3f123f9 Missing comma between password and serviceName 2017-09-24 15:00:43 +05:30
Florian Schmaus
43abd52d76 Smack 4.2.1
-----BEGIN PGP SIGNATURE-----
 
 iQGTBAABCgB9FiEEl3UFnzoh3OFr5PuuIjmn6PWFIFIFAlmR75tfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk3
 NzUwNTlGM0EyMURDRTE2QkU0RkJBRTIyMzlBN0U4RjU4NTIwNTIACgkQIjmn6PWF
 IFLeXggAjdgj7YVUe22NtamnROBj1c3PaWwgSY0gEjcyDPsOz5qeqNUdQLHbmt2j
 XQQpYZWKg1/1uoQHlsixaFKbGVctKRk72aNEodRfd1osta11WTOwZKEb8nI411Tt
 7M0Fhf430WZY6nioZiZIorsmid57fftJ2EMPlmjEDp2FD0AVGAXkEhCneGaPtt9Q
 hbWbepIy9tApeIH+QgmFLBmPLnFCaSg+X6NUden3Z21bUz5vH8pmcbeUVfsNB7kW
 nkkDuNwKHPFLgjuhcq7D+KAKRwNU7n8WEuHseRzM7bMCEB+S/rZok5KPXe/tV4v+
 YZKN2e+2yh4j5l4FT/fCzELfWcvrgA==
 =MV3G
 -----END PGP SIGNATURE-----

Merge tag '4.2.1'

Smack 4.2.1
2017-08-14 21:01:36 +02:00
Florian Schmaus
7404bf8fe7 Fix OMEMO entry in extensions/index.md 2017-08-14 20:15:27 +02:00
Florian Schmaus
b8ee8d808f Rework Smack debugger.
Also fixes SMACK-728.
2017-07-28 12:01:11 +02:00
Ingo Bauersachs
fc17cf4e2d Fix link to OMEMO extension 2017-07-23 10:58:55 +02:00
Florian Schmaus
f5ef42ec56 Merge branch '4.2' 2017-06-02 13:51:56 +02:00
e86700b040 Add OMEMO support
This commit adds the modules smack-omemo and smack-omemo-signal.
smack-omemo is licensed under the Apache license like the rest of the smack project.
smack-omemo-signal on the other hand is licensed under the GPLv3.
Due to the fact, that smack-omemo is not of much use without smack-omemo-signal,
the OMEMO feature can currently only be used by GPLv3 compatible software.
This may change in the future, when a more permissively licensed module becomes available.

Fixes SMACK-743.
2017-06-02 13:40:10 +02:00
Florian Schmaus
6bb001d274 New Jingle API groundwork
A start for the new Jingle API. Since Jingle is a single IQ with many
plugable extensions, there are some particularities we need to deal
with, e.g. jingle users have to register with JingleManager.

This is untested code. There may be drangons.
2017-05-30 08:45:27 +02:00