1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00
Nathan Guse 65f52d7575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-06 09:08:53 -05:00

phpBB

ABOUT

phpBB is a free bulletin board written in PHP.

COMMUNITY

Find support and lots more on phpBB.com! Discuss the development on area51.

INSTALLING DEPENDENCIES

To be able to run an installation from the repo (and not from a pre-built package) you need to run the following commands to install phpBB's dependencies.

cd phpBB
php ../composer.phar install --dev

CONTRIBUTE

  1. Create an account on phpBB.com
  2. Create a ticket (unless there already is one)
  3. Read our Git Contribution Guidelines; if you're new to git, also read the introduction guide
  4. Send us a pull request

AUTOMATED TESTING

We have unit and functional tests in order to prevent regressions. You can view the bamboo continuous integration here or check our travis build below. develop - Build Status develop-olympus - Build Status

LICENSE

GNU General Public License v2

Description
No description provided
Readme 197 MiB
Languages
PHP 87%
HTML 8.4%
JavaScript 2.7%
CSS 1.6%
Shell 0.2%