prosody.git - unofficial mirror of the prosody mercurial project

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge 0.10->trunk	Kim Alvefur	2015-04-03	6	-29/+50
\|\
\| *	rostermanager, mod_roster, mod_presence: Move pending roster items to roster ↵	Kim Alvefur	2015-04-03	3	-26/+32
\| \| \| \| \| \| \| \|	metadata field
\| *	prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ↵	Kim Alvefur	2015-04-02	1	-1/+1
\| \| \| \| \| \| \| \|	ssl.x509 export dissapears in 97b1974 or 356e03a
\| *	prosodyctl: Document magic commit ID	Paul Aurich	2015-04-01	1	-0/+1
\| \|
\| *	util.table, Makefile: New C module that allows pre-allocation of tables to ↵	Matthew Wild	2015-03-31	2	-2/+16
\| \| \| \| \| \| \| \|	improve performance and decrease memory fragmentation
* \|	Merge 0.10->trunk	Matthew Wild	2015-03-27	32	-1367/+3867
\|\ \ \| \|/ \|/\|
\| *	Merge 0.10->trunk	Kim Alvefur	2015-03-27	1	-16/+6
\| \|\
\| * \	Merge 0.10->trunk	Matthew Wild	2015-03-26	8	-27/+207
\| \|\ \
\| * \ \	Merge 0.10->trunk	Matthew Wild	2015-03-24	4	-6/+58
\| \|\ \ \
\| * \ \ \	Merge 0.10->trunk	Matthew Wild	2015-02-24	5	-8/+22
\| \|\ \ \ \
\| * \ \ \ \	Merge	Matthew Wild	2015-02-23	1	-21/+34
\| \|\ \ \ \ \
\| \| * \ \ \ \	Merge 0.10->trunk	Kim Alvefur	2015-02-09	3	-22/+45
\| \| \|\ \ \ \ \
\| * \| \ \ \ \ \	Merge 0.10->trunk	Matthew Wild	2015-01-31	2	-1/+11
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge 0.10->trunk	Kim Alvefur	2015-01-26	1	-1/+1
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge 0.10->trunk	Matthew Wild	2015-01-21	13	-17/+370
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	net.server_select: Remove unused code	daurnimator	2015-01-19	1	-6/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	net.server_select: Remove socket.sleep call from main loop	daurnimator	2015-01-19	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's been there since the start; but should really not be required. People can remember an issue with FreeBSD that this solved, but this was a hack solution anyway. If that issue rears it's head again, we will solve it properly.
\| * \| \| \| \| \| \| \| \|	net.server_select: Remove do-nothing os_difftime calls	daurnimator	2015-01-19	1	-5/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	net.server_select: In add_task timer callback, use passed in time rather ↵	daurnimator	2015-01-15	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	than re-fetching
\| * \| \| \| \| \| \| \| \|	net.server_select: Fix timers not being fired until another timer fixes (or ↵	daurnimator	2015-01-15	1	-16/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1 second passes)
\| * \| \| \| \| \| \| \| \|	net.cqueues: Fix incorrect version check	daurnimator	2015-01-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	net.cqueues: Fixes hardcoded timeout for first iteration	daurnimator	2015-01-13	1	-11/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was originally put in place as a fix for what ended up a cqueues bug: https://github.com/wahern/cqueues/issues/40 A check for a cqueues version with the bug fix is included.
\| * \| \| \| \| \| \| \| \|	net.cqueues: Add workaround for luaevent callback getting collected	daurnimator	2015-01-06	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	mod_muc: Add muc-add-history event to allow modules to override default ↵	Matthew Wild	2015-01-06	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	history storage
\| * \| \| \| \| \| \| \| \|	Merge 0.10 -> trunk	Waqas Hussain	2014-12-16	7	-7/+18
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	Kim Alvefur	2014-11-22	2	-10/+8
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	Kim Alvefur	2014-11-20	4	-20/+36
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	Matthew Wild	2014-11-20	2	-2/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	net.cqueues: Add module that allows use of cqueues while still using ↵	daurnimator	2014-11-18	1	-0/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	net.server as main loop
\| * \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify ↵	daurnimator	2014-11-14	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nick, actor, reason
\| * \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Don't expose actor jids to users when anonymous	daurnimator	2014-11-11	1	-27/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* * * plugins/muc/muc.lib: Allow event listeners to modify actor
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge 0.10->trunk	Kim Alvefur	2014-11-09	5	-11/+30
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	Kim Alvefur	2014-10-26	7	-26/+26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	net/server: Handle lack of util.signal correctly	daurnimator	2014-10-22	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	net/server: Remove print	daurnimator	2014-10-22	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	net.server: Rename 'server' config option to 'network_backend' (to select ↵	Matthew Wild	2014-10-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	which net.server implementation to use)
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	net/server: If server.hook_signal exists, overwrite signal.signal; else make ↵	daurnimator	2014-10-21	1	-16/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	server.hook_signal == signal.signal No longer server_event specific server.hook_signal will always exist
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move timer code out of util.timer and into relevant net.server backends	daurnimator	2014-10-20	3	-66/+65
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	net/server: Split up different backends in a nicer way. Add global config ↵	daurnimator	2014-10-17	1	-38/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	option 'server'
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get ↵	daurnimator	2014-10-17	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	restored on shutdown
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Add :each_affiliation() iterator	daurnimator	2014-10-15	1	-5/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/members_only: Kick non-members when members-only is turned on	daurnimator	2014-10-15	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Kick users from outcast hosts	daurnimator	2014-10-15	1	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Fix passing actor along as a boolean (thanks fippo)	daurnimator	2014-10-15	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge 0.10->trunk	Matthew Wild	2014-10-14	3	-8/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	Waqas Hussain	2014-10-08	2	-3/+14
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	Kim Alvefur	2014-10-05	4	-9/+98
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge 0.10->trunk	daurnimator	2014-09-29	2	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Fire muc-occupant-left from other places an occupant ↵	daurnimator	2014-09-26	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	may leave the room
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plugins/muc/muc.lib: Validate affiliations and roles to admin query get	daurnimator	2014-09-26	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|