aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [feature/oauth] Continue work on OAuth loginJoseph Warner2013-07-141-7/+44
| | | | PHPBB3-11673
* [feature/oauth] Token Storage SkeletonJoseph Warner2013-07-141-0/+94
| | | | PHPBB3-11673
* [feature/oauth] Check that the service actually has settingsJoseph Warner2013-07-141-0/+9
| | | | PHPBB3-11673
* [feature/oauth] Additional work on implementing loginJoseph Warner2013-07-141-17/+18
| | | | PHPBB3-11673
* [feature/oauth] Start implementing loginJoseph Warner2013-07-141-0/+48
| | | | PHPBB3-11673
* [feature/oauth] OAuth provider skeletonJoseph Warner2013-07-141-0/+48
| | | | PHPBB3-11673
* [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-2486/+0
| | | | PHPBB3-11696
* [ticket/11696] Rename constructor to __construct()Joas Schilling2013-07-141-1/+1
| | | | PHPBB3-11696
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-144-20/+2
| | | | PHPBB3-11696
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14247-46792/+1
| | | | PHPBB3-11698
* Merge pull request #1555 from EXreaction/ticket/11692Nils Adermann2013-07-131-1/+4
|\ | | | | [ticket/11692] Don't update search_type in dev migration if already appended
| * [ticket/11692] Don't update search_type in dev migration if already appendedNathaniel Guse2013-07-131-1/+4
| | | | | | | | PHPBB3-11692
* | [ticket/11694] Do not locate assets with root pathVjacheslav Trushkin2013-07-131-1/+1
|/ | | | | | Do not locate assets that start with ./ PHPBB3-11694
* [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 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