aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/13789] Update composer.lock.Cesar G2015-10-141-4/+49
| | | | PHPBB3-13789
* [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.Cesar G2015-10-146-169/+20
| | | | PHPBB3-13789
* [ticket/13652] Fix coding styleTristan Darricau2015-10-141-1/+1
| | | | PHPBB3-13652
* Merge pull request #3981 from ErnadoO/ticket/14235Tristan Darricau2015-10-141-0/+1
|\ | | | | | | | | | | | | [ticket/14235] Font Awesome in simple_header.html * ErnadoO/ticket/14235: [ticket/14235] Font Awesome in simple_header.html
| * [ticket/14235] Font Awesome in simple_header.htmlErwan Nader2015-10-141-0/+1
| | | | | | | | PHPBB3-14235
* | Merge branch '3.1.x'Tristan Darricau2015-10-142-12/+26
|\ \ | |/ |/| | | | | * 3.1.x: [ticket/14159] Hide version info on ACP if we don't have the permission
| * Merge pull request #3900 from Zoddo/ticket/14159Tristan Darricau2015-10-142-11/+25
| |\ | | | | | | | | | | | | | | | | | | [ticket/14159] Hide version info on ACP if we don't have the permission * Zoddo/ticket/14159: [ticket/14159] Hide version info on ACP if we don't have the permission
| | * [ticket/14159] Hide version info on ACP if we don't have the permissionZoddo2015-09-122-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also hide a link to an unreachable module (Check phpBB version). We could have simply remove the link to the module, but if the user hasn't the permission to access to the phpBB version check module, I think that he shouldn't view any version information about phpBB. PHPBB3-14159
* | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+15
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/14192] Add core.memberlist_memberrow_before event
| * | Merge pull request #3926 from Senky/ticket/14192Tristan Darricau2015-10-141-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14192] Add core.memberlist_memberrow_before event * Senky/ticket/14192: [ticket/14192] Add core.memberlist_memberrow_before event
| | * | [ticket/14192] Add core.memberlist_memberrow_before eventJakub Senko2015-10-121-1/+15
| | | | | | | | | | | | | | | | PHPBB3-14192
* | | | Merge branch '3.1.x'Tristan Darricau2015-10-144-5/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 3.1.x: [ticket/10343] Add a distinction for inactive users on memberlist [ticket/10343] Allows a_user to show inactive accounts in memberlist
| * | | Merge pull request #3935 from Zoddo/ticket/10343Tristan Darricau2015-10-144-5/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10343] Allows a_user to show inactive accounts in memberlist * Zoddo/ticket/10343: [ticket/10343] Add a distinction for inactive users on memberlist [ticket/10343] Allows a_user to show inactive accounts in memberlist
| | * | | [ticket/10343] Add a distinction for inactive users on memberlistZoddo2015-10-124-6/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-10343
| | * | | [ticket/10343] Allows a_user to show inactive accounts in memberlistZoddo2015-09-271-1/+7
| | |/ / | | | | | | | | | | | | PHPBB3-10343
* | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13851] Fix ignore flood limit check
| * | | Merge pull request #3978 from RMcGirr83/ticket_13851Tristan Darricau2015-10-141-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13851] Fix ignore flood limit check * RMcGirr83/ticket_13851: [ticket/13851] Fix ignore flood limit check
| | * | | [ticket/13851] Fix ignore flood limit checkRichard McGirr2015-10-141-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13851
* | | | | Merge branch '3.1.x'Tristan Darricau2015-10-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
| * | | | Merge pull request #3979 from prototech/ticket/9153Tristan Darricau2015-10-141-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9153] Allow users without u_sendpm permission to delete existing PM's * prototech/ticket/9153: [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
| | * | | | [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.Cesar G2015-10-141-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the error message within the UCP template. Otherwise it could be removed as compose_pm() will check the appropriate permission pertaining to the attempted action. PHPBB3-9153
* | | | | Merge pull request #3441 from brunoais/feature/sql-bool-builderTristan Darricau2015-10-141-1/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [feature/sql-bool-builder] Extending DBAL query builder for boolean generation * brunoais/feature/sql-bool-builder: [feature/sql-bool-builder] Improved tests output to show the SQL error. [feature/sql-bool-builder] Adding the IS operator to predicted operators [feature/sql-bool-builder] test_single_not_like [feature/sql-bool-builder] test_single_like [feature/sql-bool-builder] test_single_not_in [feature/sql-bool-builder] test_single_in [feature/sql-bool-builder] test_and_of_or_of_and [feature/sql-bool-builder] test_triple_and_with_in [feature/sql-bool-builder] test_double_and_with_not_of_and [feature/sql-bool-builder] test_triple_and_with_is_null [feature/sql-bool-builder] Prepare testing class [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations [feature/sql-bool-builder] Explain better the code in the first [feature/sql-bool-builder] Also use parenthesis for the NOT operator [feature/sql-bool-builder] AS keyword must be lowercase; [feature/sql-bool-builder] Added code to use this feature for the WHERE clause [feature/sql-bool-builder] Removed non-necessary spaces [feature/sql-bool-builder] First working version
| * | | | | [feature/sql-bool-builder] Adding the IS operator to predicted operatorsbrunoais2015-03-171-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparationsbrunoais2015-03-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Explain better the code in the firstbrunoais2015-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain what that if and check is for in the first method that is called. PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Also use parenthesis for the NOT operatorbrunoais2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be on the safe side, also use parenthesis for the NOT operator PHPBB3-13652
| * | | | | [feature/sql-bool-builder] AS keyword must be lowercase;brunoais2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AS keyword must be lowercase; expected "as" but found "AS" PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Added code to use this feature for the WHERE clausebrunoais2015-03-161-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] Removed non-necessary spacesbrunoais2015-03-161-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
| * | | | | [feature/sql-bool-builder] First working versionbrunoais2015-03-161-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13652
* | | | | | [ticket/10572] Remove excessive new lineMarc Alexander2015-10-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10572
* | | | | | Merge branch '3.1.x'Cesar G2015-10-141-0/+5
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/13684] Prevent horizontal resize of attach comment textarea
| * | | | | Merge pull request #3959 from marc1706/ticket/13684Cesar G2015-10-141-0/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13684] Prevent horizontal resize of attach comment textarea
| | * | | | [ticket/13684] Prevent horizontal resize of attach comment textareaMarc Alexander2015-10-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13684
* | | | | | [ticket/14238] Updates SymfonyTristan Darricau2015-10-141-115/+93
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14238
* | | | | | Merge branch '3.1.x'Tristan Darricau2015-10-1415-34/+124
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/10572] Unguarded includes in acp files
| * | | | | Merge pull request #3542 from RMcGirr83/ticket/10572Tristan Darricau2015-10-1415-36/+132
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10572] Unguarded includes in acp files * RMcGirr83/ticket/10572: [ticket/10572] Unguarded includes in acp files
| | * | | | | [ticket/10572] Unguarded includes in acp filesRichard McGirr2015-10-1315-36/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10572
* | | | | | | Merge pull request #3965 from marc1706/ticket/14234Tristan Darricau2015-10-1411-63/+126
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14234] Use replacement variables instead of references in events * marc1706/ticket/14234: [ticket/14234] Fix event doc blocks [ticket/14234] Get rid of undefined variables [ticket/14234] Fix change version and remove more references [ticket/14234] Replace more references with variables [ticket/14234] Use replacement variables instead of references in events
| * | | | | | | [ticket/14234] Fix event doc blocksMarc Alexander2015-10-123-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14234
| * | | | | | | [ticket/14234] Get rid of undefined variablesMarc Alexander2015-10-124-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14234
| * | | | | | | [ticket/14234] Fix change version and remove more referencesMarc Alexander2015-10-128-34/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14234
| * | | | | | | [ticket/14234] Replace more references with variablesMarc Alexander2015-10-122-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14234
| * | | | | | | [ticket/14234] Use replacement variables instead of references in eventsMarc Alexander2015-10-122-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14234
* | | | | | | | Merge pull request #3913 from marc1706/ticket/14168Tristan Darricau2015-10-1415-548/+1105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14168] Refactor attachment management functions into classes * marc1706/ticket/14168: (36 commits) [ticket/14168] Correctly state return type of upload and upload_attachment [ticket/14168] Use attachment manager instead of separate classes [ticket/14168] Fix docblock in manager [ticket/14168] Add more test cases for attachment manager [ticket/14168] Add new test method and more tests [ticket/14168] Fix tabs in manager and add test file [ticket/14168] Fix tests after rebase [ticket/14168] Add attachment manager service [ticket/14168] Use correct docblock [ticket/14168] Add services_attachment.yml to services.yml [ticket/14168] Minor coding style fixes [ticket/14168] Move attachment service definitions to services_attachment [ticket/14168] Improve code coverage in upload class [ticket/14168] Move image check and don't use trigger_error() [ticket/14168] Add tests for init_error() during upload [ticket/14168] Add basic test file for attachments upload [ticket/14168] Fix CS issue [ticket/14168] No longer use deprecated functions in core files [ticket/14168] Move phpbb_unlink() into attachment delete class [ticket/14168] Reset sequence before tests in delete tests ...
| * | | | | | | | [ticket/14168] Correctly state return type of upload and upload_attachmentMarc Alexander2015-10-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14168
| * | | | | | | | [ticket/14168] Use attachment manager instead of separate classesMarc Alexander2015-10-128-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14168
| * | | | | | | | [ticket/14168] Fix docblock in managerMarc Alexander2015-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14168
| * | | | | | | | [ticket/14168] Fix tabs in manager and add test fileMarc Alexander2015-10-091-71/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14168
| * | | | | | | | [ticket/14168] Add attachment manager serviceMarc Alexander2015-10-092-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14168