Oleg Pudeyev 7987e0e681 Merge PR #1052 branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html

Conflicts:
	phpBB/docs/INSTALL.html

2012-11-09 20:20:37 -05:00

..

adm

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

assets/javascript

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

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

cache

…

config

[ticket/10933] Dependency inject template context.

2012-11-02 18:51:35 -04:00

develop

Merge PR #786 branch 'brunoais/ticket/10845' into develop

2012-11-06 16:23:33 -05:00

docs

Merge PR #1052 branch 'develop-olympus' into develop

2012-11-09 20:20:37 -05:00

download

[ticket/11101] Delay execution of container processors

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

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2012-11-09 23:47:07 +01:00

install

[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)

2012-11-09 23:16:42 +01:00

language

[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)

2012-11-09 23:16:42 +01:00

store

…

styles

[ticket/10172] Show prosilver birthday list even if there are no birthdays.

2012-11-09 17:41:53 +01:00

.htaccess

…

common.php

[ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)

2012-11-09 23:16:42 +01:00

composer.json

[feature/dic] Remove duplicate event-dispatcher dependency

2012-07-29 17:30:06 +02:00

composer.lock

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

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

cron.php

[feature/dic] Rename occurances of $container to $phpbb_container

2012-04-09 14:37:04 +02: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

[ticket/8796] Mark read links updated to include time() in url

2012-09-03 18:51:29 -05:00

mcp.php

[feature/php-events] Readd comment from d06adb06e907e31918130a6ef010b73d454f396c

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

memberlist.php

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

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

posting.php

Merge pull request #962 from imkingdavid/feature/add_events

2012-09-01 12:44:23 -07: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

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

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

ucp.php

Merge branch 'develop-olympus' into develop

2012-10-29 15:16:59 -04: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 remote-tracking branch 'Fyorl/feature/attach-dl' into develop

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

web.config

…