aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-132-6/+10
| | | | PHPBB3-11832
* [ticket/11832] Fix smiley pathsNathan Guse2013-09-131-2/+2
| | | | PHPBB3-11832
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-131-1/+1
|\ | | | | | | | | | | | | # By David King # Via David King (1) and Joas Schilling (1) * 'develop' of github.com:phpbb/phpbb3: [ticket/11824] Fix comment wording
| * Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-136-13/+89
| |\
| | * [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | | | | | | | | | | | PHPBB3-11824
* | | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-135-55/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now symfony_request is also a service (removed the function phpbb_create_symfony_request). Inject symfony request into filesystem Cleanup for the tests PHPBB3-11832
* | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1326-106/+766
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (22) and others # Via Nathan Guse (10) and others * 'develop' of github.com:phpbb/phpbb3: (39 commits) [ticket/11843] Added newlines and included numbers in the DEFINE vars test [ticket/11843] Add checking DEFINE variables with underscores to template_test [ticket/11843] The twig lexer fixes DEFINE variables with underscores again [ticket/11727] Fix indentation [ticket/11727] Fix indentation [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11816] Test !$DEFINITION [ticket/11822] Use namespace lookup order for asset loading [ticket/11727] Template loader support for safe directories to load files from [ticket/11816] Fix define/loop checks in IF statements containing parenthesis [ticket/11373] Use inheritdoc [ticket/11637] generate_text_for_display on search.php [ticket/11744] Cast to int [ticket/11744] Inheritdoc ...
| * | [ticket/11843] The twig lexer fixes DEFINE variables with underscores againrechosen2013-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/phpbb/phpbb3/pull/1708 accidentally stopped the twig lexer from fixing DEFINE variables with underscores in them. This commit restores that functionality. PHPBB3-11843
| * | Merge pull request #1622 from EXreaction/ticket/11373David King2013-09-125-2/+97
| |\ \ | | | | | | | | [ticket/11373] Prune old read notifications with cron
| | * \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-12214-5055/+6436
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (188) and others # Via Andreas Fischer (41) and others * 'develop' of github.com:phpbb/phpbb3: (435 commits) [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [feature/oauth] Fix tabindex [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [feature/oauth] Fix bug on ucp_auth_link related to error display ...
| | * | | [ticket/11373] Use inheritdocNathan Guse2013-08-281-13/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11373
| | * | | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-275-5/+110
| | | | | | | | | | | | | | | | | | | | PHPBB3-11373
| * | | | Merge pull request #1689 from EXreaction/ticket/11727David King2013-09-122-7/+165
| |\ \ \ \ | | |_|/ / | |/| | | [ticket/11727] Mark style directories safe to load from
| | * | | [ticket/11727] Fix indentationNathan Guse2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11727
| | * | | [ticket/11727] Fix indentationNathan Guse2013-09-121-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11727
| | * | | [ticket/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-022-7/+165
| | | | | | | | | | | | | | | | | | | | PHPBB3-11727
| * | | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-126-35/+147
| |\ \ \ \ | | | | | | | | | | | | Group join approved notification
| | * | | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-122-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| | * | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-275-33/+143
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-128-41/+292
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/11744] Group join request notification
| | * | | | | [ticket/11744] Cast to intNathan Guse2013-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | | [ticket/11744] InheritdocNathan Guse2013-07-281-54/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | [ticket/11744] CommentsNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | [ticket/11744] LanguageNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | [ticket/11744] Create null log class (primarily for unit test)Nathaniel Guse2013-07-261-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-262-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | [ticket/11744] Group join request notificationNathan Guse2013-07-267-38/+204
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-11744
| * | | | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-122-4/+4
| |\ \ \ \ | | | | | | | | | | | | Fix invalid template loop & prevent Twig from throwing errors in invalid uses of BEGINELSE
| | * | | | [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSENathan Guse2013-09-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11833
| | * | | | [ticket/11833] Fix bad template loopNathan Guse2013-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11833
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1258-62/+2920
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Nathan Guse (6) and others * 'develop' of github.com:phpbb/phpbb3: (195 commits) [ticket/11828] Fix greedy operators in lexer [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [ticket/develop/11832] Fix path detection [feature/oauth] Fix tabindex [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [ticket/11822] Use namespace lookup order for asset loading [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| | * \ \ \ \ Merge pull request #1708 from EXreaction/ticket/11828David King2013-09-121-4/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11828] Fix greedy operators in lexer
| | | * | | | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use lazy operators and use stricter validation PHPBB3-11828
| | * | | | | | Merge pull request #1690 from EXreaction/ticket/11822David King2013-09-122-2/+37
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11822] Use namespace lookup order for asset loading
| | | * | | | | | [ticket/11822] Use namespace lookup order for asset loadingNathan Guse2013-09-022-2/+37
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | PHPBB3-11822
| | * | | | | | Merge pull request #1640 from brunoais/ticket/11637Nathan Guse2013-09-121-8/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/11637] generate_text_for_display on search.php
| | | * | | | | | [ticket/11637] generate_text_for_display on search.phpbrunoais2013-08-041-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11639
| | * | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-124-3/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11829] Use report_closed to determine status in MCP report_details Conflicts: phpBB/styles/prosilver/template/mcp_post.html
| | | * \ \ \ \ \ \ Merge pull request #1698 from rechosen/ticket/11829Nathan Guse2013-09-124-3/+5
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/11829] Use report_closed to determine status in MCP report_details
| | | | * | | | | | | [ticket/11829] Use report_closed to determine status in MCP report_detailsrechosen2013-09-044-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829
| | * | | | | | | | | Merge pull request #1699 from rechosen/ticket/9550Nathan Guse2013-09-121-1/+14
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php
| | | * | | | | | | | | [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.phprechosen2013-09-061-1/+14
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow extra fields added to the query retrieving post data to be used for setting template variables, they need to be added to the post rowset. This commit adds the core.viewtopic_post_rowset_data event that enables extension developers to modify the post rowset when the database row is still available. PHPBB3-9550
| * | | | | | | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-0653-4437/+2436
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By David King (16) and others # Via David King (13) and others * 'develop' of github.com:phpbb/phpbb3: (67 commits) [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ [ticket/11215] Remove unnecessary comment [ticket/11755] MySQL upgrader out of date [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. [ticket/11823] Set up nginx server to match PHP files with characters after .php [ticket/11812] Fix empty define [ticket/11818] Update Symfony dependencies to 2.3.* [ticket/11791] Load adm/ events from styles/adm/event/ [ticket/11215] Fix helper_url_test.php tests [ticket/11215] Add newline back to .htaccess, fix wording [ticket/11215] Update comment in .htaccess [ticket/11215] Uncomment rewrite rules in .htaccess [ticket/11215] Make controller helper url() method use correct format [ticket/11215] Add commented-out URL rewrite capability to .htaccess [ticket/11821] Fix comma usage next to "You are receiving this notification". [ticket/11769] Allow using 0 as poster name [ticket/11769] Allow '0' as username [ticket/11215] Use new URL structure for controllers [ticket/11215] Everything appears to be working... ... Conflicts: phpBB/phpbb/template/twig/lexer.php tests/template/template_test.php
| * | | | | | | | | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesisNathan Guse2013-08-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11816
* | | | | | | | | | | Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-126-13/+89
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11832 * remotes/imkingdavid/ticket/11824: [ticket/11824] Revert changes in functions.php [ticket/11824] Reorganize test file [ticket/11824] Update language string for board settings [ticket/11824] Revert changes to functions_content.php [ticket/11824] Add tests for urls with mod_rewrite enabled [ticket/11824] Correct a comment [ticket/11824] Change copyright year in migration file [ticket/11824] Remove unused globals [ticket/11824] Fix smilies [ticket/11824] Fix logic [ticket/11824] Add option for mod_rewrite
| * | | | | | | | | | [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be added in another PR PHPBB3-11824
| * | | | | | | | | | [ticket/11824] Update language string for board settingsDavid King2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | | | | | | | [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be fixed in another PR PHPBB3-11824
| * | | | | | | | | | [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| * | | | | | | | | | [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-18 07:50:09 +0000