phpbb/phpBB
Igor Wiedler ae984025f0 Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
  [ticket/9084] Explain the logic.
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [feature/append_var] Adding test case
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
  [feature/append_var] Adding append_var template class function
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
  [ticket/10680] Add /phpBB/ext/* to .gitignore
  [ticket/10672] Fix total post count language string in statistics and feed
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
  [ticket/10453] Fixing spacing
  ...

Conflicts:
	tests/bootstrap.php
2012-03-11 15:18:33 +01:00
..
adm [ticket/10645] Missing CSS for checkboxes 2012-02-13 12:28:01 +02:00
assets/javascript [ticket/10155] Update to jQuery 1.6.2 2011-07-12 10:24:20 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge remote-tracking branch 'cyberalien/ticket/10378' into develop 2012-02-17 14:08:03 +01:00
docs [feature/event-dispatcher] Add Symfony2 to AUTHORS 2012-01-08 01:01:11 +01:00
download [feature/event-dispatcher] Use real EventDispatcher through composer 2012-03-11 15:15:33 +01: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' into feature/event-dispatcher 2012-03-11 15:18:33 +01:00
install Merge branch 'develop' into feature/event-dispatcher 2012-03-11 15:18:33 +01:00
language Merge branch 'develop-olympus' into develop 2012-03-09 23:43:11 +01:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop-olympus' into develop 2012-02-28 22:25:09 +01:00
.htaccess [Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http 2010-01-19 19:08:51 +00:00
common.php [feature/event-dispatcher] Use real EventDispatcher through composer 2012-03-11 15:15:33 +01:00
composer.json [feature/event-dispatcher] Use real EventDispatcher through composer 2012-03-11 15:15:33 +01:00
composer.lock [feature/event-dispatcher] Use real EventDispatcher through composer 2012-03-11 15:15:33 +01: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 [ticket/10672] Fix total post count language string in statistics and feed 2012-02-27 19:13:31 +01:00
index.php [ticket/10672] Fix total post count language string in statistics and feed 2012-02-27 19:13:31 +01:00
mcp.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
memberlist.php [ticket/10634] Specify module type when viewing profile 2012-02-09 01:34:50 +02:00
posting.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
report.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
search.php Merge branch 'develop-olympus' into develop 2012-02-26 15:47:16 +01:00
ucp.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewforum.php Merge branch 'develop-olympus' into develop 2012-02-11 05:48:03 -05:00
viewonline.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
viewtopic.php Merge branch 'develop-olympus' into develop 2012-02-11 05:48:03 -05:00
web.config [ticket/10219] Remove invalid and invisible character from web.config. 2011-06-14 23:18:33 +02:00