aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11883' into developDhruv2013-10-041-4/+12
|\ | | | | | | | | | | | | | | # By Nathan (1) and Nathan Guse (1) # Via Nathan Guse * EXreaction/ticket/11883: [ticket/11883] Only output the migration time, not total [ticket/11883] Report completed data step in migration as "Installing Data"
| * [ticket/11883] Only output the migration time, not totalNathan Guse2013-10-041-3/+3
| | | | | | | | PHPBB3-11883
| * [ticket/11883] Report completed data step in migration as "Installing Data"Nathan2013-10-021-4/+12
| | | | | | | | PHPBB3-11883
* | [ticket/11850] Need symfony request and filesystem setup globally for sessionNathan Guse2013-09-301-0/+2
|/ | | | PHPBB3-11850
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-2/+2
| | | | PHPBB3-11852
* [ticket/11700] Escape Backslashes from schema_data.sql for MySQLiJoas Schilling2013-09-251-1/+6
| | | | PHPBB3-11700
* [ticket/11700] No need to escape \ in SQL stringNils Adermann2013-09-191-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Change search backend db entry to namespacesNils Adermann2013-09-191-1/+1
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-171-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) Conflicts: phpBB/common.php phpBB/config/services.yml phpBB/includes/bbcode.php phpBB/includes/functions.php phpBB/includes/functions_messenger.php phpBB/install/index.php phpBB/phpbb/filesystem.php phpBB/phpbb/template/twig/environment.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/dbal/migrator_test.php tests/extension/manager_test.php tests/extension/metadata_manager_test.php tests/filesystem/clean_path_test.php tests/mock/extension_manager.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-131-1/+2
| | | | | | | | PHPBB3-11832
| * Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-121-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11832 * remotes/imkingdavid/ticket/11824: [ticket/11824] Revert changes in functions.php [ticket/11824] Reorganize test file [ticket/11824] Update language string for board settings [ticket/11824] Revert changes to functions_content.php [ticket/11824] Add tests for urls with mod_rewrite enabled [ticket/11824] Correct a comment [ticket/11824] Change copyright year in migration file [ticket/11824] Remove unused globals [ticket/11824] Fix smilies [ticket/11824] Fix logic [ticket/11824] Add option for mod_rewrite
* | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-171-1/+1
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-161-3/+3
| | | | | | | | | | | | PHPBB3-11700
* | | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-161-9/+0
| | | | | | | | | | | | PHPBB3-11700
* | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1611-99/+281
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * \ \ Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-131-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-0/+1
| | | | | | | | | | | | PHPBB3-11824
| * | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-064-103/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-022-2/+2
| | | | | | | | | | | | PHPBB3-11791
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-284-98/+104
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Bruno Ais (42) and others # Via Joas Schilling (39) and others * 'develop' of github.com:phpbb/phpbb3: (157 commits) [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0 [ticket/11799] Send anti abuse headers in "new password" emails. [ticket/11792] Add functional test for var lang_set_ext of core.user_setup [ticket/11804] Remove </li> from overall_header which was not open [ticket/11802] replace $browser with $user->browser [ticket/11801] removed some whitespace and added missing semi colon's in css [ticket/11792] Add performance remark to core.user_setup event PHPDoc [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup [ticket/11789] Remove inline color in memberlist_view [ticket/11800] Fix scripts variable in subsilver simple_footer [ticket/11800] Fix JavaScript in simple_footer.html [ticket/11800] Remove forum_fn from memberlist_search.html [ticket/11796] Replace pagination with pagination.html [ticket/11794] Add missing array element commas to docs/coding-guidelines.html [ticket/11775] Fix doc blocks syntax [ticket/11775] Remove spaces at line ends [ticket/11789] Remove colors from HTML code [ticket/11784] Remove naming redundancy for event listeners [ticket/11775] Split test into multiple steps [ticket/11777] Fix new test for loop variables in extension template listeners ... Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| | | * Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-083-89/+95
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (16) and Igor Wiedler (6) # Via Joas Schilling (5) and Igor Wiedler (2) * nickvergessen/ticket/11574: (22 commits) [ticket/11574] Remove install/udpate/new/ fallback from database_update.php [ticket/11574] Do not display incompatible package note after successful update [ticket/11574] Remove old "continue step"-message [ticket/11574] Change order of files and database update [ticket/11574] Fix more issues in the updater [ticket/11574] Add trailing slash for consistency [ticket/11574] Fix table prefix in database updater [ticket/11574] Fix various path issues in the updater [ticket/11574] Make install language filename less crazy [ticket/11574] Use alternate DI config file for updater [ticket/11574] Include normalizer so it loads form the correct directory [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;) [ticket/11574] Use log object instead of old function [ticket/11574] Include vendor into update packages [ticket/11574] Create phpbb_log object before using it. [ticket/11574] Add correct language parameter to return links [ticket/11574] Use request object rather then request_var function [ticket/11574] Load new language files whenever possible [ticket/11574] Require new files in install/index.php and add a class loader [ticket/11574] Require new files in database_update.php and add a class loader ...
| | | | * [ticket/11574] Remove install/udpate/new/ fallback from database_update.phpJoas Schilling2013-07-301-56/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we switched the order, everything should be in the normal root by then. PHPBB3-11574
| | | | * [ticket/11574] Do not display incompatible package note after successful updateJoas Schilling2013-07-301-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-301-9/+10
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (130 commits) [ticket/11638] Changed the layout to match the other similar commits [ticket/11640] removed the space that I wonder what it was doing there. [ticket/11749] Move event after all template data has been defined [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper [ticket/11749] Template events for topic_list_row_pre/append [ticket/11749] PHP Events for viewforum.php [ticket/11749] PHP Events for search.php [ticket/11740] Update FAQ to include Ideas Centre [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version [ticket/11741] Fix empty brackets and remove bullet [ticket/11638] Removed the unneeded reset. [ticket/11638] Use the $parse_flags like the other commits [ticket/11638] Reverted to use the $parse tags way as the other ones [ticket/11638] Updated: bitwise $parse_flags use optionset() [ticket/11656] Made the check for the bitfield just like other PR's [ticket/11667] Use @inheritdoc ...
| | | | * | [ticket/11574] Change order of files and database updateJoas Schilling2013-07-293-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-142-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stupid mistake in phpbb_create_update_container * Do not bootstrap extensions in installer/updater * Fix template lookup in installer/updater * Do not attempt to delete posts from bots The latter is a really fun problem. Since deleting posts now depends on a new db column that does not exist yet, we cannot call delete_post from a migration, ever. By using retain, we can hack around the issue for now. PHPBB3-11574
| | | | * | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-1414-101/+181
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | * | | [ticket/11574] Add trailing slash for consistencyIgor Wiedler2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Fix table prefix in database updaterIgor Wiedler2013-07-142-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Fix various path issues in the updaterIgor Wiedler2013-07-142-29/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Include normalizer so it loads form the correct directoryJoas Schilling2013-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Use log object instead of old functionJoas Schilling2013-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Create phpbb_log object before using it.Joas Schilling2013-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Add correct language parameter to return linksJoas Schilling2013-07-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Use request object rather then request_var functionJoas Schilling2013-07-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Load new language files whenever possibleJoas Schilling2013-07-131-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Require new files in install/index.php and add a class loaderJoas Schilling2013-07-131-6/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | | * | | [ticket/11574] Require new files in database_update.php and add a class loaderJoas Schilling2013-07-131-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11574
| | | * | | | [ticket/11464] Add missing and remove unnecessary database entryOliver Schramm2013-07-311-1/+1
| | | | |_|/ | | | |/| | | | | | | | | | | | | | PHPBB3-11464
| | | * | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-301-8/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10917] Variable used only once so delete it [ticket/10917] Revert use of phpbb wrapper
| | | | * | | [ticket/10917] Variable used only once so delete itOliver Schramm2013-07-281-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable $this->unequal_version was only used once and only to display the version the package updates to. To display the version it updates to makes no sense when the update files just aren't meant to update from the current version. (It's already shown in an error message) So I deleted the variable from there. Furthermore the use of version_compare makes the variable useless in that context which is why I deleted the variable from the whole file and replaced it in the relevant if statement with the old comparison. PHPBB3-10917
| | | | * | | [ticket/10917] Revert use of phpbb wrapperOliver Schramm2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10917
| | | * | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Nathaniel Guse (1) and Oliver Schramm (1) * develop-olympus: [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
| | | | * | | Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into ↵Nathaniel Guse2013-07-251-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Oliver Schramm # Via Oliver Schramm * remotes/Elsensee/ticket/10917: [ticket/10917] Using phpbb wrapper [ticket/10917] Fixed notice that files are out of date when updating to an unreleased version
| | | | | * | | [ticket/10917] Using phpbb wrapperOliver Schramm2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10917
| | | | | * | | [ticket/10917] Fixed notice that files are out of date when updating to an ↵Oliver Schramm2013-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unreleased version PHPBB3-10917
| | | * | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+8
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | / | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | # By Oliver Schramm # Via Nathaniel Guse (1) and Oliver Schramm (1) * develop-olympus: [ticket/11062] If user's language is english there is no further work needed [ticket/11062] Load new strings from user's language file if provided
| | | | * | | [ticket/11062] If user's language is english there is no further work neededOliver Schramm2013-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11062
| | | | * | | [ticket/11062] Load new strings from user's language file if providedOliver Schramm2013-07-251-0/+7
| | | | |/ / | | | | | | | | | | | | | | | | | | PHPBB3-11062