Nils Adermann a30ec6e052 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.

2011-06-05 01:58:52 +02:00

..

acp

Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop

2011-05-20 19:50:29 -04:00

auth

Merge branch 'feature/igorw/request-class' into develop

2010-12-16 02:22:17 +01:00

cache

[feature/attachment-management-no-reassignment] Handle privacy and some more.

2011-04-24 23:33:51 +08:00

captcha

Merge branch 'develop-olympus' into develop

2011-05-10 23:32:27 -04:00

config

[ticket/10139] Make signatures of set_atomic() consistent by using $new_value.

2011-04-19 10:17:18 +02:00

cron

[ticket/10156] Fix new cron on windows.

2011-05-19 22:34:18 -04:00

db

Merge branch 'develop-olympus' into develop

2011-06-02 23:32:12 +02:00

diff

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

hooks

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

lock

[feature/system-cron] preg_match returns int so cast to bool, fix comment

2011-02-12 22:05:54 -05:00

mcp

Merge branch 'develop-olympus' into develop

2011-04-17 11:09:17 -04:00

questionnaire

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

request

[feature/request-class] Fix the error message when accessing superglobal

2011-02-28 08:04:40 +01:00

search

[ticket/9574] Add pcre_utf8_support() function

2010-12-28 22:37:33 +01:00

ucp

Merge branch 'develop-olympus' into develop

2011-06-05 01:58:52 +02:00

utf

[ticket/9669] Replace spaces with tabs

2011-03-07 09:49:58 +01:00

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02:00

auth.php

Merge branch 'develop-olympus' into develop

2011-04-22 11:17:39 +02:00

bbcode.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

class_loader.php

[task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.

2011-01-09 23:49:44 +01:00

constants.php

Merge branch 'develop-olympus' into develop

2011-02-23 22:03:42 -05:00

error_collector.php

[ticket/10057] Fixes for a bunch of small problems.

2011-03-08 19:48:56 -05:00

functions_acp.php

[ticket/10070] Fixed line endings after ticket/9549.

2011-03-01 17:47:42 -05:00

functions_admin.php

[ticket/9684] Remove code in some more files especially includes/

2011-04-07 13:47:06 +02:00

functions_compress.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_content.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_convert.php

Merge branch 'develop-olympus' into develop

2010-12-13 17:14:36 +01:00

functions_display.php

Merge branch 'develop-olympus' into develop

2011-05-09 22:28:35 -04:00

functions_download.php

Merge branch 'develop-olympus' into develop

2011-02-24 10:54:51 +01:00

functions_install.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_jabber.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_messenger.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_module.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_posting.php

[ticket/9693] Removed useless $auth globalizations.

2011-04-30 13:20:27 -04:00

functions_privmsgs.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_profile_fields.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_template.php

Merge branch 'develop-olympus' into develop

2011-04-23 21:52:04 +02:00

functions_transfer.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

functions_upload.php

Merge branch 'develop-olympus' into develop

2011-01-10 23:43:04 +01:00

functions_user.php

Merge branch 'develop-olympus' into develop

2011-04-10 19:52:58 -04:00

functions.php

Merge branch 'develop-olympus' into develop

2011-06-03 11:00:26 +02:00

group_positions.php

[ticket/9549] New method move() to move a group more than 1 up/down.

2011-02-16 18:22:32 +01:00

index.htm

…

message_parser.php

Merge branch 'ticket/rxu/10117' into develop-olympus

2011-04-17 00:31:24 -04:00

session.php

Merge branch 'develop-olympus' into develop

2011-06-05 01:58:52 +02:00

template.php

Merge branch 'develop-olympus' into develop

2011-04-26 21:49:31 +02:00