1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 11:24:35 +02:00
Vjacheslav Trushkin 398a6c8045 Merge branch 'develop' into feature/merging-style-components
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
2012-03-31 10:43:06 +03: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
curl -s http://getcomposer.org/installer | php
php composer.phar install

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 202 MiB
Languages
PHP 88.1%
HTML 7.2%
JavaScript 2.8%
CSS 1.6%
Shell 0.2%