Igor Wiedler 0fd3bb170b [ticket/11015] Fixup some things from the big merge ...

PHPBB3-11015

2012-11-12 11:16:39 +01:00

..

adm

[ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.

2012-11-10 00:23:03 +01:00

assets/javascript

Merge PR #890 branch 'nickvergessen/ticket/10982' into develop

2012-10-16 21:47:13 -04:00

cache

…

config

[ticket/11193] Instantiate a single collection_pass for all collections

2012-11-11 18:39:24 +01:00

develop

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05:00

docs

Merge PR #1052 branch 'develop-olympus' into develop

2012-11-09 20:20:37 -05:00

download

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-11-12 10:46:21 +01:00

files

…

images

…

includes

[ticket/11015] Fixup some things from the big merge

2012-11-12 11:16:39 +01:00

install

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-11-12 10:46:21 +01:00

language

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

store

…

styles

[ticket/10780] Use L_COLON for "download all attachments".

2012-11-10 00:27:37 +01:00

.htaccess

…

common.php

Merge remote-tracking branch 'upstream/develop' into ticket/11015

2012-11-12 10:46:21 +01:00

composer.json

[feature/compiled-dic] Add HttpKernel; the Extension class is loaded from it

2012-11-10 11:40:10 +01:00

composer.lock

[feature/compiled-dic] Update the composer.lock file

2012-11-10 12:02:56 +01:00

cron.php

[ticket/11189] Replace DEBUG_EXTRA with DEBUG

2012-11-10 10:45:02 -06:00

faq.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

feed.php

[ticket/11077] Remove code from old global announcements system

2012-11-11 13:04:14 +01:00

index.php

[ticket/8796] Mark read links updated to include time() in url

2012-09-03 18:51:29 -05:00

mcp.php

[feature/php-events] Readd comment from d06adb06e9

2012-08-11 11:49:48 +02:00

memberlist.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

posting.php

Merge pull request #962 from imkingdavid/feature/add_events

2012-09-01 12:44:23 -07:00

report.php

[ticket/10845] Removed one empty line that wasn't supposed to be there

2012-06-14 19:23:46 +01:00

search.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +02:00

ucp.php

Merge branch 'develop-olympus' into develop

2012-10-29 15:16:59 -04:00

viewforum.php

[ticket/8796] Mark read links updated to include time() in url

2012-09-03 18:51:29 -05:00

viewonline.php

[ticket/11014] Fix old pagination assignment

2012-10-17 23:34:37 +02:00

viewtopic.php

Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop

2012-08-26 18:56:09 +02:00

web.config

[ticket/10219] Remove invalid and invisible character from web.config.

2011-06-14 23:18:33 +02:00