aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into ticket/11215David King2013-07-141-1/+1
|\ | | | | | | | | * develop: [ticket/11694] Do not locate assets with root path
| * [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
| | | | | | | | | | | | Do not locate assets that start with ./ PHPBB3-11694
* | Merge branch 'develop' into ticket/11215David King2013-07-132-6/+21
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [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/11686] Not checking for phpBB Debug errors on functional tests [ticket/11553] Typo [ticket/11553] Replace bullet with unicode [ticket/11553] Move bulletin points to pseudo class [ticket/11600] Remove duplicate test case [ticket/11600] Use lowercase null and remove duplicate test cases [ticket/11600] Use local variable for $user in test_localize_errors [ŧicket/11600] Split get driver tests into tests for all and only enabled ones [ticket/11600] Increase code test coverage of avatar manager
| * [ticket/11690] Old module class names may get autoloaded by class_existsNils Adermann2013-07-131-5/+12
| | | | | | | | PHPBB3-11690
| * Merge pull request #1550 from nickvergessen/ticket/9649Nathan Guse2013-07-131-1/+9
| |\ | | | | | | [ticket/9649] Display information on index for moderators on unapproved posts
| | * [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-131-1/+9
| | | | | | | | | | | | PHPBB3-9649
* | | Merge branch 'develop' into ticket/11215David King2013-07-1338-1186/+2565
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (214 commits) [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/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 [ticket/9657] Remove old code [ticket/9657] Keep approval state of posts/topics when copying them [ticket/9657] Add functional tests for forking a copy [ticket/9657] Add functional test for splitting topic [ticket/11112] Do not change opensource.org link to https [ticket/9657] Add functional test for restoring a post/topic [ticket/11112] Use https for user-visible links to phpbb.com [ticket/9657] Fix a little error when moving softdeleted topics [ticket/9657] Add unit tests for softdeleting and moving posts/topics [ticket/9657] Remove last references to m_restore permission [ticket/9657] Fix english language :( [ticket/9657] Notifications do not require emails or jabber anymore ...
| * | Merge pull request #1541 from nickvergessen/ticket/11684Nathan Guse2013-07-131-2/+1
| |\ \ | | | | | | | | [ticket/11684] Remove useless confirmation page after login and admin login
| | * | [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-131-2/+1
| | | | | | | | | | | | | | | | PHPBB3-11684
| * | | Merge pull request #1543 from nickvergessen/ticket/11685Nathan Guse2013-07-131-3/+1
| |\ \ \ | | | | | | | | | | [ticket/11685] Remove logout confirmation page
| | * | | [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-131-3/+1
| | |/ / | | | | | | | | | | | | PHPBB3-11685
| * | | [ticket/10999] Fix assets_version in ACPVjacheslav Trushkin2013-07-131-0/+2
| | | | | | | | | | | | | | | | PHPBB3-10999
| * | | Merge branch 'develop-olympus' into developNils Adermann2013-07-133-3/+3
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-133-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| | | * | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-123-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11112
| * | | | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permissionNathan Guse2013-07-1335-1178/+2558
| |\ \ \ \ | | | | | | | | | | | | Soft delete
| | * | | | [ticket/9657] Remove old codeJoas Schilling2013-07-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-1352-2196/+2588
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| | * | | | | [ticket/9657] Keep approval state of posts/topics when copying themJoas Schilling2013-07-131-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Fix a little error when moving softdeleted topicsJoas Schilling2013-07-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Notifications do not require emails or jabber anymoreJoas Schilling2013-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Add type hints for classesJoas Schilling2013-07-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Remove sql_visibility as it is always non-emptyJoas Schilling2013-07-114-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Use include instead of include_onceJoas Schilling2013-07-111-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Initialise variable outside of the loopJoas Schilling2013-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Fix variable naming of phpEx to php_extJoas Schilling2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Fix unit testsJoas Schilling2013-07-111-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-1113-42/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Make content visibility a service and inject everythingJoas Schilling2013-07-111-94/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Add , to last element of an arrayJoas Schilling2013-07-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] DO not use \" inside of double quotesJoas Schilling2013-07-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Cast topic_id to integerJoas Schilling2013-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | [ticket/9657] Correctly use " vs ' and variables in queriesJoas Schilling2013-07-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-11111-2114/+5566
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | [ticket/9657] Check for post visibility when searching with SphinxJoas Schilling2013-03-141-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | [ticket/9657] Populate data about post's delete status in mcp_postJoas Schilling2013-03-121-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | [ticket/9657] Correctly split disapproving from perma deleting postsJoas Schilling2013-03-111-9/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | [ticket/9657] Fix missing global $phpbb_containerJoas Schilling2013-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | [ticket/9657] Fix newly added empty lineJoas Schilling2013-03-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | [ticket/9657] Cast IDs to integerJoas Schilling2013-03-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | [ticket/9657] Correctly increase users post count when approving postsJoas Schilling2013-03-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-074-4/+214
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11408] user_jabber instead of jabber [ticket/10202] Rename method names _all() to _array(). [ticket/10202] Add migration file for config_db_text. [ticket/10202] Upgrade TEXT to the bigger MTEXT. [ticket/10202] Improve method documentation. [ticket/10202] SQL escape the table name. [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries. [ticket/10202] Define phpbb_config_db_text as a service. [ticket/10202] Add tests for phpbb_config_db_text. [ticket/10202] Adjust method names to guidelines. [ticket/10202] Add database schema for phpbb_config_db_text. [ticket/10202] Implementation of config options with arbitrary length values. [ticket/11166] Add ajaxify support to normal ACP confirm_box() [ticket/11166] Fix several custom confirm templates in prosilver [ticket/11166] Add caption to AJAX confirm box default template [ticket/11166] Fix typo in comment [ticket/11166] Use provided custom templates on AJAX confirm box
| | * | | | | | | [ticket/9657] Remove unused email variablesJoas Schilling2013-03-071-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | | [ticket/9657] Fix colum name in migration fileJoas Schilling2013-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | | [ticket/9657] Remove empty update_data() method from p2 migrationJoas Schilling2013-03-071-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | | [ticket/9657] Fix wrongly added notifications when post is posted softdeletedJoas Schilling2013-03-061-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The post/topic should not trigger "*_in_queue" notifications if it is softdeleted, as it is not in the queue then. PHPBB3-9657
| | * | | | | | | [ticket/9657] Add migration files for updating the databaseJoas Schilling2013-03-062-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | | [ticket/9657] Correctly state when to refresh last/first post info on approvingJoas Schilling2013-03-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| | * | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-063-10/+36
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11402] Fix undefined index in post/topic_in_queue [ticket/11400] If email is disabled, disable it for notifications
| | * \ \ \ \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-0537-1425/+3945
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: (234 commits) [ticket/11398] Correctly call permission_set method in permission tool [ticket/11394] Relax Migration Tools [ticket/11386] Fix missing ; [ticket/10714] Get log from container in install, update and download/file [feature/avatars] Update module_auth of ucp module and fix small issues [ticket/11396] Rename insert_migration to set_migration_state [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files [ticket/11393] Give more information on database updater [ticket/11386] Send list of migrations instead of using load_migrations [feature/avatars] Add migrations data file for avatars [feature/avatars] Reduce module auth of ucp avatar settings [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/ [ticket/10714] Logs are disabled for this page call only [ticket/10411] Fix call to function on non-object $db->...() [ticket/10411] Remove ajax delete, so the page is refreshed [feature/avatars] Auto-clear avatar dimensions when first changing avatars [ticket/10411] Update schema file with new table and remove the column [ticket/10411] Add unit tests for move() with values >1 [ticket/10411] Add migrations file for teampage table [ticket/10411] Revert database_update.php changes from for easier update ...
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 08:13:43 +0000