aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-05-061-43/+79
|\
| * prosodyctl: Check that there is at least one enabled VirtualHost (or Componen...Kim Alvefur2014-05-021-0/+11
| * prosodyctl: Use correct variable in check certsKim Alvefur2014-05-021-2/+2
| * prosodyctl: Check for deprecated config optionsKim Alvefur2014-05-021-0/+10
| * prosodyctl: Add check that points out any disabled hostsKim Alvefur2014-05-021-0/+15
| * prosodyctl: Only perform checks on enabled hostsKim Alvefur2014-05-021-43/+43
* | Merge 0.10->trunkKim Alvefur2014-04-272-6/+29
|\|
| * Merge 0.9->0.10Kim Alvefur2014-04-271-3/+9
| |\
| | * util.pposix: Fix error reporting from really old Linux fallocate() that did n...Kim Alvefur2014-04-251-1/+5
| | * util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno (...Kim Alvefur2014-04-251-2/+4
| * | util.x509: Remove unused importsKim Alvefur2014-04-251-3/+0
| * | util.x509: And functions for converting between DER and PEMKim Alvefur2014-04-241-0/+20
* | | util.indexedbheap: Fix a possible traceback when removing the last item.Waqas Hussain2014-04-231-7/+11
* | | Merge 0.10->trunkKim Alvefur2014-04-233-2/+21
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-04-232-1/+10
| |\|
| | * util.dataforms: Add support for XEP-0221: Data Forms Media ElementKim Alvefur2014-04-221-0/+9
| | * tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator)Kim Alvefur2014-04-221-1/+1
| * | mod_s2s: Follow XMPP Core on when a stream is to be considered readyKim Alvefur2014-04-221-1/+11
* | | Merge daurnimator->trunkMatthew Wild2014-04-213-580/+834
|\ \ \
| * \ \ Merge with daurnimatorMatthew Wild2014-04-173-580/+834
| |\ \ \
| | * | | plugins/muc/muc.lib: If decline is to person in room; route to all sessionsdaurnimator2014-03-271-1/+7
| | * | | plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of historydaurnimator2014-03-271-3/+4
| | * | | plugins/muc: Rename admin query hookdaurnimator2014-03-272-6/+6
| | * | | plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nic...daurnimator2014-03-241-5/+9
| | * | | plugins/muc/muc.lib: Extra utility functions around subjectsdaurnimator2014-03-241-7/+19
| | * | | plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the ev...daurnimator2014-03-241-9/+22
| | * | | plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to hi...daurnimator2014-03-241-15/+19
| | * | | plugins/muc/muc.lib: Better password checkdaurnimator2014-03-241-3/+3
| | * | | plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, memb...daurnimator2014-03-241-20/+62
| | * | | plugins/muc/muc.lib: Move password check and nick conflict check into `handle...daurnimator2014-03-211-24/+18
| | * | | plugins/muc/muc.lib: Additional `route_to_occupant` usagedaurnimator2014-03-201-4/+1
| | * | | plugins/muc/muc.lib: Remove duplicate variable; it can never be nil.daurnimator2014-03-201-6/+3
| | * | | plugins/muc/muc.lib: Add decline event for parity with invitedaurnimator2014-03-201-1/+6
| | * | | plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all o...daurnimator2014-03-201-12/+13
| | * | | plugins/muc: Have utility methods for locking the roomdaurnimator2014-03-202-9/+20
| | * | | plugins/muc/muc.lib: Use occupant jids when whois == "moderators"daurnimator2014-03-191-0/+3
| | * | | plugins/muc/muc.lib: Allow users with affiliations to invite while not in roo...daurnimator2014-03-191-1/+1
| | * | | plugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Remov...daurnimator2014-03-191-3/+1
| | * | | plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from eve...daurnimator2014-03-191-3/+7
| | * | | plugins/muc/muc.lib: Check role instead of current_nickdaurnimator2014-03-191-1/+2
| | * | | plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; extr...daurnimator2014-03-191-4/+6
| | * | | plugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` blockdaurnimator2014-03-191-1/+1
| | * | | plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affil...daurnimator2014-03-191-4/+13
| | * | | plugins/muc/muc.lib: Don't get same variable twice.....daurnimator2014-03-191-3/+2
| | * | | plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nickdaurnimator2014-03-191-13/+18
| | * | | plugins/muc/muc.lib: Fetch config via accessors instead of using `_data`daurnimator2014-03-191-6/+7
| | * | | plugins/muc/muc.lib: In `_route_stanza` access occupant data less oftendaurnimator2014-03-191-9/+9
| | * | | plugins/muc/muc.lib: Tidy up `get_filtered_presence`daurnimator2014-03-191-8/+13
| | * | | plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the ...daurnimator2014-03-191-25/+19
| | * | | plugins/muc/muc.lib: Use module.host where `muc_domain` was previouslydaurnimator2014-03-191-3/+2