Nathaniel Guse 59638a6a7d Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386 ...

Conflicts:
	phpBB/includes/extension/finder.php

2013-03-02 14:48:44 -06:00

..

adm

[feature/migrations] Catch and display errors from the migrator

2013-02-09 21:09:29 -06:00

assets/javascript

[ticket/11103] Only lookup $(target) once

2013-01-15 12:30:26 -06:00

cache

…

config

[ticket/11386] Fix circular reference error & serialize error

2013-03-02 14:15:59 -06:00

develop

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

2013-02-11 21:37:15 -06:00

docs

Merge branch 'develop-olympus' into develop

2013-02-24 17:37:38 +01:00

download

[ticket/11306] Introduce phpbb_create_default_container

2013-01-02 06:41:35 +01:00

files

…

images

…

includes

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

2013-03-02 14:48:44 -06:00

install

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

2013-02-26 15:32:27 -06:00

language

[ticket/11103] Few more minor language things

2013-02-28 17:48:46 -06:00

store

…

styles

[ticket/11103] Revert whitespace changes

2013-02-28 17:50:24 -06:00

.htaccess

[feature/controller] Remove url rewriting until we use pathinfo in controllers

2012-11-18 13:32:54 -05:00

app.php

[feature/controller] Check for proper status codes from controllers

2012-11-19 12:37:20 -05:00

common.php

[ticket/11305] Define hook finder as a service on the container.

2013-01-02 01:36:50 -05:00

composer.json

[ticket/11238] Set goutte version to 0.1.0.

2012-12-02 23:44:49 -05:00

composer.lock

[ticket/11238] Set goutte version to 0.1.0.

2012-12-02 23:44:49 -05:00

cron.php

…

faq.php

…

feed.php

…

index.php

[ticket/11103] Instantiate $phpbb_notifications as needed

2012-12-13 19:19:40 -06:00

mcp.php

…

memberlist.php

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

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

posting.php

Merge branch 'develop-olympus' into develop

2012-12-20 14:28:01 +01:00

report.php

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

2013-01-15 11:31:39 -06:00

search.php

…

ucp.php

[ticket/10679] Use module_auth to limit access to the module

2012-12-06 16:33:12 +01:00

viewforum.php

[ticket/10954] Change behavior of marking topics/forums

2012-12-14 15:46:45 +01:00

viewonline.php

[ticket/11259] adm_relative_path -> phpbb_adm_relative_path

2012-12-09 19:29:51 -06:00

viewtopic.php

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

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

web.config

[feature/controller] Remove URL rewriting by default

2012-11-16 17:06:02 -05:00