aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-261-1/+1
|\ | | | | | | | | | | | | * Senky/ticket/10161: [ticket/10161] added fullstop to the end of sentence [ticket/10161] coding-guidelines.html updated [ticket/10161] all "e-mail" strings in language files changed to "email"
| * [ticket/10161] added fullstop to the end of sentenceSenky2012-04-261-1/+1
| | | | | | | | PHPBB3-10161
| * [ticket/10161] coding-guidelines.html updatedSenky2012-04-261-1/+1
| | | | | | | | PHPBB3-10161
* | Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-194-46/+57
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * [ticket/10688] Update install.html for 3.1 and current practices.Oleg Pudeyev2012-04-121-8/+12
| | | | | | | | PHPBB3-10688
| * [ticket/10688] Update readme for 3.1 and current practices.Oleg Pudeyev2012-04-111-24/+31
| | | | | | | | PHPBB3-10688
| * [ticket/10688] Changed 3.0 to 3.1 in docsShibu Lijack2012-04-114-16/+16
| | | | | | | | | | | | | | Replaced all the occurrences of phpBB 3.0 with phpBB 3.1 in all the doc files PHPBB-10688
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-121-2/+3
|\ \ | | | | | | | | | | | | | | | * develop-olympus: [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
| * | [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.Andreas Fischer2012-04-111-2/+2
| | | | | | | | | | | | PHPBB3-10788
| * | [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.Andreas Fischer2012-04-111-0/+1
| | | | | | | | | | | | PHPBB3-10788
* | | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | PHPBB3-10609
* | | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-312-3/+3
| | | | | | | | | | | | PHPBB-10609
* | | [feature/merging-style-components] Updating styles in coding guidelinesVjacheslav Trushkin2012-03-311-13/+17
| | | | | | | | | | | | | | | | | | Updating styles section in coding guidelines PHPBB3-10632
* | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-311-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ \ Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-303-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (35 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. [ticket/10703] Added a condition to check if ext directory exists [ticket/10708] Check converted passwords for multi-byte characters [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. ...
| * | | | [feature/event-dispatcher] Add Symfony2 to AUTHORSIgor Wiedler2012-01-081-0/+3
| | |_|/ | |/| | | | | | | | | | PHPBB3-9550
* | | | Merge remote-tracking branch 'upstream/develop' into ↵Vjacheslav Trushkin2012-03-293-6/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/merging-style-components * upstream/develop: (65 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10723] Stop Travis running all tests on sqlite [ticket/10703] Added a condition to check if ext directory exists [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information ... Conflicts: phpBB/install/database_update.php
| * | | [task/php5.3] Updated range of tested PHP versionsDavid King2012-03-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10693
| * | | [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed ↵David King2012-03-253-5/+5
| |/ / | | | | | | | | | | | | | | | to PHP 5.3.2 PHPBB3-10693
* | | [feature/merging-style-components] Updating coding guidelinesVjacheslav Trushkin2012-03-141-13/+14
|/ / | | | | | | | | | | Updating template inheritance section in coding guidelines PHPBB3-10632
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-028-12/+11
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-027-9/+9
| | | | | | | | PHPBB3-9916
| * [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
| | | | | | | | PHPBB3-9916
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-117/+121
|\ \ | |/ | | | | | | * develop-olympus: [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
| * [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.Andreas Fischer2011-12-161-117/+121
| |
* | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 placesDavid King2011-12-121-3/+3
| | | | | | | | PHPBB3-10524
* | Merge branch 'develop-olympus' into developNils Adermann2011-12-011-1/+1
|\ \ | |/ | | | | | | | | | | * develop-olympus: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| * [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.Andreas Fischer2011-11-291-1/+1
| | | | | | | | PHPBB3-10502
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-281-1/+0
|\ \ | |/ | | | | | | * develop-olympus: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
| * [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.Andreas Fischer2011-11-281-1/+0
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-0/+8
|\ \ | |/ | | | | | | * develop-olympus: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
| * [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.Andreas Fischer2011-11-271-0/+8
| |
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-212-20/+146
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.10-RC1 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.10 releases. Conflicts: phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| * [develop-olympus] Add changelog for 3.0.10-RC1Igor Wiedler2011-11-211-18/+144
| |
| * [develop-olympus] Bumping version numbers to final for 3.0.10 releases.Andreas Fischer2011-11-201-2/+2
| |
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-22/+20
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10430] Fix typos/etc in coding guidelines
| * [ticket/10430] Fix typos/etc in coding guidelinesdellsystem2011-10-281-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mainly minor changes to correct errors and improve readability. * "overcroud" --> "overcrowd" * "concentinations" --> "concatenations" * "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed * "keep a very close eye to it" --> "keep a very close eye on it" * Fixed some fragmented sentences under the SQL Quotes section * Added capitalisation of "sql", "select", "select distinct" * "noticable" --> "noticeable" * "outputed" --> "outputted" * Added a missing "it" on the line about append_sid() * And some other grammatical/stylistic changes, not worth listing them all PHPBB3-10430
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-51/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10246] Move coding guidelines VCS section to wiki
| * [ticket/10246] Move coding guidelines VCS section to wikiIgor Wiedler2011-10-131-51/+1
| | | | | | | | | | | | | | The VCS section can now be found at: * http://wiki.phpbb.com/Git#Branches PHPBB3-10246
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-131-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/9898] Encourage patches in README
| * [ticket/9898] Encourage patches in READMEIgor Wiedler2011-10-131-1/+1
| | | | | | | | PHPBB3-9898
* | Merge remote-tracking branch 'igorw/ticket/10155' into developOleg Pudeyev2011-09-053-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10155: [ticket/10155] Briefly explain assets in coding-guidelines [ticket/10155] Move jQuery inclusion to footer [ticket/10155] Update to jQuery 1.6.2 [ticket/10155] Add jQuery to AUTHORS [ticket/10155] Add jQuery, introduce global assets path
| * | [ticket/10155] Briefly explain assets in coding-guidelinesIgor Wiedler2011-07-171-1/+1
| | | | | | | | | | | | PHPBB3-10155
| * | [ticket/10155] Add jQuery to AUTHORSIgor Wiedler2011-07-121-0/+1
| | | | | | | | | | | | PHPBB3-10155
| * | [ticket/10155] Add jQuery, introduce global assets pathIgor Wiedler2011-07-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the jQuery JavaScript library to all pages, giving modifications instant access and allowing for any future core JavaScript to take advantage of it. Also introduce a global /assets directory for assets that are shared between styles. PHPBB3-10155
* | | Merge remote-tracking branch 'github-p/feature/template-engine' into developNils Adermann2011-08-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/feature/template-engine: (87 commits) [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. [feature/template-engine] Delete no longer used $template_filename property. [feature/template-engine] Delete useless $template globalization. [feature/template-engine] Use template engine class in bbcode class. [feature/template-engine] Corrected an error message in template locator. [feature/template-engine] Remaining documentation. [feature/template-engine] More documentation for template class. [feature/template-engine] Create load_and_render to reduce code duplication. [feature/template-engine] Get rid of orig_tpl_* in template engine. [feature/template-engine] Delete $style_name param from locator's set_custom_template. [feature/template-engine] Add constructor to template locator. [feature/template-engine] Factor template locator out of template class. [feature/template-engine] Delete $files_template property. [feature/template-engine] Rename is_absolute to phpbb_is_absolute. [feature/template-engine] Test template DEFINE statements across files ... Conflicts: .gitignore phpBB/includes/template.php
| * | | [feature/template-engine] Remove $include_once argument of display()Igor Wiedler2011-07-101-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9726
* | | | Merge remote-tracking branch 'github-igorw/ticket/10258' into developNils Adermann2011-07-207-85/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/ticket/10258: [ticket/10258] Remove the meta charset tag [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines [ticket/10258] Remove copyright meta tag from docs [ticket/10258] Remove resource-type and distribution meta tags [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags [ticket/10258] Change the DOCTYPE to HTML5
| * | | | [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelinesIgor Wiedler2011-07-111-15/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-10258
| * | | | [ticket/10258] Remove copyright meta tag from docsIgor Wiedler2011-07-117-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fails HTML5 validation and we already have a 'copyright and disclaimer' section in all of those documents. We can always represent the copyright more semantically later (such as the HTML5 <copyright> tag). PHPBB3-10258