moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-22 01:02:17 -05:00
Code Issues Releases Wiki Activity

Merge branch 'premerge' into 'main'

Browse Source 
Premerge

See merge request xsf/xeps!16
This commit is contained in:
Jonas Schäfer 2020-08-25 15:52:12 +00:00
commit 023964abe6
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xep-0060.xml
View File

@ -49,6 +49,18 @@
&pgmillard; &pgmillard;
&stpeter; &stpeter;
&ralphm; &ralphm;
<revision>
<version>1.19.0</version>
<date>2020-08-16</date>
<initials>ps</initials>
<remark><p>Add missing 'item' key and 'retrieve' action to query type registry.</p></remark>
</revision>
<revision>
<version>1.18.1</version>
<date>2020-08-25</date>
<initials>lnjx</initials>
<remark><p>Fix trivial typo</p></remark>
</revision>
<revision> <revision>
<version>1.18.0</version> <version>1.18.0</version>
<date>2020-02-27</date> <date>2020-02-27</date>
@ -4188,7 +4200,7 @@ And by opposing end them?
<field var='pubsub#node' type='text-single' label='Node ID'> <field var='pubsub#node' type='text-single' label='Node ID'>
<value>princely_musings</value> <value>princely_musings</value>
</field> </field>
<field var='pusub#subscriber_jid' type='jid-single' label='Subscriber Address'> <field var='pubsub#subscriber_jid' type='jid-single' label='Subscriber Address'>
<value>horatio@denmark.lit</value> <value>horatio@denmark.lit</value>
</field> </field>
<field var='pubsub#allow' type='boolean' <field var='pubsub#allow' type='boolean'
@ -6624,12 +6636,20 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings
<name>unsubscribe</name> <name>unsubscribe</name>
<desc>enables unsubscribing from a pubsub node</desc> <desc>enables unsubscribing from a pubsub node</desc>
</value> </value>
<value>
<name>retrieve</name>
<desc>enables retrieving a specific item from a pubsub node</desc>
</value>
</values> </values>
</key> </key>
<key> <key>
<name>node</name> <name>node</name>
<desc>the pubsub node</desc> <desc>the pubsub node</desc>
</key> </key>
<key>
<name>item</name>
<desc>the pubsub item</desc>
</key>
</keys> </keys>
</querytype> </querytype>
]]></code> ]]></code>

10
inbox/xep-mam-prefs.xml → xep-0441.xml
View File

@ -9,8 +9,8 @@
<title>Message Archive Management Preferences</title> <title>Message Archive Management Preferences</title>
<abstract>This document defines a protocol to control a user's archiving preferences.</abstract> <abstract>This document defines a protocol to control a user's archiving preferences.</abstract>
&LEGALNOTICE; &LEGALNOTICE;
<number>xxxx</number> <number>0441</number>
<status>ProtoXEP</status> <status>Experimental</status>
<type>Standards Track</type> <type>Standards Track</type>
<sig>Standards</sig> <sig>Standards</sig>
<dependencies> <dependencies>
@ -23,6 +23,12 @@
<shortname>mamprefs</shortname> <shortname>mamprefs</shortname>
&mwild; &mwild;
&ksmith; &ksmith;
<revision>
<version>0.2.0</version>
<date>2020-08-25</date>
<initials>XEP Editor (jsc)</initials>
<remark>Accepted by vote of Council on 2020-08-19.</remark>
</revision>
<revision> <revision>
<version>0.1</version> <version>0.1</version>
<date>2020-04-03</date> <date>2020-04-03</date>

10
inbox/xep-pubsub-mam.xml → xep-0442.xml
View File

@ -9,8 +9,8 @@
<title>Pubsub Message Archive Management</title> <title>Pubsub Message Archive Management</title>
<abstract>This document defines a protocol to query and control a pubsub node's message archive.</abstract> <abstract>This document defines a protocol to query and control a pubsub node's message archive.</abstract>
&LEGALNOTICE; &LEGALNOTICE;
<number>xxxx</number> <number>0442</number>
<status>ProtoXEP</status> <status>Experimental</status>
<type>Standards Track</type> <type>Standards Track</type>
<sig>Standards</sig> <sig>Standards</sig>
<dependencies> <dependencies>
@ -26,6 +26,12 @@
<shortname>pubsub-mam</shortname> <shortname>pubsub-mam</shortname>
&mwild; &mwild;
&ksmith; &ksmith;
<revision>
<version>0.2.0</version>
<date>2020-08-25</date>
<initials>XEP Editor (jsc)</initials>
<remark>Accepted by vote of Council on 2020-08-19.</remark>
</revision>
<revision> <revision>
<version>0.1.0</version> <version>0.1.0</version>
<date>2020-03-30</date> <date>2020-03-30</date>