| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
* develop-olympus:
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
|
| |\
| | |
| | |
| | |
| | | |
* prep-release-3.0.12:
[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
|
| | |
| | |
| | |
| | | |
A wrong fix version was assigned to PHPBB3-11288.
|
|\ \ \
| | | |
| | | | |
[ticket/11747] UCP Prefs Core and Template Events
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11747
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11747
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11747
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11747
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11747
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/11794] Add missing array element commas to docs/coding-guidelines.html
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update the custom_fields template events descriptions according to
nickvergessen's suggestions.
PHPBB3-9550
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The newly added template events weren't listed and described yet in events.md.
Fixed now.
PHPBB3-9550
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | | |
|
| |/
|/|
| |
| | |
PHPBB3-11749
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| | |
PHPBB3-11112
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
...
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |
| | |
| | |
| | | |
PHPBB3-10776
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10776
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10776
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/11122] Add dhruv to active authors
[ticket/11122] Remove Oleg and igorw from active authors
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11122
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11122
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* MGaetan89/ticket/11144:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum
PHPBB3-11144
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | | |
* develop-olympus:
[ticket/11517] Fix list numbering
|
| | |/ /
| | | |
| | | |
| | | | |
PHPBB3-11517
|
| |\ \ \
| | | | |
| | | | | |
[ticket/11461] - Template Event added to bottom of view topic pages
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11461
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11461
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11461
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11438
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-11438
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88
PHPBB3-11438
|
| |/ / /
| | | |
| | | |
| | | | |
PHPBB3-11438
|