aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-165-9/+17
| | | | PHPBB3-11700
* [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-1612-52/+68
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1689-1625/+3508
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-132-12/+35
| |\
| | * [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | | | | | | | | | | | PHPBB3-11824
| | * [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | | | | | | | | | | | PHPBB3-11824
| | * [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-12/+35
| | | | | | | | | | | | PHPBB3-11824
| * | [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-123-2/+94
| |\ \ | | | | | | | | [ticket/11373] Prune old read notifications with cron
| | * \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-1277-1584/+2842
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-273-5/+107
| | | | | | | | | | | | | | | | | | | | 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-122-2/+122
| |\ \ \ \ | | | | | | | | | | | | Group join approved notification
| | * | | | [ticket/11745] Correct language, coding guidelinesNathan Guse2013-09-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| | * | | | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-123-7/+247
| |\ \ \ \ \ | | | | | | | | | | | | | | [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] Create null log class (primarily for unit test)Nathaniel Guse2013-07-261-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11744
| | * | | | [ticket/11744] Group join request notificationNathan Guse2013-07-262-7/+169
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-11744
| * | | | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-121-3/+3
| |\ \ \ \ | | | | | | | | | | | | 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
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-1217-6/+1720
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | | | | | [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-101-1219/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-0666-1590/+2356
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] More minor changes from reviewJoseph Warner2013-09-023-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Fix small bug introduced by update in OAuth libraryJoseph Warner2013-09-021-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-246-43/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Fix redirectsJoseph Warner2013-08-242-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Finish cleaning up TODOsJoseph Warner2013-08-241-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-244-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
| | * | | | | [feature/oauth] Fix remaining issues with token storageJoseph Warner2013-08-151-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11673
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-06 23:17:19 +0000