aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/notification
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-194-4/+4
| | | | PHPBB3-11700
* [ticket/11700] And some last comments with backslashesNils Adermann2013-09-162-2/+2
| | | | PHPBB3-11700
* [ticket/11700] Fix a few more commentsNils Adermann2013-09-162-2/+2
| | | | PHPBB3-11700
* [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-162-2/+6
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-163-9/+293
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373Nathan Guse2013-09-123-4/+286
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 ...
| | * 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
| | * | [ticket/11744] Cast to intNathan Guse2013-07-281-1/+1
| | |/ | | | | | | | | | PHPBB3-11744
| | * [ticket/11744] CommentsNathan Guse2013-07-271-1/+1
| | | | | | | | | | | | PHPBB3-11744
| | * [ticket/11744] Group join request notificationNathan Guse2013-07-262-7/+169
| | | | | | | | | | | | PHPBB3-11744
| * | [ticket/11373] Prune old read notifications with cronNathan Guse2013-07-271-5/+7
| |/ | | | | | | PHPBB3-11373
* | [ticket/11700] Correclty use namespaces in notificationsNils Adermann2013-09-161-13/+13
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-1624-89/+137
| | | | | | | | PHPBB3-11700
* | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-144-14/+14
| | | | | | | | PHPBB3-11700
* | [ticket/11700] With namespaces interface will no longer be a valid classnameNils Adermann2013-07-142-3/+3
|/ | | | PHPBB3-11700
* [ticket/11698] Moving all autoloadable files to phpbb/Nils Adermann2013-07-1424-0/+4769
PHPBB3-11698