Meik Sievertsen d46e8e6f98 merge revisions i missed... hopefully not breaking things - did not check every change. ...

git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0

2008-11-22 19:38:25 +00:00

..

info

been a while :( ... merge in r8997, r8998, r8999, r9000, r9001, r9002, r9003, r9004, r9005, r9007, r9008, r9009, r9010, r9011, r9012, r9013, r9014, r9015, r9022, r9023, r9029, r9030, r9034, r9048, r9049, r9054, r9056

2008-11-13 13:04:54 +00:00

acp_attachments.php

merge revisions i missed... hopefully not breaking things - did not check every change.

2008-11-22 19:38:25 +00:00

acp_ban.php

PHP5.3 compatibility.

2008-08-15 13:00:20 +00:00

acp_bbcodes.php

merge

2008-08-13 12:28:17 +00:00

acp_board.php

- Automatically add users/groups to the PM recipient list, if entered or selected.

2008-09-23 13:11:34 +00:00

acp_bots.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_captcha.php

Fix typos

2008-09-25 19:55:04 +00:00

acp_database.php

hmm, this seems to be a merge i forgot

2008-07-29 13:39:50 +00:00

acp_disallow.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_email.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_forums.php

do not allow categories to be locked by accident (Bug #14548)

2008-09-19 17:07:45 +00:00

acp_groups.php

merge revisions i missed... hopefully not breaking things - did not check every change.

2008-11-22 19:38:25 +00:00

acp_icons.php

Merge revisions:

2008-10-08 12:51:43 +00:00

acp_inactive.php

removed executable props [Bug #6464]

2008-06-04 15:38:14 +00:00

acp_jabber.php

Add two standard language items - #30885

2008-10-09 15:42:08 +00:00

acp_language.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_logs.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_main.php

merge revisions i missed... hopefully not breaking things - did not check every change.

2008-11-22 19:38:25 +00:00

acp_modules.php

Remove caching of templates from the database completely, themes is cut down ready for a complete chop, and fix the installer :)

2008-09-04 11:39:25 +00:00

acp_permission_roles.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_permissions.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_php_info.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_profile.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_prune.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_ranks.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_reasons.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_search.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_styles.php

merge revisions i missed... hopefully not breaking things - did not check every change.

2008-11-22 19:38:25 +00:00

acp_update.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

acp_users.php

merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837, r8838

2008-09-08 13:39:34 +00:00

acp_words.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00

auth.php

ok... i hope i haven't messed too much with the code and everything is still working.

2008-05-29 12:25:56 +00:00