Igor Wiedler 83bdf3eeb3 Merge branch 'develop' into ticket/11015 ...

* develop:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options

Conflicts:
	phpBB/includes/extension/manager.php

2012-07-21 18:21:08 +02:00

..

adm

[ticket/11008] Remove eval() calls to get document[id]

2012-07-21 00:12:37 +02:00

assets/javascript

[feature/new-tz-handling] Display suggestion when a different value is selected

2012-07-19 14:24:59 +02:00

cache

…

develop

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-handling

2012-07-18 11:07:32 +02:00

docs

Merge branch 'develop-olympus' into develop

2012-07-19 17:57:16 +02:00

download

[ticket/11015] Make DBAL classes autoloadable

2012-07-21 18:11:14 +02:00

files

…

images

…

includes

Merge branch 'develop' into ticket/11015

2012-07-21 18:21:08 +02:00

install

[ticket/11015] Make DBAL classes autoloadable

2012-07-21 18:11:14 +02:00

language

Merge remote-tracking branch 'github-nickvergessen/ticket/11002' into develop

2012-07-21 16:35:24 +02:00

store

…

styles

[ticket/11008] Change onunload_functions to not use eval()

2012-07-21 00:12:45 +02:00

.htaccess

…

common.php

[ticket/11015] Make DBAL classes autoloadable

2012-07-21 18:11:14 +02:00

composer.json

Merge branch 'develop-olympus' into develop

2012-07-19 16:59:45 +02:00

composer.lock

Merge branch 'develop-olympus' into develop

2012-07-19 16:59:45 +02:00

cron.php

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

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

faq.php

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

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

feed.php

Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

2012-06-04 18:09:35 +02:00

index.php

Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into feature/new-tz-handling

2012-06-04 18:09:35 +02:00

mcp.php

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

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

memberlist.php

Merge pull request #843 from nickvergessen/feature/new-tz-handling

2012-07-19 08:46:25 -07:00

posting.php

[feature/qrpreview] Do not error or show preview if no text is entered

2012-03-31 15:52:16 -04:00

report.php

[feature/save-post-on-report] Changed the name of the column

2012-03-19 08:27:32 -04:00

search.php

[feature/pagination-as-list] New parameter for name of start var

2012-07-18 14:32:42 +01:00

ucp.php

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

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

viewforum.php

[feature/pagination-as-list] New parameter for name of start var

2012-07-18 14:32:42 +01:00

viewonline.php

[feature/pagination-as-list] New parameter for name of start var

2012-07-18 14:32:42 +01:00

viewtopic.php

Merge pull request #843 from nickvergessen/feature/new-tz-handling

2012-07-19 08:46:25 -07:00

web.config

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

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