Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-05-09 | 6 | -40/+52 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-05-09 | 1 | -1/+5 |
| |\ | |||||
| | * | configmanager: Delay importing LuaFileSystem until needed by an Include line | Kim Alvefur | 2014-05-09 | 1 | -1/+5 |
| | | | |||||
| * | | core.certmanager, core.moduleapi, mod_storage_sql, mod_storage_sql2: Import ↵ | Kim Alvefur | 2014-05-09 | 4 | -4/+5 |
| | | | | | | | | | | | | from util.paths | ||||
| * | | core.configmanager: Move path utility functions into util.paths | Kim Alvefur | 2014-05-09 | 2 | -35/+42 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-05-06 | 1 | -43/+79 |
|\| | | |||||
| * | | prosodyctl: Check that there is at least one enabled VirtualHost (or ↵ | Kim Alvefur | 2014-05-02 | 1 | -0/+11 |
| | | | | | | | | | | | | Component) defined | ||||
| * | | prosodyctl: Use correct variable in check certs | Kim Alvefur | 2014-05-02 | 1 | -2/+2 |
| | | | |||||
| * | | prosodyctl: Check for deprecated config options | Kim Alvefur | 2014-05-02 | 1 | -0/+10 |
| | | | |||||
| * | | prosodyctl: Add check that points out any disabled hosts | Kim Alvefur | 2014-05-02 | 1 | -0/+15 |
| | | | |||||
| * | | prosodyctl: Only perform checks on enabled hosts | Kim Alvefur | 2014-05-02 | 1 | -43/+43 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-04-27 | 2 | -6/+29 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-04-27 | 1 | -3/+9 |
| |\| | |||||
| | * | util.pposix: Fix error reporting from really old Linux fallocate() that did ↵ | Kim Alvefur | 2014-04-25 | 1 | -1/+5 |
| | | | | | | | | | | | | not use errno for some reason (thanks pro) | ||||
| | * | util.pposix: Fix error reporting from posix_fallocate, it doesn't use errno ↵ | Kim Alvefur | 2014-04-25 | 1 | -2/+4 |
| | | | | | | | | | | | | (thanks pro) | ||||
| * | | util.x509: Remove unused imports | Kim Alvefur | 2014-04-25 | 1 | -3/+0 |
| | | | |||||
| * | | util.x509: And functions for converting between DER and PEM | Kim Alvefur | 2014-04-24 | 1 | -0/+20 |
| | | | |||||
* | | | util.indexedbheap: Fix a possible traceback when removing the last item. | Waqas Hussain | 2014-04-23 | 1 | -7/+11 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-04-23 | 3 | -2/+21 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-04-23 | 2 | -1/+10 |
| |\| | |||||
| | * | util.dataforms: Add support for XEP-0221: Data Forms Media Element | Kim Alvefur | 2014-04-22 | 1 | -0/+9 |
| | | | |||||
| | * | tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator) | Kim Alvefur | 2014-04-22 | 1 | -1/+1 |
| | | | |||||
| * | | mod_s2s: Follow XMPP Core on when a stream is to be considered ready | Kim Alvefur | 2014-04-22 | 1 | -1/+11 |
| | | | |||||
* | | | Merge daurnimator->trunk | Matthew Wild | 2014-04-21 | 3 | -580/+834 |
|\ \ \ | |||||
| * \ \ | Merge with daurnimator | Matthew Wild | 2014-04-17 | 3 | -580/+834 |
| |\ \ \ | |||||
| | * | | | plugins/muc/muc.lib: If decline is to person in room; route to all sessions | daurnimator | 2014-03-27 | 1 | -1/+7 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history | daurnimator | 2014-03-27 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | plugins/muc: Rename admin query hook | daurnimator | 2014-03-27 | 2 | -6/+6 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Add :broadcast method; use it from ↵ | daurnimator | 2014-03-24 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | :broadcast_except_nick and :broadcast_message | ||||
| | * | | | plugins/muc/muc.lib: Extra utility functions around subjects | daurnimator | 2014-03-24 | 1 | -7/+19 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the ↵ | daurnimator | 2014-03-24 | 1 | -9/+22 |
| | | | | | | | | | | | | | | | | | | | | event object so that messages don't need to be all in memory at once | ||||
| | * | | | plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to ↵ | daurnimator | 2014-03-24 | 1 | -15/+19 |
| | | | | | | | | | | | | | | | | | | | | history | ||||
| | * | | | plugins/muc/muc.lib: Better password check | daurnimator | 2014-03-24 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, ↵ | daurnimator | 2014-03-24 | 1 | -20/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | members-only, password, nick-conflict and lock checks This reorders some of the checks. Importantly; affiliations are checked first: this means banned users cannot try and guess passwords | ||||
| | * | | | plugins/muc/muc.lib: Move password check and nick conflict check into ↵ | daurnimator | 2014-03-21 | 1 | -24/+18 |
| | | | | | | | | | | | | | | | | | | | | `handle_join` | ||||
| | * | | | plugins/muc/muc.lib: Additional `route_to_occupant` usage | daurnimator | 2014-03-20 | 1 | -4/+1 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Remove duplicate variable; it can never be nil. | daurnimator | 2014-03-20 | 1 | -6/+3 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Add decline event for parity with invite | daurnimator | 2014-03-20 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all ↵ | daurnimator | 2014-03-20 | 1 | -12/+13 |
| | | | | | | | | | | | | | | | | | | | | occupant sessions | ||||
| | * | | | plugins/muc: Have utility methods for locking the room | daurnimator | 2014-03-20 | 2 | -9/+20 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Use occupant jids when whois == "moderators" | daurnimator | 2014-03-19 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Allow users with affiliations to invite while not in ↵ | daurnimator | 2014-03-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | room themselves | ||||
| | * | | | plugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. ↵ | daurnimator | 2014-03-19 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | Removed a TODO that's already done | ||||
| | * | | | plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from ↵ | daurnimator | 2014-03-19 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | event name | ||||
| | * | | | plugins/muc/muc.lib: Check role instead of current_nick | daurnimator | 2014-03-19 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; ↵ | daurnimator | 2014-03-19 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | extract it from inside. | ||||
| | * | | | plugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` block | daurnimator | 2014-03-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting ↵ | daurnimator | 2014-03-19 | 1 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | affiliations in members only rooms | ||||
| | * | | | plugins/muc/muc.lib: Don't get same variable twice..... | daurnimator | 2014-03-19 | 1 | -3/+2 |
| | | | | | |||||
| | * | | | plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick | daurnimator | 2014-03-19 | 1 | -13/+18 |
| | | | | |