1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

92 Commits

Author SHA1 Message Date
Cesar G
285ad0f6fa [ticket/11959] Simplify how the users are trimmed.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
b32a66ca78 [ticket/11959] List the last user with "and" instead of a comma.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Cesar G
126ee37f66 [ticket/11959] Use the plurals system for the untrimmed language strings.
PHPBB3-11959
2014-03-19 03:08:33 -07:00
Forumhulp.com
86845e48a2 [ticket/12256] Selecting founders is fetching $sql instead of $result
PHPBB3-12256
2014-03-09 21:37:44 +01:00
Cesar G
d4affedaab [ticket/12192] Fix call to undefined method get_user_avatar().
PHPBB3-12192
2014-02-14 19:19:53 -08:00
Cesar G
4bb05c74e5 [ticket/12032] Do not inherit read status in certain notifications.
PHPBB3-12032
2014-01-16 17:27:30 -08:00
Cesar G
f4b832a27d [ticket/12034] AJAXify notifications popup.
PHPBB3-12034
2013-12-30 11:12:15 -08:00
Nathan Guse
20885ccb8c Merge pull request #1882 from prototech/ticket/11959
[ticket/11959] Trim the list of users from post notifications.
2013-11-21 13:27:52 -08:00
Cesar G
e3a28e5e2a [ticket/11959] Rename $extra_cnt to something more descriptive.
PHPBB3-11959
2013-11-21 13:18:28 -08:00
Cesar G
43f454a6c6 [ticket/11959] Use COMMA_SEPARATOR to join the user list.
PHPBB3-11959
2013-11-21 13:15:08 -08:00
Cesar G
bcf347420e [ticket/11959] Trim the list of users from post notifications.
PHPBB3-11959
2013-11-21 13:02:26 -08:00
Cesar G
44b6f45759 [ticket/11484] Display login box for users following email notification link.
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
2013-11-21 08:11:17 -08:00
Cesar G
287c2550b8 [ticket/12008] Update the run time value for the prune notifications cron task
PHPBB3-12008
2013-11-14 01:05:58 -08:00
Cesar G
66c08de4cb [ticket/11746] The IN_PHPBB check is not necessary.
PHPBB3-11746
2013-11-02 13:50:09 -07:00
Nathan Guse
0a3bb18e93 Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
2013-11-02 11:55:16 -07:00
Andreas Fischer
ef1f991837 [task/code-sniffer] Replace spaces with tabs.
PHPBB3-11980
2013-10-30 13:37:29 +01:00
Andreas Fischer
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.
PHPBB3-11980
2013-10-30 13:05:28 +01:00
Marc Alexander
7f58a4572e [ticket/11981] Fix code sniffer complaints
PHPBB3-11981
2013-10-28 23:05:46 +01:00
Cesar G
d607f1c927 [ticket/11746] Add "admin activation required" notification.
PHPBB3-11746
2013-10-24 02:37:20 -07:00
Patrick Webster
2b1ee16e4f [ticket/11919] Remove extra argument to notification manager's sql_fetchfield()
PHPBB3-11919
2013-10-14 21:18:41 -05:00
Nathan Guse
31aebb355c Merge pull request #1654 from rechosen/ticket/11786
[ticket/11786] Fix various defects in PHPDoc in-code documentation
2013-10-03 20:22:41 -07:00
rechosen
e45b69ee09 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786 2013-09-23 18:08:29 +02:00
Nils Adermann
06e7c84235 [ticket/11700] Fix some more incorrectly changed comments
PHPBB3-11700
2013-09-19 15:27:03 +02:00
Nils Adermann
390dc86344 [ticket/11700] And some last comments with backslashes
PHPBB3-11700
2013-09-16 05:00:18 +02:00
Nils Adermann
d626ebaf1e [ticket/11700] Fix a few more comments
PHPBB3-11700
2013-09-16 04:45:58 +02:00
Nils Adermann
2472271bc0 [ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
2013-09-16 02:41:03 +02:00
Nils Adermann
21bbb58503 Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* 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
2013-09-16 01:24:05 +02:00
Nils Adermann
2a1207b14f [ticket/11700] Correclty use namespaces in notifications
PHPBB3-11700
2013-09-16 00:39:34 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Nathan Guse
f723491527 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11373
# 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
  ...
2013-09-12 23:34:34 -05:00
David King
f22b959257 Merge pull request #1620 from EXreaction/ticket/11745
Group join approved notification
2013-09-12 21:25:00 -07:00
Nathan Guse
32b9254740 [ticket/11745] Correct language, coding guidelines
PHPBB3-11745
2013-09-12 22:59:42 -05:00
rechosen
564a7cc89d [ticket/11786] Further improve wording in phpbb/notification/type/quote.php
Further improve wording in phpbb/notification/type/quote.php per suggestion of
imkingdavid.

PHPBB3-11786
2013-08-13 17:05:55 +02:00
rechosen
a92669994b [ticket/11786] Fix typo and ugly English in the notification system PHPDoc
The notification system contained two PHPDoc lines that needed improvement.

PHPBB3-11786
2013-08-13 16:20:45 +02:00
Nathan Guse
cbe72ab14b [ticket/11744] Cast to int
PHPBB3-11744
2013-07-28 21:15:58 -05:00
Nathan Guse
a79e3b3415 [ticket/11373] Prune old read notifications with cron
PHPBB3-11373
2013-07-27 20:37:50 -05:00
Nathan Guse
46b4a405b1 [ticket/11745] Group request approved notification
PHPBB3-11745
2013-07-27 17:02:45 -05:00
Nathan Guse
b213be84a7 [ticket/11744] Comments
PHPBB3-11744
2013-07-27 09:09:24 -05:00
Nathan Guse
e0ef10128b [ticket/11744] Group join request notification
PHPBB3-11744
2013-07-26 10:26:52 -05:00
Nils Adermann
da2752e400 [ticket/11700] Modify all code to use the new interface names
PHPBB3-11700
2013-07-14 13:30:52 -04:00
Nils Adermann
b81613e5e5 [ticket/11700] With namespaces interface will no longer be a valid classname
PHPBB3-11700
2013-07-14 12:25:28 -04:00
Nils Adermann
7030578bbe [ticket/11698] Moving all autoloadable files to phpbb/
PHPBB3-11698
2013-07-14 01:32:34 -04:00