aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-09-101-1/+0
|\ | | | | | | | | * develop-olympus: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
| * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
| |\ | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
| | * [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
| | | | | | | | | | | | A wrong fix version was assigned to PHPBB3-11288.
* | | Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-051-0/+60
|\ \ \ | | | | | | | | [ticket/11747] UCP Prefs Core and Template Events
| * | | [ticket/11747] Tweak some of the wording in the events docMatt Friedman2013-07-271-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11747
| * | | [ticket/11747] Use _prepend and _append for template eventsMatt Friedman2013-07-261-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11747
| * | | [ticket/11747] ucp_prefs_post template eventsMatt Friedman2013-07-261-0/+14
| | | | | | | | | | | | | | | | PHPBB3-11747
| * | | [ticket/11747] ucp_prefs_view template eventsMatt Friedman2013-07-261-0/+32
| | | | | | | | | | | | | | | | PHPBB3-11747
| * | | [ticket/11747] ucp_prefs_personal template eventsMatt Friedman2013-07-261-0/+14
| | | | | | | | | | | | | | | | PHPBB3-11747
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-051-0/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: build/build.xml phpBB/install/database_update.php
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-051-0/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [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. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| | * | [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.Andreas Fischer2013-09-021-0/+3
| | | |
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-161-10/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
| * | | [ticket/11794] Add missing array element commas to docs/coding-guidelines.htmlrechosen2013-08-161-10/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | Even though the coding guidelines document prescribes "commas after every array element", it contains several example code fragments with array elements not terminated by a comma. This commit fixes that. PHPBB3-11794
* | | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-8/+8
| | | | | | | | | | | | | | | | | | | | | Update the custom_fields template events descriptions according to nickvergessen's suggestions. PHPBB3-9550
* | | [ticket/9550] Improve template event descriptions in phpBB/docs/events.mdrechosen2013-08-021-4/+2
| | | | | | | | | | | | | | | | | | | | | Per suggestion of nickvergessen, stick to "before" and "after" in the template event descriptions instead of "at the top of" and "at the bottom of". PHPBB3-9550
* | | [ticket/9550] Add the new template events to phpBB/docs/events.mdrechosen2013-08-021-0/+76
| | | | | | | | | | | | | | | | | | | | | The newly added template events weren't listed and described yet in events.md. Fixed now. PHPBB3-9550
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-011-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC2. Conflicts: build/build.xml phpBB/install/database_update.php
| * | [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.Andreas Fischer2013-08-011-0/+5
| | |
* | | [ticket/11749] Template events for topic_list_row_pre/appendMatt Friedman2013-07-271-0/+18
| |/ |/| | | | | PHPBB3-11749
* | 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