aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into ↵Nils Adermann2014-05-021-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-elsensee/ticket/stenudd/8558-2: [ticket/8558] Fix operator [ticket/8558] Fix field length in ACP [ticket/8558] Use only one variable and improve explain string [ticket/8558] Add config in migrations and schema_data [ticket/8558] Add display name in emails from board Conflicts: phpBB/includes/functions_messenger.php
| * | | | | [ticket/8558] Add config in migrations and schema_dataOliver Schramm2014-04-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8558
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into ↵Nils Adermann2014-05-026-9/+1156
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12273: (55 commits) [ticket/12273] Move $extension to constructor so the path is always set [ticket/12273] Find events.md relative from the path not the phpbb root [ticket/12273] Do not look in extensions docs/ and tests/ directory [ticket/12273] Also check file for adm "Location:" events [ticket/12273] Do not allow template events in non-html files [ticket/12273] Fix return description [ticket/12273] Update exporter to allow specifying an extension [ticket/12273] Allow to filter events for extensions [ticket/12273] Remove old parameter from function call [ticket/12273] Fix table header for adm events [ticket/12273] Add root path to recursive_event_filter_iterator [ticket/12273] Fix missing classes in export_events_for_wiki.php [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporter [ticket/12273] Use RecursiveDirectoryIterator in md_exporter [ticket/12273] Fix doc blocks [ticket/12273] Do not allow 3.1-A1 for template events [ticket/12273] Sort arguments alphabetically before exporting [ticket/12273] Do not allow 3.1-A1 version [ticket/12273] Update since version to 3.1.0-a* style [ticket/12273] Update existing events ...
| * | | | | | [ticket/12273] Move $extension to constructor so the path is always setJoas Schilling2014-04-282-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Find events.md relative from the path not the phpbb rootJoas Schilling2014-04-281-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not look in extensions docs/ and tests/ directoryJoas Schilling2014-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Also check file for adm "Location:" eventsJoas Schilling2014-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not allow template events in non-html filesJoas Schilling2014-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix return descriptionJoas Schilling2014-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Allow to filter events for extensionsJoas Schilling2014-04-282-23/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Remove old parameter from function callJoas Schilling2014-04-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix table header for adm eventsJoas Schilling2014-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Add root path to recursive_event_filter_iteratorJoas Schilling2014-04-272-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Use RecursiveDirectoryIterator with filter in php_exporterJoas Schilling2014-04-262-42/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Use RecursiveDirectoryIterator in md_exporterJoas Schilling2014-04-261-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix doc blocksJoas Schilling2014-04-262-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not allow 3.1-A1 for template eventsJoas Schilling2014-04-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Sort arguments alphabetically before exportingJoas Schilling2014-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not allow 3.1-A1 versionJoas Schilling2014-04-251-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-253-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Update existing eventsJoas Schilling2014-04-252-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Use multiline arrays instead of array_merge()Joas Schilling2014-04-251-26/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix long $vars lines for existing eventsJoas Schilling2014-04-242-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Use array_merge instead of +=Joas Schilling2014-04-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix method name of test and fix undefined indexJoas Schilling2014-04-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Verify the result of the .md file to the sourceJoas Schilling2014-04-241-15/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Only check selected filesJoas Schilling2014-04-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Verify that the events are still in the named filesJoas Schilling2014-04-241-10/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Fix missing space in some ExceptionsJoas Schilling2014-04-201-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Remove duplicated codeJoas Schilling2014-04-201-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Add file line to exception messageJoas Schilling2014-04-201-29/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Move phpBB test to new file and use a data providerJoas Schilling2014-04-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Allow multiple $vars linesJoas Schilling2014-04-201-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Do not use Inline control structuresJoas Schilling2014-04-181-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Make event exporter compatible with php 5.3.3Joas Schilling2014-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Move MD Exporter to separate fileJoas Schilling2014-04-181-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Rename exporter to php_exporterJoas Schilling2014-04-181-72/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12273
| * | | | | | [ticket/12273] Move event exporter to namespaceJoas Schilling2014-04-181-0/+610
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12273
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into ↵Nils Adermann2014-05-028-81/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12371: [ticket/12371] Fix language string [ticket/12371] Fix typos in comment [ticket/12371] Fix redirect link for approve_post and post_in_queue [ticket/12371] Delete the approve_post notification when editing a post [ticket/12371] Fix language in comment [ticket/12371] Reapprove the post and topic again in tests [ticket/12371] Correctly set is_starter when editing first post of the topic [ticket/12371] Add functional tests for reapproving [ticket/12371] Fix query in mcp_sorting() [ticket/12371] Rename disapprove and softdelete tests [ticket/12371] We do not group quote notifications anymore [ticket/12371] Fix SQL query [ticket/11772] Do not send out new topic/post notifications when reapproving [ticket/12052] Use different visibility when post was edited [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method [ticket/12371] Do not add unlimited users as responders [ticket/12371] Do not update the notification entry unneccessarily [ticket/12371] Do not delete post related notifications when a post is deleted [ticket/12371] Allow notification types to redirect to a different url [ticket/12371] Do not group "quote" notifications
| * | | | | | [ticket/12371] Fix typos in commentJoas Schilling2014-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | | | [ticket/12371] Fix redirect link for approve_post and post_in_queueJoas Schilling2014-04-252-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | | | [ticket/12371] Fix language in commentJoas Schilling2014-04-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12371
| * | | | | | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-251-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and needs to be reapproved. PHPBB3-12052
| * | | | | | [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility methodCesar G2014-04-251-41/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12052
| * | | | | | [ticket/12371] Do not add unlimited users as respondersJoas Schilling2014-04-251-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We run into the risc that the data is longer then the character limit of the table column. However as we trim the users list anyway, we can also just stop adding them and display "many others" instead of "x others" PHPBB3-12371
| * | | | | | [ticket/12371] Do not update the notification entry unneccessarilyJoas Schilling2014-04-252-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the data did not change, we also don't have to run the query at all. PHPBB3-12371
| * | | | | | [ticket/12371] Allow notification types to redirect to a different urlJoas Schilling2014-04-253-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way we can redirect the post and bookmark notification to the first unread post in the topic PHPBB3-12371
| * | | | | | [ticket/12371] Do not group "quote" notificationsJoas Schilling2014-04-251-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grouping these notification makes no sense, as the user will not find the posts he is quoted in, when they are spread over multiple pages PHPBB3-12371
* | | | | | | Merge remote-tracking branch 'remotes/Nicofuma/ticket/12432' into ↵Nathaniel Guse2014-05-011-4/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus # By Nicofuma # Via Nicofuma * remotes/Nicofuma/ticket/12432: [ticket/12432] Correcting the assertion [ticket/12432] Adding unit test [ticket/12432] Migrator should not revert custom functions
| * | | | | | | [ticket/12432] Migrator should not revert custom functionsNicofuma2014-04-261-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12432 PHPBB3-12432