1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-24 10:12:19 -05:00
Commit Graph

3387 Commits

Author SHA1 Message Date
Ash Ward
c489573ffb Accepting ProtoXEP Mediated Information eXchange (MIX) as XEP-0369 2016-01-07 15:52:44 +00:00
Ashley Ward
f6702e4a81 Merge pull request #135 from Kev/mix
Merge Mix (MUC2) ProtoXEP
2016-01-06 09:54:54 +00:00
Kevin Smith
9b767e70e1 Slightly update after offlist discussion
This removes the participant ID, as we want to use JIDs for this.
It also puts TODOs around discussions for use of 'real' pubsub for
messages and presence from the room and makes presence to the room
explicitly a normal presence stanza
2016-01-06 08:33:16 +00:00
Peter Saint-Andre
53359622db a bit more disco 2016-01-06 08:33:16 +00:00
Peter Saint-Andre
21793cd1d3 acks & sec 2016-01-06 08:33:15 +00:00
Peter Saint-Andre
5472b7ef79 0.0.1 2016-01-06 08:33:15 +00:00
Thijs Alkemade
120926b428 XEP-0071: Update plain version of blockquote example to escape <div/> 2016-01-05 12:02:31 -07:00
Matthew A. Miller
7d839f60a4 ProtoXEP jingle-ice: Updates to address Council feedback 2016-01-05 10:10:22 -07:00
Sam Whited
93724e9aca XEP-0363: Fix invalid XML in examples (tps)
Squashed commit of the following:

commit 923ffe878f2f8dcca56d1c5e8243539de1397f73
Author: Thijs Alkemade <me@thijsalkema.de>
Date:   Fri Dec 11 20:04:23 2015 +0100

    XEP-0363: Added missing `type`

commit 0e68bd49d8beaee7993a56b128762d6d2ca34c8a
Author: Thijs Alkemade <me@thijsalkema.de>
Date:   Fri Dec 11 18:18:45 2015 +0100

    XEP-0363: Fix XML in the examples
