php-phpbb

mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 17:15:19 +02:00

Go to file

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

build

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

code_sniffer/phpbb

[ticket/9916] Updating license in non-distributed files

2012-01-02 19:10:36 +01:00

git-tools

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

phpBB

Merge branch 'develop' into feature/event-dispatcher