| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
|
|
|
| |
PHPBB3-11980
|
| |
|
| |
|
|
|
|
| |
PHPBB3-11913
|
|\
| |
| |
| |
| | |
* develop-olympus:
[ticket/11877] Create package links and checksums for announcement via script.
|
| |
| |
| |
| | |
PHPBB3-11877
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/11876] Replace MD5 with SHA256.
[ticket/11876] Move checksum generation from build PHP files to phing build.xml
|
| |
| |
| |
| | |
PHPBB3-11876
|
| |
| |
| |
| |
| |
| | |
This also removes paths from the checksum files.
PHPBB3-11876
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now.
Conflicts:
build/build.xml
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag.
[prep-release-3.0.12] Bumping version number for 3.0.12 final.
Conflicts:
build/build.xml
phpBB/install/database_update.php
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* prep-release-3.0.12:
[prep-release-3.0.12] Bumping version number for 3.0.12 final.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
|
| | | |
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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:
[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:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
|
| | | |
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* upstream/develop:
[ticket/11704] Use the correct directory for dependency checking.
[ticket/11704] Correctly escape "
[ticket/11697] author_search() used incorrect parameter
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
* github-phpbb/develop-olympus:
[ticket/11704] Use the correct directory for dependency checking.
[ticket/11704] Correctly escape "
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-11704
|
| | |/
| | |
| | |
| | | |
PHPBB3-11704
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* upstream/develop: (575 commits)
[ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
[ticket/11696] Move file to new directory
[ticket/11696] Rename constructor to __construct()
[ticket/11696] Remove manual loading of db_tools in extension controller test
[ticket/11696] Rename db_tools.php so it can be autoloaded
[ticket/11698] Moving all autoloadable files to phpbb/
[ticket/11694] Do not locate assets with root path
[ticket/11692] Don't update search_type in dev migration if already appended
[ticket/11675] Fix template loop
[ticket/11690] Old module class names may get autoloaded by class_exists
[ticket/9649] Display information on index for moderators on unapproved posts
[ticket/10999] Fix assets_version in ACP
[prep-release-3.0.12] More changelog items for the 3.0.12 release.
[ticket/11687] Add assets_version to phpbb_config
[ticket/11686] Not checking for phpBB Debug errors on functional tests
[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
[ticket/11674] Do not include vendor folder if there are no dependencies.
[ticket/11685] Remove logout confirmation page
[ticket/11684] Remove useless confirmation page after login and admin login
[ticket/9657] Define user before injecting
...
Conflicts:
phpBB/includes/functions_container.php
phpBB/install/database_update.php
phpBB/install/index.php
|
| |\ \
| | |/
| | |
| | |
| | | |
* develop-olympus:
[ticket/11674] Do not include vendor folder if there are no dependencies.
|
| | |
| | |
| | |
| | | |
PHPBB3-11674
|
| | | |
|
|/ /
| |
| |
| | |
PHPBB3-11574
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
[ticket/11513] Use PHPUnit from composer in .travis.yml.
[ticket/11513] Update (all) composer dependencies.
[ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
Conflicts:
.travis.yml
phpBB/composer.lock
|
| |
| |
| |
| | |
PHPBB3-11513
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11291] phing: Also add checkreturn="true" to composer execution.
[ticket/11291] phing: Add checkreturn="true" to all new commands.
[ticket/11291] phing: Exclude vendor folder from diffs.
[ticket/11291] phing packaging: Export composer.phar and install dependencies.
[ticket/11291] phing: Remove no longer needed create-package target.
[ticket/11291] phing: The package target does not depend on composer.
[ticket/11291] phing: Adjust directory format of composer exec.
[ticket/11291] phing: Add description for composer target.
[ticket/11291] phing: Add --dev to composer install.
[ticket/11291] phing: Correct dependencies of composer target.
[ticket/11291] phing: Make sure composer is available before calling it.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
[ticket/11291] phing: Also add checkreturn="true" to composer execution.
[ticket/11291] phing: Add checkreturn="true" to all new commands.
[ticket/11291] phing: Exclude vendor folder from diffs.
[ticket/11291] phing packaging: Export composer.phar and install dependencies.
[ticket/11291] phing: Remove no longer needed create-package target.
[ticket/11291] phing: The package target does not depend on composer.
[ticket/11291] phing: Adjust directory format of composer exec.
[ticket/11291] phing: Add description for composer target.
[ticket/11291] phing: Add --dev to composer install.
[ticket/11291] phing: Correct dependencies of composer target.
[ticket/11291] phing: Make sure composer is available before calling it.
|
| | |
| | |
| | |
| | | |
PHPBB3-11291
|