aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| * | | | | | | | | | | [ticket/11835] Fix ucp_auth_link adding in migrationNathan Guse2013-09-101-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11835
| * | | | | | | | | | 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.
| | * | | | | | | | | | [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-06169-5080/+3522
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-023-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-26/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-246-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Subsilver2 ucp_login_linkJoseph Warner2013-08-241-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Subsilver2 ucp_auth_link templatesJoseph Warner2013-08-242-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Subsilver 2 login_body updatesJoseph Warner2013-08-222-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Add newline at end of fileJoseph Warner2013-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-151-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Fix template not refreshing issueJoseph Warner2013-08-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Don't allow external login methods on admin authJoseph Warner2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Fix bug found in testingJoseph Warner2013-08-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Update auth provider interfaceJoseph Warner2013-08-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Update language constants for ucp_auth_linkJoseph Warner2013-08-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Always store session_id with tokenJoseph Warner2013-08-141-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] Fix small error in method callJoseph Warner2013-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| * | | | | | | | | | [feature/oauth] No need for this lineJoseph Warner2013-08-141-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673