aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'asperous/ticket/11731' into developAndreas Fischer2013-07-232-2/+4
|\ | | | | | | | | * asperous/ticket/11731: [ticket/11731] Remove static calls to captcha garbage collector
| * [ticket/11731] Remove static calls to captcha garbage collectorAndy Chase2013-07-222-2/+4
| | | | | | | | PHPBB3-11731
* | [ticket/11728] Replace topic_approved with topic_visibilityJoas Schilling2013-07-221-1/+1
| | | | | | | | PHPBB3-11728
* | Merge pull request #1589 from marc1706/ticket/11717Nathan Guse2013-07-224-5/+9
|\ \ | |/ |/| [ticket/11717] Use topic_posts_approved instead of topic_replies
| * [ticket/11717] Add 'has' to boolean variable and reduce line lengthMarc Alexander2013-07-221-4/+5
| | | | | | | | PHPBB3-11717
| * [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-204-5/+8
| | | | | | | | | | | | | | Due to the move to soft-delete, the topic_replies column no longer exists in the topics table. Instead, the column topic_posts_approved should be used. PHPBB3-11717
* | Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-226-219/+523
|\ \ | | | | | | Ticket/11582 Split permission logic from translations
| * | [ticket/11582] Move global declaration to beginning of blockJoas Schilling2013-07-221-2/+1
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Test the event and and fix it.Joas Schilling2013-07-141-1/+1
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Move file to new directoryJoas Schilling2013-07-141-0/+0
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Fix missing closing bracketJoas Schilling2013-07-141-2/+2
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Fix missing @params in the doc blocksJoas Schilling2013-07-141-2/+7
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Remove useless prefixJoas Schilling2013-07-141-133/+133
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Fix documentation for adding permissionsJoas Schilling2013-07-141-27/+7
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Split permission language strings from logicJoas Schilling2013-07-142-258/+247
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Remove left over calls to lang['acl_*']Joas Schilling2013-07-142-14/+6
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Use member isntead of a new variable everytimeJoas Schilling2013-07-142-12/+10
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Use new methods and remove duplicated entriesJoas Schilling2013-07-145-32/+54
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Add methods to return the language stringJoas Schilling2013-07-144-10/+35
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-142-42/+62
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Fix event dispatcher class nameJoas Schilling2013-07-141-3/+3
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Use new class for categoriesJoas Schilling2013-07-144-37/+44
| | | | | | | | | | | | PHPBB3-11582
| * | [ticket/11582] Add new service for permissionsJoas Schilling2013-07-144-13/+280
| | | | | | | | | | | | | | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
* | | Merge remote-tracking branch 'marc1706/ticket/11725' into developAndreas Fischer2013-07-221-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * marc1706/ticket/11725: [ticket/11725] Use new paths for phpbb_class_loader in file.php
| * | | [ticket/11725] Use new paths for phpbb_class_loader in file.phpMarc Alexander2013-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the PR #1559, the paths were changed from "{$phpbb_root_path}includes/" to "{$phpbb_root_path}phpbb/" for the class loader. However, this was not changed in all files that use it. PHPBB3-11725
* | | | [ticket/11722] Remove reference assignment for $captcha in report.phpAndreas Fischer2013-07-221-1/+1
|/ / / | | | | | | | | | PHPBB3-11722
* | | Merge remote-tracking branch 'EXreaction/ticket/11707' into developAndreas Fischer2013-07-221-4/+8
|\ \ \ | | | | | | | | | | | | | | | | * EXreaction/ticket/11707: [ticket/11707] Twig DEFINE not working as expected
| * | | [ticket/11707] Twig DEFINE not working as expectedNathaniel Guse2013-07-191-4/+8
| | | | | | | | | | | | | | | | PHPBB3-11707
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-221-3/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | * develop-olympus: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-221-3/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| | * \ \ Merge remote-tracking branch 'marc1706/ticket/11720-prep-release' into ↵Andreas Fischer2013-07-221-3/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 * marc1706/ticket/11720-prep-release: [ticket/11720] Add functional test for submitting report as user [ticket/11720] Do not call $captcha->validate if $captcha is not set
| | | * | | [ticket/11720] Do not call $captcha->validate if $captcha is not setMarc Alexander2013-07-211-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11566 changed big parts of code. Unfortunately, a call to $captcha->validate was added that is being called even if $captcha hasn't been initialized. This change will fix this issue. PHPBB3-11720
* | | | | | [ticket/11713] Do not remove module if it couldn't be deletedMarc Alexander2013-07-182-2/+5
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to now, the module or module category was always removed with jQuery, even if there was an error. With this change, the modules will not be deleted by jQuery if the return JSON array will have SUCCESS set to false. PHPBB3-11713
* | | | | Merge remote-tracking branch 'cyberalien/ticket/11712' into developAndreas Fischer2013-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11712: [ticket/11712] Fixing typo in editor.js
| * | | | | [ticket/11712] Fixing typo in editor.jsVjacheslav Trushkin2013-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11712
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/11708' into developJoas Schilling2013-07-171-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/11708: [ticket/11708] Fix bulletin points in notifications
| * | | | | | [ticket/11708] Fix bulletin points in notificationsVjacheslav Trushkin2013-07-161-0/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11708
* | | | | | [ticket/10931] Add phpbb_php_ini as a service.Andreas Fischer2013-07-161-0/+3
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10931
* | | | | [ticket/11706] Use @ to suppress errors for getimagesize in remote avatarMarc Alexander2013-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11706
* | | | | 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