Mickael Remond
fc2d5da112
Merge branch 'master' of github.com:processone/ejabberd
2016-01-25 23:28:33 +01:00
Mickael Remond
28569d6209
As default, attempt to add path to Elixir
2016-01-25 23:28:27 +01:00
Paweł Chmielowski
22696e8388
Geenarte markdown that is acceptable by docs.ejabberd.org processor
2016-01-25 16:51:54 +01:00
Mickael Remond
6c499f510b
Merge branch 'master' of github.com:processone/ejabberd
2016-01-25 10:47:29 +01:00
Mickael Remond
0b492f43fe
If lager is false, we will use p1_logger
2016-01-25 10:47:20 +01:00
Badlop
60175784f0
Updated Portuguese-Brazilian translation (thanks to Otávio Fernandes)
2016-01-24 19:59:53 +01:00
Mickael Remond
14c0ff1c82
Add missing description
2016-01-24 10:19:28 +01:00
Mickael Remond
a7e3df4fec
Merge branch 'master' of github.com:processone/ejabberd
2016-01-24 10:07:25 +01:00
Mickael Remond
67b5162df9
Prepare hex.pm release
2016-01-24 10:07:12 +01:00
Paweł Chmielowski
a2a692d081
Merge pull request #919 from hamano/rename_timestamp_function
...
rename timestamp function #917
2016-01-24 07:51:25 +01:00
Mickael Remond
dae41ec183
ejabberd will handle Mnesia start
...
Mix need to know if must not autostart Mnesia before ejabberd
2016-01-23 19:00:22 +01:00
Mickael Remond
0920511de2
lager is the default logger, we need to reverse the define flag
...
Also make sure that configure without option does not force lager to false
2016-01-23 18:57:29 +01:00
Mickael Remond
e97195b3a6
Mix requires override
2016-01-23 18:44:38 +01:00
Mickael Remond
a3931e6b73
lager is the default logger, we need to reverse the define flag
2016-01-23 18:43:06 +01:00
Mickael Remond
7cc951ab1b
Make sure all version are consistent before big repositories changes
2016-01-23 18:42:16 +01:00
Mickael Remond
dae1ec2b7b
Make sure mix does not trigger conflict on p1_utils
2016-01-23 17:36:40 +01:00
Mickael Remond
f933cae2d6
Update Elixir dependency to latest p1_utils and cache_tab
2016-01-23 17:29:18 +01:00
HAMANO Tsukasa
5a85b0fb52
rename timestamp function #917
2016-01-23 17:58:10 +09:00
Christophe Romain
a189655f31
Add missing ref key
2016-01-21 12:56:03 +01:00
Badlop
42f86e7c3b
Fix order of arguments references
2016-01-20 19:43:12 +01:00
badlop
3d42be5394
Merge pull request #915 from fotock/master
...
Update translations
2016-01-20 19:38:54 +01:00
Shelley Shyan
46a85d3f9b
Merge pull request #1 from fotock/fotock-patch-1
...
Update zh.po
2016-01-21 01:02:28 +08:00
Shelley Shyan
e2c1368e0e
Update zh.po
...
Translated untranslated. Fixed fuzzy messages. Other fixes.
2016-01-21 01:01:14 +08:00
Shelley Shyan
3d3034cd11
Update zh.po
...
to be continued
2016-01-20 23:07:45 +08:00
Badlop
278d8a6fcd
Fix fuzzy tag in correct string
2016-01-19 22:34:58 +01:00
Christophe Romain
2ddbd032ee
Add error handling to send_stanza
2016-01-19 16:16:04 +01:00
Holger Weiss
5e4ed4266d
mod_mam: Strip existing JID tags from MUC messages
...
Strip any pre-existing <x/> tags which have an <item/> child with a
'jid' attribute from MUC MAM messages. This way, if such a tag exists,
clients can be sure it was added by mod_mam.
2016-01-19 00:39:10 +01:00
Badlop
3feceb8279
Update Czech translation (thanks to Jan Pinkas)
2016-01-18 19:09:58 +01:00
Badlop
6b775fb9a1
Update Walon translation (thanks to Pablo Saratxaga)
2016-01-18 18:44:55 +01:00
Badlop
05bc0d4d17
Update Ukrainian translation (thanks to Oleg Deordiev)
2016-01-18 18:44:50 +01:00
Alexey Shchepin
a150bf8fdc
Make C2S session establishment optional (ECS-11)
2016-01-18 16:33:57 +03:00
Holger Weiss
bd383fb8c1
mod_mam: Remove unused code
...
This mod_mam version doesn't store groupchat messages in user archives,
and it also doesn't support the "store_body_only" option.
2016-01-18 13:27:29 +01:00
Paweł Chmielowski
9741dba51f
Update polish localisation
2016-01-18 13:18:40 +01:00
Paweł Chmielowski
ee1cf939c5
Make --disable-debug work again
2016-01-18 13:10:28 +01:00
Holger Weiss
0125870f92
Merge remote-tracking branch 'processone/pr/907'
...
* processone/pr/907:
don't escape ERL_OPTIONS
2016-01-17 00:08:30 +01:00
Holger Weiss
63777f830d
Use maps instead of dicts in HTTP upload modules
...
ejabberd currently depends on Erlang/OTP 17.1 or higher, so we can now
use maps.
2016-01-16 01:30:22 +01:00
badlop
6ac839dd76
Merge pull request #906 from hamano/stats_processes
...
add stats processes command
2016-01-15 19:26:23 +01:00
badlop
c31875cad0
Merge pull request #911 from hamano/ja
...
update japanese translation
2016-01-15 19:21:53 +01:00
HAMANO Tsukasa
7ab3b0d793
update japanese translation
2016-01-16 00:35:23 +09:00
HAMANO Tsukasa
ad448efa1d
update japanese translation
2016-01-16 00:15:24 +09:00
Evgeniy Khramtsov
c8bc6cecdc
Fix records in mod_muc.hrl
2016-01-15 15:46:07 +03:00
Evgeniy Khramtsov
33b67f54ba
Include mod_muc.hrl
2016-01-15 15:45:16 +03:00
Evgeniy Khramtsov
a83c5a8f3a
Do not redefine records
2016-01-15 15:44:50 +03:00
Evgeniy Khramtsov
1d452c98c1
Describe option type of 'domain_balancing'
2016-01-15 14:32:10 +03:00
Badlop
09ab01084d
Update Spanish and Catalan translation
2016-01-15 12:27:22 +01:00
Badlop
fc1237963a
Update translations files
2016-01-15 10:40:49 +01:00
Holger Weiss
ddaa409ee2
XEP-0198: Let MAM take care of pending messages
...
If a stream management session times out for a user who appears to be
using MAM, drop any unacknowledged messages rather than resending or
bouncing them. This avoids duplicates or bogus error messages.
However, this is only done if the new mod_mam option "assume_mam_usage"
is set to 'if_enabled' or 'on_request'. In the former case, a user is
assumed to be using MAM if archiving is enabled for his account. In the
latter case, MAM usage is assumed only if archiving was explicitly
requested by the client, or if archiving was enabled by means of
mod_mam's "request_activates_archiving" option.
2016-01-15 01:08:22 +01:00
HAMANO Tsukasa
b244bce49c
don't escape ERL_OPTIONS
2016-01-15 00:30:40 +09:00
HAMANO Tsukasa
6cb1905f7c
add stats processes command
2016-01-15 00:27:15 +09:00
Holger Weiss
db04cdf2ca
mod_mam: Sort messages returned by Mnesia
...
Sort the messages retrieved from an Mnesia archive before selecting the
subset limited by the <max/> value. This makes sure the desired subset
of messages is sent to the client.
2016-01-14 02:27:02 +01:00
