aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkKim Alvefur2013-08-063-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Do an early return and drop an indentation levelKim Alvefur2013-08-021-30/+29
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_c2s, mod_s2s: Log a message that stream encryption has been enabled with ...Kim Alvefur2013-08-022-8/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_register: Use more specific get_option variantsKim Alvefur2013-08-021-7/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_adhoc: Add local_user permissionFlorian Zeitz2013-07-241-9/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_adhoc: Use mod_disco for disco handlingFlorian Zeitz2013-07-241-52/+39
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_adhoc: Sort commands by node. This guarantees the order remains the same ...Florian Zeitz2013-07-241-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkKim Alvefur2013-07-242-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkKim Alvefur2013-07-222-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-07-151-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-07-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.events: Remove varargs, event handlers can now only accept a single para...Matthew Wild2013-07-151-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_bosh, mod_c2s: No longer fire stream-features globally (nobody uses it, a...Matthew Wild2013-07-152-3/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rostermanager, mod_groups: Change roster-load event to pass an event table fo...Matthew Wild2013-07-152-2/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-07-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Do lazy fetching of affected/rowcountKim Alvefur2013-07-121-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backed out changeset 3c57c2281087Kim Alvefur2013-07-121-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Don't fetch row count of result sets for queries that don't have re...Kim Alvefur2013-07-121-2/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Add archive store with append and find methodsKim Alvefur2013-07-121-0/+89
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Create an additional table `prosodyarchive` for chronologic...Kim Alvefur2013-07-121-1/+18
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | util.sql: Set charset and collation for MySQL when creating tablesKim Alvefur2013-07-111-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove plugins/storage/sqlbasic.lib.lua, which seems obsoleteMatthew Wild2013-07-111-97/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-07-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Support XML serialization for stanzas.Kim Alvefur2013-07-101-0/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Keep available store types in a tableKim Alvefur2013-07-101-2/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Fix iteration over users and storesKim Alvefur2013-07-101-2/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Make sure the user field is not NULLKim Alvefur2013-07-101-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkKim Alvefur2013-07-102-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-07-092-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-07-081-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prosodyctl: Import local_addresses from the new util.net intead of luasocketKim Alvefur2013-07-011-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkKim Alvefur2013-06-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ MergeMatthew Wild2013-06-2938-1093/+1666
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-292-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-261-4/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_s2s: Add missing global hook for read-timeoutKim Alvefur2013-06-261-0/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-06-241-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Refactor s2s:show()Kim Alvefur2013-06-201-55/+55
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Generate session names the same way as in s2smanagerKim Alvefur2013-06-201-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Refactor s2s:close and s2s:closeallKim Alvefur2013-06-201-53/+15
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_register: Fix indentationKim Alvefur2013-06-191-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_admin_telnet: Refactor s2s:showcert()Kim Alvefur2013-06-191-8/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | net.dns: Support IPv6 addresses in resolv.confFlorian Zeitz2013-06-181-6/+13
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 0.9->trunkMatthew Wild2013-06-183-23/+121
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_tls: Remove debug statementKim Alvefur2013-06-161-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the mergeMatthew Wild2013-06-139-223/+296
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Add Ad-Hoc command to destroy MUC roomsFlorian Zeitz2013-06-051-0/+36
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_muc: Utilize mod_disco, instead of reimplementing disco handlingFlorian Zeitz2013-06-051-14/+9