aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11832' into developJoas Schilling2013-09-1626-161/+557
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11832: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
| * [ticket/11832] Correct paths in testsNathan Guse2013-09-153-17/+19
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Correct ROOT_PATH variableNathan Guse2013-09-151-1/+1
| | | | | | | | PHPBB3-11832
| * [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-1321-41/+170
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Fix constructions of phpbb_filesystemNathan Guse2013-09-138-14/+41
| | | | | | | | 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
| * | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-137-75/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1335-362/+1178
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 ...
| * \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-127-19/+139
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/11832] Fix build_url and the S_LOGIN_ACTIONNathan Guse2013-09-121-16/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1252-43/+3073
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Andreas Fischer (2) and others * 'develop' of github.com:phpbb/phpbb3: (189 commits) [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [feature/oauth] Fix tabindex [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 [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment [feature/oauth] OAuth service exception [feature/oauth] A few more minor changes [feature/oauth] Changes due to code review [feature/oauth] Fix redirects [feature/oauth] Fix issues on ucp_login_link from review ...
| * | | | | [ticket/11832] Changing comments to say app.php rather than index.phpNathan Guse2013-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | [ticket/11832] We must instantiate the $phpbb_filesystem in commonNathan Guse2013-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | [ticket/11832] Fix the web path correctionsNathan Guse2013-09-122-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some real life examples to test PHPBB3-11832
| * | | | | [ticket/11832] More extensive testingNathan Guse2013-09-102-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | [ticket/11832] Use dirname(__FILE__)Nathan Guse2013-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | [ticket/11832] Use $phpbb_filesystem instead of the container in append_sidNathan Guse2013-09-102-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | Revert "[ticket/11832] Make $phpbb_container a global initiated by the ↵Nathan Guse2013-09-105-27/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framework" This reverts commit 5e09afa0bc3ff9014812282fd4454f0df54b9dfd.
| * | | | | [ticket/11832] Make $phpbb_container a global initiated by the frameworkNathan Guse2013-09-095-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup common items needed from the container (e.g. filesystem) PHPBB3-11832
| * | | | | [ticket/11832] Fix log testsNathan Guse2013-09-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-093-12/+99
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| * | | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-0910-51/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path PHPBB3-11832
* | | | | | Merge remote-tracking branch 'dhruv/ticket/11735' into developJoas Schilling2013-09-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruv/ticket/11735: [ticket/11735] Display disabled checkbox in subsilver for read notifications
| * | | | | | [ticket/11735] Display disabled checkbox in subsilver for read notificationsDhruv2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11735
* | | | | | | Merge remote-tracking branch 'dhruv/ticket/11735' into developJoas Schilling2013-09-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * dhruv/ticket/11735: [ticket/11735] Display disabled checkbox when notification is already read
| * | | | | | [ticket/11735] Display disabled checkbox when notification is already readDhruv2013-09-151-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11735
* | | | | | Merge remote-tracking branch 'Prosk8er/ticket/11844' into developDhruv2013-09-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Prosk8er # Via Prosk8er * Prosk8er/ticket/11844: [ticket/11844] update acp/authentication language var
| * | | | | | [ticket/11844] update acp/authentication language varProsk8er2013-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php PHPBB3-11844
* | | | | | | Merge pull request #1666 from cyberalien/ticket/11795Nathan Guse2013-09-1415-251/+149
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Move JS from html files to forum_fn.js
| * | | | | | [ticket/11795] Remove PM popupVjacheslav Trushkin2013-09-143-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11795
| * | | | | | [ticket/11795] Remove outdated comment from forum_fn.jsVjacheslav Trushkin2013-09-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment is no longer relevant because function was rewritten PHPBB3-11795
| * | | | | | [ticket/11795] Move find user JS to forum_fnVjacheslav Trushkin2013-09-143-42/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move JavaScript from user search results to forum_fn.js PHPBB3-11795
| * | | | | | [ticket/11795] Replace TWIG with phpBB syntax in ACPVjacheslav Trushkin2013-09-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11795
| * | | | | | [ticket/11795] Move MSN scripts to forum_fn.jsVjacheslav Trushkin2013-09-142-71/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move MSN scripts to forum_fn.js Rewrite MSN scripts to remove duplicate code PHPBB3-11795
| * | | | | | [ticket/11795] Use phpBB template syntax instead of TWIGVjacheslav Trushkin2013-09-143-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11795
| * | | | | | [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-144-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PM popup JavaScript from overall_header to forum_fn.js Use TWIG to escape PM popup URL PHPBB3-11795
| * | | | | | [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-148-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pagination variables to data attributes Replace A_BASE_URL with BASE_URL and use TWIG to escape it PHPBB3-11795
| * | | | | | [ticket/11795] Get rid of onload_functionsVjacheslav Trushkin2013-09-142-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of onload_functions and onunload_functions Scripts should use $(document).ready() instead PHPBB-11795
| * | | | | | [ticket/11795] Use data-reset-on-edit attr to reset elementsVjacheslav Trushkin2013-09-143-30/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use data-reset-on-edit attribute to reset other inputs when editing input with data. Do not unbind event (old code unbound it after one use for no reason) PHPBB3-11795
| * | | | | | [ticket/11795] Redo form elements auto-focusVjacheslav Trushkin2013-09-143-25/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use data-focus attribute for forms to focus elements when document is loaded instead of adding JavaScript PHPBB3-11795
* | | | | | Merge pull request #1710 from Hardolaf/ticket/11837Nathan Guse2013-09-131-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
| * | | | | | [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11837
| * | | | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTEDJoseph Warner2013-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11837
* | | | | | | Merge branch 'develop-olympus' into developNathan Guse2013-09-130-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus:
| * \ \ \ \ \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into ↵Nathan Guse2013-09-133-0/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/cyberalien/ticket/11811: [ticket/11811] Remove outline on :focus
* | \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/develop-2/11811' ↵Nathan Guse2013-09-133-0/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * remotes/cyberalien/ticket/develop-2/11811: [ticket/11811] Remove outline on :focus
| * \ \ \ \ \ \ \ \ Merge branch 'ticket/11811' into ticket/develop-2/11811Vjacheslav Trushkin2013-09-143-0/+23
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | | _ / / / / / / | | | / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11811: [ticket/11811] Remove outline on :focus Conflicts: phpBB/adm/style/admin.css phpBB/styles/prosilver/theme/forms.css
| * | | | | | | | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11811
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-19 04:20:18 +0000