Marc Alexander 1aae72961a Merge branch 'develop' into feature/avatars ...

Conflicts:
	phpBB/install/database_update.php

2012-12-09 21:02:31 +01:00

..

adm

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

assets/javascript

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

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

cache

…

config

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

develop

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

docs

[ticket/10091] Bump minimum supported postgresql version to 8.3.

2012-12-04 02:52:18 -05:00

download

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

files

…

images

…

includes

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

install

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

language

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

store

…

styles

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +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

[feature/avatars] Only create avatar objects if necessary

2012-11-25 14:33:13 +01: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

…

feed.php

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

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

index.php

[feature/controller] Implement a front controller

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

mcp.php

…

memberlist.php

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01: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/11023] Fix additional whitespaces that were added by PHPBB3-10968

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

ucp.php

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

2012-12-06 16:33:12 +01: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 branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +01:00

web.config

[feature/controller] Remove URL rewriting by default

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