2602 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Peter Saint-Andre	7ef6dbe89a	typo	2012-05-29 10:18:56 -06:00
Kevin Smith	954811eb0d	Significant rework - layout should be a little clearer and protocol more current. ... Still needs lots of wordsmithing and TBD-completion.	2012-05-29 10:58:36 +01:00
Peter Saint-Andre	d50f1754c0	1.2	2012-05-28 21:21:23 -06:00
Peter Saint-Andre	f4ca43867b	Merge branch 'master' of athena.jabber.org:xmpp	2012-05-24 16:23:56 -06:00
Kevin Smith	52e13b1f23	Updating first three (preamblish) sections of FMUC to be more in line with current thinking	2012-05-23 11:07:01 +01:00
Peter Saint-Andre	696de54a33	typo	2012-05-22 14:54:47 -06:00
Peter Saint-Andre	08701ceaa1	deleted the commented sections, clarified one bullet point, pointed to RFC 3749 from security considerations	2012-05-22 14:36:22 -06:00
Peter Saint-Andre	e696a6d10e	0.6	2012-05-22 11:47:32 -06:00
Peter Saint-Andre	2203f34e1d	1.2rc6	2012-05-21 16:52:07 -06:00
Peter Saint-Andre	f6625b1b64	typo noted by Umesh Sharma	2012-05-21 16:50:39 -06:00
Peter Saint-Andre	6b1096f618	0.5	2012-05-16 16:44:02 -06:00
Peter Saint-Andre	f3a7e59cbc	copy and paste mistake	2012-05-16 15:46:43 -06:00
Peter Saint-Andre	51dfba1bee	to/from swap in examples 9 and 10	2012-05-16 14:49:07 -06:00
Peter Saint-Andre	78c70c622e	1.2rc5	2012-05-16 06:50:59 -06:00
Peter Saint-Andre	5962e92667	1.2rc4	2012-05-09 11:50:23 -06:00
Peter Saint-Andre	3863423fd8	1.2rc3	2012-05-09 09:27:54 -06:00
Peter Saint-Andre	02a95e5f11	added clarifying suggestion about presence-out and PEP	2012-05-07 14:00:00 -06:00
Peter Saint-Andre	8a6c6f030d	added clarifying paragraph about association of zrtp-hash with a media stream, not the overall session	2012-04-24 10:13:56 -06:00
Peter Saint-Andre	8e4f8d4621	added XEP-0313	2012-04-18 19:08:13 -06:00
Peter Saint-Andre	d5e6f693c0	corrected publication date	2012-04-18 19:08:01 -06:00
Peter Saint-Andre	3da0758989	0.1	2012-04-18 19:05:41 -06:00
Peter Saint-Andre	f3ba851cfc	set expiration date of 2012-10-18	2012-04-18 09:43:10 -06:00
Peter Saint-Andre	7247276ce1	1.4 DEPRECATED	2012-04-18 09:39:24 -06:00
Peter Saint-Andre	c2651227d7	citation updates	2012-04-17 21:29:09 -06:00
Peter Saint-Andre	6e38e498ba	1.2rc2	2012-04-17 20:46:27 -06:00
Peter Saint-Andre	d7e0493cf4	Merge branch 'master' of athena.jabber.org:xmpp	2012-04-17 20:21:46 -06:00
Peter Saint-Andre	8b4f6a6c26	automatically Deferred	2012-04-17 20:19:15 -06:00
stpeter	e821e6d985	1.4rc1	2012-04-17 10:13:38 -06:00
stpeter	b972053333	0.4	2012-04-17 09:51:43 -06:00
stpeter	e03fabb9bb	added rfc6122bis	2012-04-17 09:50:58 -06:00
stpeter	70915a872a	removed the interim flag	2012-03-21 09:46:09 -06:00
stpeter	2b33de307a	1.1	2012-03-21 09:39:40 -06:00
stpeter	047b5b9446	0.2	2012-03-19 11:43:02 -06:00
stpeter	a48417c5c8	fixed the supersededby syntax	2012-03-13 12:59:43 -06:00
stpeter	e51305b312	added clearer note about superseding	2012-03-13 12:23:23 -06:00
stpeter	543f555af0	0.2	2012-03-08 15:03:37 -07:00
stpeter	0aa01b64c3	0.2	2012-03-08 14:58:05 -07:00
stpeter	e4ebe6c2e6	corrected a typo	2012-03-07 18:46:29 -07:00
stpeter	5cf267bed6	0.3	2012-03-07 11:24:25 -07:00
stpeter	f8bd22d076	removed interim flag	2012-03-06 09:24:20 -07:00
stpeter	8e5a233f75	Merge branch 'master' of athena.jabber.org:xmpp	2012-03-06 09:15:58 -07:00
stpeter	c44c20fd38	1.1: Obsolete	2012-03-06 09:15:08 -07:00
stpeter	6e2f7fdbab	1.1rc1	2012-03-06 09:11:37 -07:00
Philipp Hancke	9e0b82fddb	require support for dialback errors + fix minor bug reported by torje ... Signed-off-by: Dave Cridland <dave@cridland.net>	2012-03-06 10:35:22 +00:00
Philipp Hancke	fa723a2842	fixed typo reported by Nobuo Ogashiwa ... Signed-off-by: Dave Cridland <dave@cridland.net>	2012-03-06 10:35:10 +00:00
stpeter	c7c525fa4c	added XEP-0312	2012-02-29 19:08:08 -07:00
stpeter	4a7e6a2d53	0.1	2012-02-29 19:07:59 -07:00
stpeter	865f97c475	0.0.2	2012-02-29 19:06:24 -07:00
stpeter	09df50be60	0.0.1	2012-02-28 12:49:56 -07:00
stpeter	f60c8e3876	corrected a typo	2012-02-27 14:10:06 -07:00