aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/oauth] Allow getting original global arrays from requestJoseph Warner2013-07-142-0/+18
| | | | 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 as a symfony serviceJoseph Warner2013-07-141-0/+9
| | | | PHPBB3-11673
* [feature/oauth] OAuth provider skeletonJoseph Warner2013-07-141-0/+48
| | | | PHPBB3-11673
* [feature/oauth] Include OAuth library in composer.jsonJoseph Warner2013-07-142-12/+59
| | | | PHPBB3-11673
* Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into developAndreas Fischer2013-07-141-1/+1
|\ | | | | | | | | * galaxyAbstractor/ticket/11697: [ticket/11697] author_search() used incorrect parameter
| * [ticket/11697] author_search() used incorrect parameterVictor Nagy2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | The author_search() function in fulltext_mysql.php had an argument $m_approve_fid_ary parameter but it was changed in the Docblock and code to $post_visibility. This change renames that argument according to the docblock, the code and to mirror the other classes. PHPBB3-11697
* | [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.phpJoas Schilling2013-07-141-1/+1
| | | | | | | | PHPBB3-11702
* | [ticket/11696] Move file to new directoryJoas Schilling2013-07-141-0/+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-146-26/+2
| | | | | | | | PHPBB3-11696
* | [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-14251-20/+15
| | | | | | | | 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/11675] Fix template loopNathaniel Guse2013-07-131-1/+1
|/ / | | | | | | PHPBB3-11675
* | Merge pull request #1429 from cyberalien/ticket/11553Nathan Guse2013-07-136-29/+85
|\ \ | |/ |/| Move bulletin points for linklist lists to pseudo classes
| * [ticket/11553] TypoVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | PHPBB3-11553
| * [ticket/11553] Replace bullet with unicodeVjacheslav Trushkin2013-07-111-2/+2
| | | | | | | | PHPBB3-11553
| * [ticket/11553] Move bulletin points to pseudo classVjacheslav Trushkin2013-07-116-29/+85
| | | | | | | | | | | | | | Move bulletin points for .linklist lists to pseudo class Group pseudo classes for .linklist.bulletin and .icon-notification PHPBB3-11553
* | [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-133-3/+22
|\ \ | | | | | | [ticket/9649] Display information on index for moderators on unapproved posts
| * | [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-133-3/+22
| | | | | | | | | | | | PHPBB3-9649
* | | Merge pull request #1436 from cyberalien/ticket/11563Nathan Guse2013-07-135-50/+50
|\ \ \ | | | | | | | | Fix subPanels() in forum_fn.js
| * | | [ticket/11563] Remove duplicate codeVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11563
| * | | [ticket/11563] Dynamically generate panels listVjacheslav Trushkin2013-07-113-3/+6
| | | | | | | | | | | | | | | | PHPBB3-11563
| * | | [ticket/11563] Remove unused JS variablesVjacheslav Trushkin2013-07-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused JS variables from posting_buttons PHPBB3-11563
| * | | [ticket/11563] Fix subPanels()Vjacheslav Trushkin2013-07-114-47/+47
| | |/ | |/| | | | | | | | | | | | | | | | | | | Fix subPanels() code Modernize subPanels() with jQuery Use HTML5 data attributes instead of including JS PHPBB3-11563
* | | 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)".