aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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-132-10/+7
|\ \ | | | | | | [ticket/11685] Remove logout confirmation page
| * | [ticket/11685] Remove logout confirmation pageJoas Schilling2013-07-132-10/+7
| |/ | | | | | | PHPBB3-11685
* | Merge pull request #1549 from cyberalien/ticket/10999Nathan Guse2013-07-132-1/+3
|\ \ | | | | | | [ticket/10999] Fix assets_version in ACP
| * | [ticket/10999] Fix assets_version in ACPVjacheslav Trushkin2013-07-132-1/+3
| | | | | | | | | | | | PHPBB3-10999
* | | 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.
| * | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-131-0/+3
| |\ \ | | | | | | | | | | | | | | | | * prep-release-3.0.12: [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 remote-tracking branch 'github-phpbb/develop' into developNils Adermann2013-07-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11687] Add assets_version to phpbb_config
| * \ \ \ Merge pull request #1548 from cyberalien/ticket/11687Nathan Guse2013-07-131-0/+1
| |\ \ \ \ | | | | | | | | | | | | [ticket/11687] Add assets_version to phpbb_config
| | * | | | [ticket/11687] Add assets_version to phpbb_configVjacheslav Trushkin2013-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11687
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-1315-44/+44
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1315-44/+44
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * 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
| | * | | Merge remote-tracking branch 'github-marc1706/ticket/11112' into ↵Nils Adermann2013-07-1315-44/+44
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * github-marc1706/ticket/11112: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com
| | | * | | [ticket/11112] Do not change opensource.org link to httpsMarc Alexander2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
| | | * | | [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-1215-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11112
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-07-131-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | * develop-olympus: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympusNils Adermann2013-07-131-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
| | * | | [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".Andreas Fischer2013-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11670
* | | | | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permissionNathan Guse2013-07-1392-1472/+3505
|\ \ \ \ \ | | | | | | | | | | | | 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-1377-2321/+2951
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Remove last references to m_restore permissionJoas Schilling2013-07-122-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | [ticket/9657] Fix english language :(Joas Schilling2013-07-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-116-35/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1119-63/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | [ticket/9657] Make content visibility a service and inject everythingJoas Schilling2013-07-113-94/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | [ticket/9657] Add new line after opening diffJoas Schilling2013-07-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | [ticket/9657] Fix labels on confirm_delete_body.htmlJoas Schilling2013-07-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11276-5400/+8398
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Correctly determine the users permissions when deleting postsJoas Schilling2013-03-121-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | [ticket/9657] Remove AJAX from delete button and approval/restore formJoas Schilling2013-03-122-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a post is being deleted and the user goes to the next page, the first post of that next page is now on the page before. So the user performing the action will skip the post. Until we found a good solution to fix this, we just remove the AJAX from these features. For more information see http://tracker.phpbb.com/browse/PHPBB3-11340 PHPBB3-9657
| * | | | | | | [ticket/9657] Add note about post being soft deleted in subsilver2Joas Schilling2013-03-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | [ticket/9657] Fix typo in subsilver2 conditionJoas Schilling2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | [ticket/9657] Provide option to restore post in mcp_postJoas Schilling2013-03-121-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | | | [ticket/9657] Populate data about post's delete status in mcp_postJoas Schilling2013-03-121-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-11 19:53:55 +0000