aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [ticket/11744] Create base notification test class for setupNathaniel Guse2013-07-262-83/+107
| | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #1683 from EXreaction/ticket/11816David King2013-09-123-5/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesis
| * \ \ \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1263-63/+3144
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-123-5/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11828] Fix greedy operators in lexer
| * | | | | | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-123-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #1707 from EXreaction/ticket/11835David King2013-09-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | [ticket/11835] Fix ucp_auth_link adding in migration
| * | | | | | | | | | [ticket/11835] Fix ucp_auth_link adding in migrationNathan Guse2013-09-101-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11835
* | | | | | | | | | Merge remote-tracking branch 'Hardolaf/feature/oauth' into developDavid King2013-09-1051-42/+3073
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-1021-169/+253
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-101-1/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
| * | | | | | | | | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-101-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.12: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.
| | * | | | | | | | | | [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.Andreas Fischer2013-09-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A wrong fix version was assigned to PHPBB3-11288.
* | | | | | | | | | | | Merge pull request #1703 from cyberalien/ticket/develop/11832Nathan Guse2013-09-091-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Fix path detection
| * | | | | | | | | | | [ticket/develop/11832] Fix path detectionVjacheslav Trushkin2013-09-091-1/+7
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up path, do not count first / PHPBB3-11832
| | | * | | | | | | | [feature/oauth] Fix tabindexJoseph Warner2013-09-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-06239-5469/+5282
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix bug on ucp_auth_link related to error displayJoseph Warner2013-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] More small fixesJoseph Warner2013-09-024-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] More minor changes from reviewJoseph Warner2013-09-025-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix small bug introduced by update in OAuth libraryJoseph Warner2013-09-021-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix small issues on ucp pagesJoseph Warner2013-09-022-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix typo in OAuth logout methodJoseph Warner2013-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Make token storage service ignorantJoseph Warner2013-09-023-48/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Update oauth::logout() to use clearAllTokens()Joseph Warner2013-09-021-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Update storage implementation due to inteface changeJoseph Warner2013-09-022-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Update lusitanian/oauth to stable branchJoseph Warner2013-09-022-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Update comment on oauth service exceptionJoseph Warner2013-08-241-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16673
| | | * | | | | | | | [feature/oauth] Forgot to remove placeholder commentJoseph Warner2013-08-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] OAuth service exceptionJoseph Warner2013-08-245-6/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] A few more minor changesJoseph Warner2013-08-242-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-2410-67/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix redirectsJoseph Warner2013-08-243-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix issues on ucp_login_link from reviewJoseph Warner2013-08-241-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Fix indentation on new language constantsJoseph Warner2013-08-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | | * | | | | | | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-22 14:17:34 +0000