aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2438 from marc1706/ticket/12517Joas Schilling2014-05-111-2/+8
|\ | | | | | | | | | | | | [ticket/12517] Correctly call $log->add in prune shadow topics * marc1706/ticket/12517: [ticket/12517] Correctly call $log->add in prune shadow topics
| * [ticket/12517] Correctly call $log->add in prune shadow topicsMarc Alexander2014-05-111-2/+8
| | | | | | | | PHPBB3-12517
* | Merge pull request #2441 from Nicofuma/ticket/12529Joas Schilling2014-05-111-5/+13
|\ \ | |/ |/| | | | | | | | | | | [ticket/12529] Use root_path in controller\resolver to check the template dir * Nicofuma/ticket/12529: [ticket/12529] Move $phpbb_root_path to the end of the constructor [ticket/12529] Use root_path in controller\resolver to check the template dir
| * [ticket/12529] Move $phpbb_root_path to the end of the constructorTristan Darricau2014-05-111-4/+5
| | | | | | | | PHPBB3-12529
| * [ticket/12529] Use root_path in controller\resolver to check the template dirTristan Darricau2014-05-111-2/+9
| | | | | | | | PHPBB3-12529
* | Merge pull request #2435 from n-aleha/ticket/12522Joas Schilling2014-05-111-0/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12522] Add function parameter description in guesser interface * n-aleha/ticket/12522: [ticket/12522] Add function parameter description in guesser interface
| * | [ticket/12522] Add function parameter description in guesser interfacen-aleha2014-05-111-0/+1
| |/ | | | | | | | | | | | | Add parameter description for $file_name of the function guess in guesser_interface PHPBB3-12522
* | [ticket/12476] Label the constructor as publicn-aleha2014-05-091-1/+1
| | | | | | | | | | | | Label the the constructor as public. PHPBB3-12476
* | [ticket/12476] Increase assets also from acp_styles and phpbbclin-aleha2014-05-091-1/+6
|/ | | | | | Increase assets also from "ACP > Styles > Purge Cache" and phpbbcli PHPBB3-12476
* Merge pull request #2408 from prototech/ticket/12500Joas Schilling2014-05-081-2/+8
|\ | | | | | | | | | | | | [ticket/12500] Set a title attribute in user.img() * prototech/ticket/12500: [ticket/12500] Set a title attribute in user.img()
| * [ticket/12500] Set a title attribute in user.img()Cesar G2014-05-041-2/+8
| | | | | | | | PHPBB3-12500
* | Merge pull request #2418 from Nicofuma/ticket/12402Joas Schilling2014-05-081-0/+33
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins * Nicofuma/ticket/12402: [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
| * | [ticket/12402] CAPTCHA plugin migration fails to detect missing pluginsTristan Darricau2014-05-061-0/+33
| | | | | | | | | | | | PHPBB3-12402
* | | Merge pull request #2330 from Nicofuma/ticket/12421Joas Schilling2014-05-062-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12421] Don't parse [attachment] tags if user can't view them * Nicofuma/ticket/12421: [ticket/12421] Rebase and enable tests [ticket/12421] Don't parse [attachment] tags if user can't view them
| * | | [ticket/12421] Don't parse [attachment] tags if user can't view themTristan Darricau2014-05-062-0/+8
| |/ / | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12421 PHPBB3-12421
* | | [ticket/12507] Add console command to purge the cacheTristan Darricau2014-05-061-0/+62
|/ / | | | | | | PHPBB3-12507
* | Merge pull request #2373 from Nicofuma/ticket/12459Joas Schilling2014-05-065-16/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12459] Unapproved posts/topics are not correctly handled in feeds * Nicofuma/ticket/12459: [ticket/12459] Change language strings [ticket/12459] Enable related tests [ticket/12459] Fix: Differentiating unapproved and deleted posts [ticket/12459] Fix: Soft deleted topics should appear in feeds [ticket/12459] Fix: the posts were always marked as unapproved
| * | [ticket/12459] Fix: Differentiating unapproved and deleted postsTristan Darricau2014-05-041-1/+2
| | | | | | | | | | | | | | | | | | | | | Unapproved and deleted posts should not be displayed with the same message (POST_UNAPPROVED) PHPBB3-12459
| * | [ticket/12459] Fix: Soft deleted topics should appear in feedsTristan Darricau2014-05-044-15/+27
| | | | | | | | | | | | | | | | | | | | | As for the posts, a soft deleted topic should appear (with a corresponding message) in topic's based feeds. PHPBB3-12459
| * | [ticket/12459] Fix: the posts were always marked as unapprovedTristan Darricau2014-05-041-1/+1
| | | | | | | | | | | | | | | | | | the database return a string, so the strict comparison always returned false PHPBB3-12459
* | | Merge pull request #2397 from Nicofuma/ticket/11497Joas Schilling2014-05-063-20/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/11497] Remove 'ext.finder' from services' list * Nicofuma/ticket/11497: [ticket/11497] Rename set_ext_finder in find_routing_files [ticket/11497] Change the date in the package declaration [ticket/11497] Fix pagination tests [ticket/11497] Use a mock object to define the root folder for the finder [ticket/11497] Generate the list of the routes in controller_helper [ticket/11497] Fix the path for the finder in controller_provider [ticket/11497] Fix tests [ticket/11497] Update pagination test [ticket/11497] Remove 'ext.finder' from services' list
| * | | [ticket/11497] Rename set_ext_finder in find_routing_filesTristan Darricau2014-05-052-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11497
| * | | [ticket/11497] Use a mock object to define the root folder for the finderTristan Darricau2014-05-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11497
| * | | [ticket/11497] Generate the list of the routes in controller_helperTristan Darricau2014-05-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11497
| * | | [ticket/11497] Fix the path for the finder in controller_providerNicofuma2014-05-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11497
| * | | [ticket/11497] Remove 'ext.finder' from services' listNicofuma2014-05-033-19/+26
| |/ / | | | | | | | | | PHPBB3-11497
* | | [ticket/12499] Incorrect call to phpbb\log\log::add() in db:migrateTristan Darricau2014-05-041-1/+1
| |/ |/| | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12499 PHPBB3-12499
* | [prep-release-3.1.0-b3] Add migration for 3.1.0-b3Joas Schilling2014-05-041-0/+32
| |
* | [ticket/12335] Remove $ from descPayBas2014-05-031-2/+2
| | | | | | | | | | | | Come on travis, play nice this time PHPBB3-12335
* | [ticket/12335] Added generate_profile_fields _ beforePayBas2014-05-031-0/+12
| | | | | | | | PHPBB3-12335
* | [ticket/12335] Documentation fix and added use_contact_fieldsPayBas2014-05-031-2/+3
| | | | | | | | PHPBB3-12335
* | [ticket/12335] Fix phpBB version numberPayBas2014-05-031-2/+2
| | | | | | | | PHPBB3-12335
* | [ticket/12335] Add Events to phpbb\profilefields\managerPayBas2014-05-031-1/+31
| | | | | | | | PHPBB3-12335
* | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-031-0/+25
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10737] Add live member search. * prototech/ticket/10737: [ticket/10737] Remove loading indicator. [ticket/10737] Enforce allow_live_searches setting in memberlist.php. [ticket/10737] Add config setting to disable live searches. [ticket/10737] Add loading indicator and alert box code to simple_footer.html. [ticket/10737] Load core.js and ajax.js in simple_footer.html. [ticket/10737] Set the username as the input value instead of redirecting. [ticket/10737] Drop subsilver2 changes. [ticket/10737] Add a more generic live search implementation. [ticket/10737] Clean up memberlist.php. [ticket/10737] Use dropdown for search results container. [ticket/10737] Adding delayed keyup and removing target_blank. [ticket/10737] Using UTF-8 aware alternatives in PHP code. [ticket/10737] Removing obsolete code. [ticket/10737] Avoid hard-coding table row and use case-insensitive search. [ticket/10737] Removing unnecessary/obsolete code. [ticket/10737] Using JQuery events and JSON response. [ticket/10737] Code fixes in AJAX search feature [ticket/10737] Improvements over last commit [ticket/10737] Adding username suggestions in "Find a member" using AJAX
| * [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+25
| | | | | | | | PHPBB3-10737
* | Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-031-1/+1
|\ \ | | | | | | | | | | | | * github-vse/ticket/10521: [ticket/10521] Update docblock of set_cookie for new HttpOnly param
| * | [ticket/10521] Update docblock of set_cookie for new HttpOnly paramMatt Friedman2014-05-021-1/+1
| | | | | | | | | | | | PHPBB3-10521
* | | Merge pull request #2391 from naderman/ticket/12382Joas Schilling2014-05-031-4/+11
|\ \ \ | | | | | | | | [ticket/12382] Allow nested loops in included files.
| * | | [ticket/12382] Allow nested loops in included files.Nils Adermann2014-05-031-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | They have to reference the fully qualified loop name in BEGIN and END. PHPBB3-12382
* | | | Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-032-5/+14
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * github-vse/ticket/10521: [ticket/10521] Allow language switching by URL parameter
| * | [ticket/10521] Allow language switching by URL parameterMatt Friedman2014-05-022-5/+14
| | | | | | | | | | | | PHPBB3-10521
* | | [ticket/12480] Only load config/routing.yml from extensions routeJoas Schilling2014-05-021-1/+1
|/ / | | | | | | PHPBB3-12480
* | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-021-3/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-vse/ticket/12254: [ticket/12254] Add subsilver2 support for cookie storage instead of SID [ticket/12254] Use a cookie instead of SID to store language selection [ticket/12254] No longer need to add change_lang to the URL params [ticket/12254] Use 'language' instead of 'set_lang' as the variable name [ticket/12254] Persist set_lang after reg only if changed from default [ticket/12254] Add set_lang var changes to subsilver2 files [ticket/12254] Use new set_lang var to avoid conflict with change_lang [ticket/12254] Stop using deprecated request_var in user class [ticket/12254] Better language switching on registration page
| * | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-021-6/+2
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-111-3/+3
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-071-3/+3
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Stop using deprecated request_var in user classMatt Friedman2014-04-071-3/+3
| | | | | | | | | | | | PHPBB3-12254
| * | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-061-2/+16
| | | | | | | | | | | | PHPBB3-12254
* | | [ticket/12475] Tabs, spaces, ...Nils Adermann2014-05-021-2/+2
| | | | | | | | | | | | PHPBB3-12475
* | | [ticket/12475] Load extension migrations on cli updater tooNils Adermann2014-05-021-1/+2
| | | | | | | | | | | | PHPBB3-12475