Evgeniy Khramtsov
|
78a44e0176
|
Merge branch 'master' into xml-ng
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
|
2016-11-12 13:27:15 +03:00 |
|
colm
|
3b876875e9
|
mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable
|
2016-10-18 21:59:34 +01:00 |
|
Evgeniy Khramtsov
|
67720c7713
|
Add more MUC tests
|
2016-10-17 13:37:23 +03:00 |
|
Evgeniy Khramtsov
|
a915fd161e
|
Create room on configuration request as per XEP-0045, 10.1.3
|
2016-10-10 10:51:39 +03:00 |
|
Evgeniy Khramtsov
|
6a3691ef7c
|
Add xdata generator and make some code using it
|
2016-10-07 10:31:03 +03:00 |
|
Badlop
|
5bcfcf4c5e
|
When getting list of subscribed rooms, check all including temporary ones (#1242)
|
2016-09-19 13:46:01 +02:00 |
|
Badlop
|
9fa92092bf
|
Revert "Fix getting of subscribed rooms: consider also temporary ones (#1242)"
This reverts commit f2cc81dfea .
|
2016-09-19 12:54:19 +02:00 |
|
Badlop
|
f2cc81dfea
|
Fix getting of subscribed rooms: consider also temporary ones (#1242)
|
2016-09-19 12:35:53 +02:00 |
|
Evgeniy Khramtsov
|
e987b88848
|
Make common tests working again
|
2016-09-13 12:30:05 +03:00 |
|
Evgeniy Khramtsov
|
fe1bf27ef3
|
Fix subscribed rooms list retreivement
|
2016-09-09 13:04:47 +03:00 |
|
Evgeniy Khramtsov
|
f304149615
|
Create room on configuration request as per XEP-0045, 10.1.3
|
2016-09-07 11:15:19 +03:00 |
|
Evgeniy Khramtsov
|
4ff8d7918a
|
Change code to reflect recent changes in fxml_gen
|
2016-08-05 08:41:08 +03:00 |
|
Christophe Romain
|
a080322055
|
Switch workers from temporary to transient
|
2016-07-29 11:18:42 +02:00 |
|
Evgeniy Khramtsov
|
984c4cf6bd
|
Add 'allow_subscription' MUC configuration option
|
2016-07-26 14:37:28 +03:00 |
|
Evgeniy Khramtsov
|
179fcd9521
|
Rewrite mod_mam and mod_muc to use XML generator
|
2016-07-25 13:50:30 +03:00 |
|
Evgeniy Khramtsov
|
786bd4f26c
|
Use hooks instead of direct calls to mod_mam
|
2016-07-09 12:43:01 +03:00 |
|
Evgeniy Khramtsov
|
368b202144
|
Handle MUC/Sub subscriptions list request
|
2016-07-08 15:07:10 +03:00 |
|
Evgeniy Khramtsov
|
caaf02eaa0
|
Advertise MUC/Sub support in MUC service disco#info
|
2016-07-08 15:06:08 +03:00 |
|
Evgeniy Khramtsov
|
4220a2b98c
|
Make modules loading in a dependent order (#1191)
|
2016-07-06 14:58:48 +03:00 |
|
Paweł Chmielowski
|
3a8da27d86
|
Use {access,shaper}_rules_validator in other places where access rules are used
|
2016-06-21 13:18:24 +02:00 |
|
Evgeniy Khramtsov
|
9c369b7a8c
|
Improve detection of databases supported by modules (#1092)
|
2016-04-27 17:10:50 +03:00 |
|
Evgeniy Khramtsov
|
52571e8624
|
Clean mod_mam.erl from DB specific code
|
2016-04-15 15:11:31 +03:00 |
|
Evgeniy Khramtsov
|
0b439a7d5b
|
Clean mod_muc.erl from DB specific code
|
2016-04-13 21:07:32 +03:00 |
|
Evgeniy Khramtsov
|
fced8dc3d9
|
Replace some ?ERR_* macros with ?ERRT_*
|
2016-03-31 11:00:29 +03:00 |
|
Evgeniy Khramtsov
|
357e48fb6b
|
Make it possible to get virtual host of a registered route
|
2016-03-13 11:38:40 +03:00 |
|
Badlop
|
7435ee464f
|
Rename option to regexp_room_id for consistency with other options (#905)
|
2016-02-05 12:09:27 +01:00 |
|
HAMANO Tsukasa
|
268f0b30ec
|
add room_id_regexp option
|
2016-02-05 12:09:18 +01:00 |
|
Mickael Remond
|
dfc29ea03c
|
Switch to Fast XML module
|
2016-02-03 19:03:17 +01:00 |
|
Evgeniy Khramtsov
|
a83c5a8f3a
|
Do not redefine records
|
2016-01-15 15:44:50 +03:00 |
|
Holger Weiss
|
85f4f90b45
|
mod_mam: Support XEP-0313 v0.2 MUC archive queries
|
2016-01-14 00:58:48 +01:00 |
|
Badlop
|
f448ff608a
|
Update copyright to 2016 (#901)
|
2016-01-13 12:29:14 +01:00 |
|
Alexey Shchepin
|
d88d5d6807
|
Support presence_broadcast in default_room_options mod_muc option
|
2015-12-21 02:25:31 +03:00 |
|
Paweł Chmielowski
|
29db302808
|
More now() replacements
|
2015-12-07 16:09:48 +01:00 |
|
Badlop
|
086fbc6a50
|
Only filter rooms in Service Disco when more than 100 (EJAB-343)
|
2015-12-02 02:32:25 +01:00 |
|
Badlop
|
ff22782752
|
List in Service Disco non-empty rooms and provide Node for empty (EJAB-343)
|
2015-12-02 01:51:39 +01:00 |
|
Evgeniy Khramtsov
|
95265dd3ad
|
Move JID related functions to jid.erl (#847)
|
2015-11-24 18:44:13 +03:00 |
|
Christophe Romain
|
341be9b682
|
Remove supervisor option, disable it for c2s and muc
|
2015-11-04 16:24:35 +01:00 |
|
Evgeniy Khramtsov
|
87273619a6
|
Advertise MAM (XEP-0313) v0.4 support in room disco
|
2015-10-11 19:43:24 +03:00 |
|
Christophe Romain
|
6aeb9dcb38
|
cosmetic cleanup
|
2015-10-07 14:18:38 +02:00 |
|
Evgeniy Khramtsov
|
94444c87e8
|
Remove MAM archives on MUC room destroy
|
2015-08-24 13:28:58 +03:00 |
|
Evgeniy Khramtsov
|
40feed723d
|
Add support for MUC MAM
|
2015-08-08 22:15:36 +03:00 |
|
Evgeniy Khramtsov
|
a168340838
|
During halt only shutdown MUC rooms on local node
|
2015-07-08 15:35:26 +03:00 |
|
Evgeniy Khramtsov
|
83faff37e5
|
Add missing options of mod_muc to validator
|
2015-06-03 15:18:09 +03:00 |
|
Evgeniy Khramtsov
|
fb6267f38e
|
Add config validation at startup
|
2015-06-01 15:38:27 +03:00 |
|
Evgeniy Khramtsov
|
a291e7d4e6
|
Fix MUC room options vaildation
|
2015-05-29 12:08:36 +03:00 |
|
Evgeniy Khramtsov
|
e8ffbbb0b4
|
Validate MUC room options from the configuration file
|
2015-05-28 11:42:17 +03:00 |
|
Badlop
|
0c725b5fac
|
Document protocol support (EJABS-1620)
|
2015-05-21 17:04:05 +02:00 |
|
Evgeniy Khramtsov
|
4af15df546
|
Add new 'default_db' option
|
2015-03-30 12:15:29 +03:00 |
|
Badlop
|
5a35405cd5
|
Update copyright dates to 2015 (EJAB-1733)
|
2015-01-08 17:34:43 +01:00 |
|
Evgeniy Khramtsov
|
ac2ba399a9
|
Make sure x:data form possesses 'type' attribute
|
2014-09-03 21:28:55 +04:00 |
|