Mercurial > prosody-hg
comparison plugins/mod_admin_adhoc.lua @ 6791:e813e8cf6046
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Aug 2015 13:05:22 +0200 |
| parents | 6236668da30a |
| children | c4ee38d78594 |
comparison
equal
deleted
inserted
replaced
| 6776:4412a2307c89 | 6791:e813e8cf6046 |
|---|---|
| 24 local rm_load_roster = require "core.rostermanager".load_roster; | 24 local rm_load_roster = require "core.rostermanager".load_roster; |
| 25 local st, jid = require "util.stanza", require "util.jid"; | 25 local st, jid = require "util.stanza", require "util.jid"; |
| 26 local timer_add_task = require "util.timer".add_task; | 26 local timer_add_task = require "util.timer".add_task; |
| 27 local dataforms_new = require "util.dataforms".new; | 27 local dataforms_new = require "util.dataforms".new; |
| 28 local array = require "util.array"; | 28 local array = require "util.array"; |
| 29 local modulemanager = require "modulemanager"; | 29 local modulemanager = require "core.modulemanager"; |
| 30 local core_post_stanza = prosody.core_post_stanza; | 30 local core_post_stanza = prosody.core_post_stanza; |
| 31 local adhoc_simple = require "util.adhoc".new_simple_form; | 31 local adhoc_simple = require "util.adhoc".new_simple_form; |
| 32 local adhoc_initial = require "util.adhoc".new_initial_data_form; | 32 local adhoc_initial = require "util.adhoc".new_initial_data_form; |
| 33 | 33 |
| 34 module:depends("adhoc"); | 34 module:depends("adhoc"); |
