aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/notification
Commit message (Collapse)AuthorAgeFilesLines
...
* [ticket/12435] Update the commentTristan Darricau2014-05-141-4/+6
| | | | PHPBB3-12435
* [ticket/12435] purge_notifications() fails for unused notificationsTristan Darricau2014-05-141-8/+19
| | | | | | https://tracker.phpbb.com/browse/PHPBB3-12435 PHPBB3-12435
* [ticket/12371] Fix typos in commentJoas Schilling2014-05-021-1/+1
| | | | PHPBB3-12371
* [ticket/12371] Fix redirect link for approve_post and post_in_queueJoas Schilling2014-04-252-0/+16
| | | | PHPBB3-12371
* [ticket/12371] Fix language in commentJoas Schilling2014-04-251-3/+2
| | | | PHPBB3-12371
* [ticket/12371] Do not add unlimited users as respondersJoas Schilling2014-04-251-1/+22
| | | | | | | | We run into the risc that the data is longer then the character limit of the table column. However as we trim the users list anyway, we can also just stop adding them and display "many others" instead of "x others" PHPBB3-12371
* [ticket/12371] Do not update the notification entry unneccessarilyJoas Schilling2014-04-252-11/+20
| | | | | | When the data did not change, we also don't have to run the query at all. PHPBB3-12371
* [ticket/12371] Allow notification types to redirect to a different urlJoas Schilling2014-04-253-0/+23
| | | | | | | This way we can redirect the post and bookmark notification to the first unread post in the topic PHPBB3-12371
* [ticket/12371] Do not group "quote" notificationsJoas Schilling2014-04-251-23/+8
| | | | | | | Grouping these notification makes no sense, as the user will not find the posts he is quoted in, when they are spread over multiple pages PHPBB3-12371
* Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into ↵Nils Adermann2014-04-103-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12282: [ticket/12282] Update new references [ticket/12282] Update container db mock [ticket/12282] Add new line at EOF of the interface [ticket/12282] Use interface for type hinting [ticket/12282] Use {@inheritDoc} for inherited methods [ticket/12282] Add Interface for DBAL drivers
| * [ticket/12282] Use interface for type hintingJoas Schilling2014-04-013-9/+9
| | | | | | | | PHPBB3-12282
* | Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeusDhruv2014-04-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12349: [ticket/12349] Fix Sniffer for @license tag [ticket/12349] Update license header in several new files
| * | [ticket/12349] Update license header in several new filesJoas Schilling2014-04-031-1/+1
| |/ | | | | | | PHPBB3-12349
* | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-051-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | * Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
| * [ticket/7707] Add get_username_string() once moreOliver Schramm2014-03-291-1/+1
| | | | | | | | PHPBB3-7707
* | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-5/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11959: [ticket/11959] Move phpbb_generate_string_list() to functions_content.php. [ticket/11959] Add unit tests. [ticket/11959] Remove use of plurals and make it possible to use Oxford comma. [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name. [ticket/11959] Simplify how the users are trimmed. [ticket/11959] Add function to create a string list. [ticket/11959] Add samples for the untrimmed strings. [ticket/11959] List the last user with "and" instead of a comma. [ticket/11959] Use the plurals system for the untrimmed language strings. [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text. [ticket/11959] Use plurals for the language strings.
| * | [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.Cesar G2014-03-291-5/+0
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-191-3/+3
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Simplify how the users are trimmed.Cesar G2014-03-191-15/+7
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] List the last user with "and" instead of a comma.Cesar G2014-03-191-0/+7
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Use the plurals system for the untrimmed language strings.Cesar G2014-03-191-1/+6
| |/ | | | | | | PHPBB3-11959
* | [ticket/12317] Cast string to int to refix DBMSes not using int for integers.Andreas Fischer2014-03-284-5/+5
|/ | | | PHPBB3-12317
* [ticket/12256] Selecting founders is fetching $sql instead of $resultForumhulp.com2014-03-091-1/+1
| | | | PHPBB3-12256
* [ticket/12192] Fix call to undefined method get_user_avatar().Cesar G2014-02-141-1/+1
| | | | PHPBB3-12192
* [ticket/12032] Do not inherit read status in certain notifications.Cesar G2014-01-168-4/+60
| | | | PHPBB3-12032
* [ticket/12034] AJAXify notifications popup.Cesar G2013-12-301-2/+4
| | | | PHPBB3-12034
* Merge pull request #1882 from prototech/ticket/11959Nathan Guse2013-11-211-3/+30
|\ | | | | [ticket/11959] Trim the list of users from post notifications.
| * [ticket/11959] Rename $extra_cnt to something more descriptive.Cesar G2013-11-211-3/+3
| | | | | | | | PHPBB3-11959
| * [ticket/11959] Use COMMA_SEPARATOR to join the user list.Cesar G2013-11-211-1/+1
| | | | | | | | PHPBB3-11959
| * [ticket/11959] Trim the list of users from post notifications.Cesar G2013-11-211-2/+29
| | | | | | | | PHPBB3-11959
* | [ticket/11484] Display login box for users following email notification link.Cesar G2013-11-211-1/+1
|/ | | | | | | The link used for the latest post now uses view=unread so redirecting the user using the value for the e parameter is no longer necessary. PHPBB3-11484
* [ticket/12008] Update the run time value for the prune notifications cron taskCesar G2013-11-141-1/+8
| | | | PHPBB3-12008
* [ticket/11746] The IN_PHPBB check is not necessary.Cesar G2013-11-021-8/+0
| | | | PHPBB3-11746
* Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-021-0/+174
|\ | | | | [ticket/11746] Add "admin activation required" notification.
| * [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-241-0/+174
| | | | | | | | PHPBB3-11746
* | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-301-4/+2
| | | | | | | | PHPBB3-11980
* | [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.Andreas Fischer2013-10-3026-208/+0
| | | | | | | | PHPBB3-11980
* | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-281-1/+1
|/ | | | PHPBB3-11981
* [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()Patrick Webster2013-10-141-2/+2
| | | | PHPBB3-11919
* Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-032-2/+2
|\ | | | | [ticket/11786] Fix various defects in PHPDoc in-code documentation
| * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-233-9/+293
| |\
| * | [ticket/11786] Further improve wording in phpbb/notification/type/quote.phprechosen2013-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Further improve wording in phpbb/notification/type/quote.php per suggestion of imkingdavid. PHPBB3-11786
| * | [ticket/11786] Fix typo and ugly English in the notification system PHPDocrechosen2013-08-132-2/+2
| | | | | | | | | | | | | | | | | | The notification system contained two PHPDoc lines that needed improvement. PHPBB3-11786
* | | [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