2016-01-05 10:57:03 -06:00
Ashley Ward
5d32c0be03 Merge pull request #133 from ashward/rfc6544
Made RFC6544 no longer work in progress
2015-12-17 12:59:41 +00:00
Ash Ward
4a2d823665 Made RFC6544 no longer work in progress 2015-12-17 12:57:24 +00:00
Ash Ward
c69a042e88 #132 Updated the &trickle; entity to reference "draft-ietf-ice-trickle" rather than "draft-ietf-mmusic-trickle-ice" 2015-12-17 10:59:45 +00:00
Ash Ward
1aada090c3 #132 Importing jingle-ice ProtoXEP from psa 2015-12-17 10:45:31 +00:00
Ash Ward
d5fb17baf0 Accepting 'tls-srv' ProtoXEP as XEP-0368 2015-12-15 20:53:19 +00:00
Ashley Ward
1d79afb3b6 Merge pull request #131 from moparisthebest/master
Update SRV records for XMPP over TLS draft
2015-12-15 20:48:33 +00:00
Ash Ward
9e7843e9bf Accepting the 'Message Attaching' ProtoXEP as XEP-0367 2015-12-15 20:28:27 +00:00
Matthew A. Miller
fe2bd885f4 XEP-0366: Initial published version approved by XMPP Council 2015-12-15 10:17:29 -07:00
7789c93a4e Update SRV records for XMPP over TLS draft 2015-12-15 01:34:25 -05:00
Matthew A. Miller
9da492b518 ProtoXEP Notification Inbox -- fixing versions 2015-12-08 10:23:27 -07:00
Philipp Hancke
92c060f3a7 remove label and mslabel from obsolete version of msid-draft. fix whitespace in code tags 2015-12-08 10:15:46 -07:00
Matthew A. Miller
2476089c80 ProtoXEP - Quality of Service (o.b.o Peter Waher) 2015-12-08 10:09:28 -07:00
Matthew A. Miller
12139d5ca7 Update ProtoXEP revision to pre-minor 2015-12-08 10:04:59 -07:00
Piotr Nosek
eca705e635 Add MUC Light XEP 2015-12-08 10:02:58 -07:00
b2989649f4 Initial draft of SRV records for XMPP over TLS 2015-12-08 09:50:22 -07:00
Valérian Saliou
0f93394aa2 Update personal details
Previous personal contact addresses became black-holes recently.
2015-12-08 09:42:17 -07:00
Peter Waher
b01bdca7cc Updated contact information and example JIDs
New contact information has been provided, and example JIDs are updated
to point to example.org.
2015-12-08 09:26:34 -07:00
Matthew A. Miller
59e523a57c remove PDF build steps from Makefile (fixes #121) 2015-11-20 11:49:25 -07:00
Matthew A. Miller
d361e430a7 Merge pull request #125 from winfried/master
Also use the prettify.js from the extentions directory.
2015-11-20 11:40:37 -07:00
Matthew A. Miller
516168eaed Merge pull request #122 from imaginator/master
Add missing resource
2015-11-20 11:34:38 -07:00
Winfried Tilanus
c74cd46b92 Also use the prettify.js from the extentions directory. 2015-11-16 20:45:03 +01:00
Peter Saint-Andre
1890796daa Merge pull request #124 from stpeter/master
fix CSS path for xmpp.org website
2015-11-16 09:51:13 -07:00
Peter Saint-Andre
eade8a6c99 fixed CSS path for website 2015-11-16 09:50:30 -07:00
Peter Saint-Andre
3305ed1358 Merge remote-tracking branch 'upstream/master' 2015-11-16 09:49:35 -07:00
Simon Tennant
340b0a4df1 Add missing resources
Per https://github.com/xsf/xsf-tools/issues/2 adding the two files
necessary for a complete build of the PDFs
2015-11-13 17:25:45 +01:00
Simon Tennant
0a5bb4f915 Merge remote-tracking branch 'xsf/master' 2015-11-13 17:24:42 +01:00
Matthew A. Miller
b3ea9bd059 Merge pull request #114 from SamWhited/typo-fix
Typo fix in entity versioning
2015-10-28 09:58:42 -06:00
Sam Whited
7d57fe0d09 Typo fix in entity versioning 2015-10-28 10:56:49 -05:00
JC Brand
76b358907a Fix typo ("cannot" repeated twice). 2015-10-28 09:35:27 -06:00
Daniel Gultsch
1b133e6047 introducing a protocol to negotiate omemo encrypted file tranfers over jingle 2015-10-28 09:23:25 -06:00
Andreas Straub
5eda2277f7 Add new OMEMO spec
Proposal for a new multi-end to multi-end encryption protocol
2015-10-28 09:16:55 -06:00
Matthew A. Miller
e4803f5592 Merge pull request #99 from SamWhited/make_preview
Add `make preview' to generate HTML on XML save
2015-10-27 09:30:22 -06:00
Sam Whited
8c69d78de4 Make sure make preview supports inbox files 2015-10-27 10:28:56 -05:00
Sam Whited
f7fc6e0d2d Add `make preview' to generate HTML on XML save
Uses inotifywatch to generate an HTML file anytime an XML file is saved.
2015-10-27 10:27:53 -05:00
Lance Stout
11cba41cd5 XEP-0215: Try resolving some ambiguities
XEP-0215: Add Lance as Co-Author, Bump namespace

XEP-0215: Add revision notes
2015-10-20 10:42:08 -06:00
Matthew A. Miller
7791061e82 XEP-0233 Deferred -> Experimental 2015-10-20 10:40:10 -06:00
Sam Whited
974e0fce16 Add new "message attaching" spec
Proposal to allow one message to be "attached" to another (a hint for
the client to display the messages side by side, even if other messages
were sent between them).
2015-10-20 10:34:25 -06:00
Sam Whited
c892cbc2f6 Add &sam; to list of common authors 2015-10-20 10:34:24 -06:00
Mili Verma
bee05d65aa Include support for Microsoft SSPI in xep-0233 2015-10-20 10:26:56 -06:00
Matthew A. Miller
1a18c0daa2 Merge pull request #92 from Flowdalic/makefile-improv
Makefile improvements
2015-10-20 10:19:23 -06:00
Philipp Hancke
559196ebba add note about whitespace 2015-10-15 10:28:00 -06:00