aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-07-131-0/+3
|\ | | | | | | | | * develop-olympus: [prep-release-3.0.12] More changelog items for the 3.0.12 release.
| * [prep-release-3.0.12] More changelog items for the 3.0.12 release.Andreas Fischer2013-07-131-0/+3
| |
* | Merge branch 'develop-olympus' into developNils Adermann2013-07-137-31/+31
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php
| * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-127-31/+31
| | | | | | | | PHPBB3-11112
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-20/+165
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-20/+165
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. Conflicts: build/build.xml phpBB/docs/INSTALL.html 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.12 release.Andreas Fischer2013-07-121-20/+165
| | |
| | * [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-121-3/+3
| | |
* | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-115-89/+69
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | Merge branch 'develop-olympus' into developJoas Schilling2013-06-211-16/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | * [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | | | | | | | | | | PHPBB3-10776
| | * Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ↵Dhruv2013-06-201-15/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/10776 # By Callum Macrae # Via Callum Macrae * 'ticket/10776' of git://github.com/callumacrae/phpbb3: [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | | * [ticket/10776] Fixed a couple language changes in docs/README.html.Callum Macrae2012-04-121-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10776
| | | * [ticket/10776] Fixed errors in docs/README.html.Callum Macrae2012-04-101-39/+38
| | | | | | | | | | | | | | | | PHPBB3-10776
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-2/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11122] Add dhruv to active authors [ticket/11122] Remove Oleg and igorw from active authors
| | * | [ticket/11122] Add dhruv to active authorsJoas Schilling2013-06-031-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11122
| | * | [ticket/11122] Remove Oleg and igorw from active authorsJoas Schilling2013-06-031-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11122
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-061-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable Conflicts: phpBB/download/file.php phpBB/styles/prosilver/template/login_forum.html
| | * | Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-061-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * MGaetan89/ticket/11144: [ticket/11144] Add missing {FORUM_NAME} variable [ticket/11144] Add missing {FORUM_NAME} variable
| | | * | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template variable {FORUM_NAME} was missing from the login page of a password protected forum PHPBB3-11144
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-021-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/11517] Fix list numbering
| | * | | [ticket/11517] Fix list numberinghjpotter922013-05-021-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-11517
| * | | Merge pull request #1311 from VSEphpbb/ticket/11461Nils Adermann2013-03-311-0/+9
| |\ \ \ | | | | | | | | | | [ticket/11461] - Template Event added to bottom of view topic pages
| | * | | [ticket/11461] cut doc entry to 79 colsMatt Friedman2013-03-191-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11461
| | * | | [ticket/11461] Further clarify doc for viewtopic_body_footer_beforeMatt Friedman2013-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11461
| | * | | [ticket/11461] Add viewtopic_body_footer_before to the event docsMatt Friedman2013-03-191-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-11461
| * | | | [ticket/11438] Add spaces after # comment start and before \ line breaksJoas Schilling2013-03-161-34/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-11438
| * | | | [ticket/11438] Add empty sql_query_pre to delta-sourceJoas Schilling2013-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11438
| * | | | [ticket/11438] Move backslash to concatenate the query strings correctlyJoas Schilling2013-03-151-60/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88 PHPBB3-11438
| * | | | [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()Joas Schilling2013-03-151-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-11438
* | | | [ticket/9657] Check for post visibility when searching with SphinxJoas Schilling2013-03-141-0/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | This update will require admins to manually update their Sphinx config file aswell as to delete the index and rebuild it from scratch. Before this is done the search will not be usable anymore. PHPBB3-9657
* | | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/11122] Move rxu to 'Former Contributors' section. [ticket/11122] Add EXreaction to docs/AUTHORS.
| * | [ticket/11122] Move rxu to 'Former Contributors' section.Andreas Fischer2013-02-241-1/+1
| | | | | | | | | | | | PHPBB3-11122
| * | [ticket/11122] Add EXreaction to docs/AUTHORS.Andreas Fischer2013-02-241-0/+1
| | | | | | | | | | | | PHPBB3-11122
* | | Merge remote-tracking branch 'p/ticket/11248' into developAndreas Fischer2012-12-221-30/+60
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/11248: [ticket/11248] Convert line endings to LF - develop edition.
| * | | [ticket/11248] Convert line endings to LF - develop edition.Oleg Pudeyev2012-12-071-30/+60
| | | | | | | | | | | | | | | | PHPBB3-11248
* | | | [ticket/11287] Add template event naming to docs/coding-guidelines.htmlDavid King2012-12-201-0/+52
| | | | | | | | | | | | | | | | PHPBB3-11287
* | | | [feature/events] Fix improperly named event in documentationDavid King2012-12-201-2/+4
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/events] Fix alphabetization of eventsDavid King2012-12-201-4/+4
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/events] Put events in alphabetical orderDavid King2012-12-201-23/+23
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/events] Make EVENTS.md lowercaseDavid King2012-12-201-0/+0
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/events] Use ` to escape HTML tags in markdownDavid King2012-12-171-7/+7
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/events] Remove HTML tags from markdown so they don't get parsedDavid King2012-12-171-7/+7
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | [feature/events] Add markdown template event documentation fileDavid King2012-12-171-0/+130
|/ / / | | | | | | | | | PHPBB3-9550
* | | [ticket/10091] Bump minimum supported postgresql version to 8.3.Oleg Pudeyev2012-12-042-2/+2
| | | | | | | | | | | | PHPBB3-10091
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-291-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11227] @return void -> @return null in develop-olympus.
| * | [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-291-1/+1
| | | | | | | | | | | | PHPBB3-11227
* | | [ticket/11205] Fix merge conflict in readme.html.Oleg Pudeyev2012-11-151-5/+1
| | | | | | | | | | | | PHPBB3-11205
* | | Merge PR #1052 branch 'develop-olympus' into developOleg Pudeyev2012-11-091-66/+85
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files [ticket/10865] Phrase change for visiting with browser [ticket/10865] Grammar corrections for the entire document [ticket/10865] Typo and phrasing change [ticket/10865] Updates and additions to /docs/INSTALL.html Conflicts: phpBB/docs/INSTALL.html
| * | Merge PR #1052 branch 'p/ticket/10865' into develop-olympusOleg Pudeyev2012-11-091-68/+87
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10865: [ticket/10865] Use code tags for install/database_update.php. [ticket/10865] Should have been a slash. [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files [ticket/10865] Phrase change for visiting with browser [ticket/10865] Grammar corrections for the entire document [ticket/10865] Typo and phrasing change [ticket/10865] Updates and additions to /docs/INSTALL.html