Nathan Guse 0d7f49892a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/config/services.yml

2012-09-14 16:01:37 -05:00

..

adm

[ticket/10631] Adjust prefixes to be easier to understand

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

assets/javascript

…

cache

…

config

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

2012-09-14 16:01:37 -05:00

develop

[ticket/11103] Store the item's parent id for marking things read

2012-09-14 15:59:13 -05:00

docs

…

download

[ticket/11101] Delay execution of container processors

2012-09-08 14:41:41 +02:00

files

…

images

…

includes

[ticket/11103] Store the item's parent id for marking things read

2012-09-14 15:59:13 -05:00

install

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

2012-09-14 16:01:37 -05:00

language

[ticket/11103] Quote notifications

2012-09-12 23:55:29 -05:00

store

…

styles

[ticket/11103] Store the item's parent id for marking things read

2012-09-14 15:59:13 -05:00

.htaccess

…

common.php

[ticket/11103] Do not initialize the notifications in common.php

2012-09-09 12:27:37 -05:00

composer.json

…

composer.lock

[feature/dic] Update composer.lock to symfony/* RC1

2012-08-25 17:08:38 +02:00

cron.php

…

faq.php

…

feed.php

…

index.php

Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop

2012-08-20 09:09:53 -04:00

mcp.php

[feature/php-events] Readd comment from d06adb06e9

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

memberlist.php

[feature/php-events] Fix doc of core.memberlist_prepare_profile_data

2012-08-20 10:07:05 +02:00

posting.php

Merge pull request #962 from imkingdavid/feature/add_events

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

report.php

…

search.php

[ticket/10943] displays searched query in search result

2012-08-11 02:26:46 +05:30

ucp.php

[feature/php-events] Fix naming and doc of core.ucp_display_module_before

2012-08-03 23:41:00 +02:00

viewforum.php

Merge remote-tracking branch 'upstream/develop' into feature/dic

2012-08-25 17:00:40 +02:00

viewonline.php

[feature/php-events] Fix doc of core.viewonline_overwrite_location

2012-08-20 10:15:04 +02:00

viewtopic.php

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

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

web.config

…