Joas Schilling 34ad665c8b Merge branch 'ticket/8319' into ticket/8319-develop2 ...

* ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse

Conflicts:
	phpBB/install/database_update.php

2013-07-10 17:24:49 +02:00

..

attachments.php

…

ban.php

…

board.php

[ticket/10325] fix acp language

2013-05-04 14:44:33 +05:30

bots.php

…

common.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2012-12-13 19:21:29 -06:00

database.php

…

email.php

…

extensions.php

[ticket/10631] Use exceptions for errors. Build action list dynamically.

2012-09-01 15:05:34 +01:00

forums.php

…

groups.php

[ticket/10411] Use template loops instead of defining the html in php files

2013-02-25 20:24:11 +01:00

index.htm

…

language.php

…

modules.php

…

permissions_phpbb.php

[ticket/10679] Add new permission for changing profile field information

2012-12-06 15:10:29 +01:00

permissions.php

…

posting.php

Merge branch 'ticket/8319' into ticket/8319-develop2

2013-07-10 17:24:49 +02:00

profile.php

Merge branch 'develop-olympus' into develop

2012-07-23 15:50:54 +02:00

prune.php

[ticket/11236] Change PRUNE_USERS_GROUP_EXPLAIN language

2013-04-25 11:23:09 -05:00

search.php

Merge branch 'develop-olympus' into develop

2013-06-05 01:55:49 +05:30

styles.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

users.php

Merge branch 'develop-olympus' into develop

2012-07-21 16:15:42 +02:00