Joas Schilling 3cee183dd4 [ticket/9657] Break the schemas again to avoid merge conflicts ...

PHPBB3-9657

2013-02-27 12:51:34 +01:00

..

adm

[feature/events] Remove extraneous space

2012-12-17 18:16:39 -05:00

assets/javascript

[ticket/10803] Show failure message until user dismisses it

2012-12-18 23:42:14 +01:00

cache

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

config

Merge remote-tracking branch 'p/feature/template-events' into develop

2012-12-10 14:09:10 -05:00

develop

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

docs

[feature/events] Fix improperly named event in documentation

2012-12-20 15:03:45 -05:00

download

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

2012-12-06 21:49:24 -05:00

files

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

images

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

includes

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

install

[ticket/9657] Break the schemas again to avoid merge conflicts

2013-02-27 12:51:34 +01:00

language

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

store

[ticket/9520] Removed per directory web.config files.

2010-05-03 19:31:40 +02:00

styles

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01: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

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

2012-12-06 21:49:24 -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

[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

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

index.php

[feature/controller] Implement a front controller

2012-11-16 16:25:09 -05:00

mcp.php

[feature/soft-delete] Fix the rest of *_approved and the delete_post unit test

2012-11-10 11:24:52 +01:00

memberlist.php

Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop

2012-11-10 12:27:19 +01:00

posting.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01: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

Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop

2012-11-10 12:27:19 +01:00

ucp.php

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

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

viewforum.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

viewonline.php

[ticket/11014] Fix old pagination assignment

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

viewtopic.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

web.config

[feature/controller] Remove URL rewriting by default

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