1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-16 14:21:35 +02:00
Commit Graph

406 Commits

Author SHA1 Message Date
33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842
Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-11-27 14:55:24 +01:00
0d4bf3ff45 [ticket/11842] Use type map for updating avatar types in database
PHPBB3-11842
2013-11-25 13:12:08 +01:00
df7fa8e499 Merge pull request from Pico88/ticket/12005
[ticket/12005] Remove code responsible for PM popup completely
2013-11-21 14:01:23 -08:00
20885ccb8c Merge pull request from prototech/ticket/11959
[ticket/11959] Trim the list of users from post notifications.
2013-11-21 13:27:52 -08:00
e3a28e5e2a [ticket/11959] Rename $extra_cnt to something more descriptive.
PHPBB3-11959
2013-11-21 13:18:28 -08:00
43f454a6c6 [ticket/11959] Use COMMA_SEPARATOR to join the user list.
PHPBB3-11959
2013-11-21 13:15:08 -08:00
bcf347420e [ticket/11959] Trim the list of users from post notifications.
PHPBB3-11959
2013-11-21 13:02:26 -08:00
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
6db967bdd5 [ticket/11842] Add migration file for updating avatar type in database
PHPBB3-11842
2013-11-20 17:12:00 +01:00
7678186b09 [prep-release-3.1.0-a2] Add migration for 3.1.0-a2 2013-11-19 01:18:21 +01:00
23e2f920f5 [ticket/12018] Use path_helper for admin style CSS in sql report
The path to the admin style CSS is currently created with $phpbb_admin_path.
We should however use the path_helper to correctly link to this file in order
to have a correct link on pages like extensions

PHPBB3-12018
2013-11-14 15:55:04 +01:00
287c2550b8 [ticket/12008] Update the run time value for the prune notifications cron task
PHPBB3-12008
2013-11-14 01:05:58 -08:00
50896305fa [ticket/12008] The read_notification_last_gc config setting should be dynamic.
PHPBB3-12008
2013-11-14 01:05:53 -08:00
52845b22f2 Merge pull request from marc1706/ticket/11525
[ticket/11525] Only remove group or user prefix from given avatar data
2013-11-13 09:52:21 -08:00
13a4ceedb1 [ticket/11525] Use foreach instead of array_walk in method clean_row()
This approach is cleaner and probably even faster the previous ways that
included using array_walk() or array_map() and other helper functions
and methods.

PHPBB3-11525
2013-11-13 18:27:40 +01:00
e48b2c07eb Merge pull request from nickvergessen/ticket/12016
Ticket/12016 Event listeners should be services
2013-11-13 08:45:48 -08:00
d3f9a51709 [ticket/12016] Use a service provider for event listeners
This allows them to use dependency injection

PHPBB3-12016
2013-11-13 17:34:06 +01:00
592c8b7566 Merge pull request from bantu/ticket/11998
[ticket/11998] Introduction of the phpBB Console
2013-11-11 15:02:03 -08:00
cfb0a41030 Merge remote-tracking branch 'EXreaction/ticket/11943' into develop
* EXreaction/ticket/11943:
  [ticket/11943] New line at EOF for define_error.html
  [ticket/11943] Forgot template file for test
  [ticket/11943] Throw an exception if DEFINE is setup improperly
  [ticket/11943] Split fix_inline_variable_tokens into 3 steps
  [ticket/11943] Require stricter DEFINE statements for templates
  [ticket/11943] Do not quote the value when it is exactly true, false, or null
  [ticket/11943] Add test for DEFINE $VAR = false
2013-11-11 18:23:37 +01:00
aa84f7de04 [ticket/11525] Prefix id parameter with 'g' again when its a group avatar
PHPBB3-11525
2013-11-10 23:20:48 +01:00
47f2caff6b [ticket/11525] Fix doc blocks
PHPBB3-11525
2013-11-10 22:20:15 +01:00
2e5117a71e [ticket/11943] Throw an exception if DEFINE is setup improperly
PHPBB3-11943
2013-11-09 11:14:55 -06:00
31e60f0c8d [ticket/11949] Do not prepend leading backslash to cache class name
The container seems to prepend the leading \ itself, so we get an
InvalidArgumentException with message '"'\\phpbb\\cache\\driver\\file'" is
not a valid class name for the "cache.driver" service.'

PHPBB3-11949
2013-11-09 17:06:38 +01:00
7344024b10 Merge remote-tracking branch 'dhruv/ticket/12007' into develop
* dhruv/ticket/12007:
  [ticket/12007] Default last_result to 0 instead of false
2013-11-09 15:53:29 +01:00
6370970f13 [ticket/11943] Split fix_inline_variable_tokens into 3 steps
DEFINE shouldn't add/remove surrounding quotes, but must have the inline
variable tokens fixed

PHPBB3-11943
2013-11-08 22:30:58 -06:00
da332aa0a5 [ticket/11943] Require stricter DEFINE statements for templates
PHPBB3-11943
2013-11-08 19:55:16 -06:00
a353673e7c [ticket/12005] Remove PM popup module from DB
PHPBB3-12005
2013-11-08 21:57:12 +01:00
65fbf87ce7 [ticket/12005] Remove PM popup
PHPBB3-12005
2013-11-08 21:57:08 +01:00
1173adfe87 [ticket/12007] Default last_result to 0 instead of false
PostgreSQL does not map null/false to 0 and thus this variable causes
an error.

PHPBB3-12007
2013-11-08 23:34:49 +05:30
6f33954757 [ticket/11922] Drop all keys before trying to delete columns to avoid issues
On MSSQL columns that have an index can not be dropped.

PHPBB3-11922
2013-11-08 17:45:48 +01:00
00294e3dae [ticket/11998] Turn develop/extensions.php into console commands.
PHPBB3-11998
2013-11-05 21:40:42 +01:00
73ea5daf97 [ticket/11998] Add phpBB abstraction for application and command.
PHPBB3-11998
2013-11-05 19:42:34 +01:00
cc54e6a9e5 Merge pull request from marc1706/ticket/11534
[ticket/11534] Check remote avatar content type if possible
2013-11-04 10:22:28 -08:00
b49d3a1851 [ticket/11943] Do not quote the value when it is exactly true, false, or null
Quoting these can change the meaning of the value (e.g. 'false' == true)

PHPBB3-11943
2013-11-04 12:21:12 -06:00
743a0560c3 [ticket/11998] Add console command for recalculating email hash.
PHPBB3-11998
2013-11-03 13:02:48 +01:00
66c08de4cb [ticket/11746] The IN_PHPBB check is not necessary.
PHPBB3-11746
2013-11-02 13:50:09 -07:00
0a3bb18e93 Merge pull request from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
2013-11-02 11:55:16 -07:00
414a4d587e [ticket/11995] Fix Revert of config.remove
PHPBB3-11995
2013-11-02 18:13:11 +01:00
ae7ef3e09d [task/code-sniffer] Remove class result_mssqlnative.
PHPBB3-11980
2013-10-31 00:48:03 +01:00
ef1f991837 [task/code-sniffer] Replace spaces with tabs.
PHPBB3-11980
2013-10-30 13:37:29 +01:00
7aa8f6461f [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.
PHPBB3-11980
2013-10-30 13:05:28 +01:00
02e9f6e284 [task/code-sniffer] Fix argument list spacing.
PHPBB3-11980
2013-10-29 23:38:05 +01:00
7f58a4572e [ticket/11981] Fix code sniffer complaints
PHPBB3-11981
2013-10-28 23:05:46 +01:00
b2f638b793 [ticket/11857] Use passed service collection instead of container in manager
The service collection that was already passed to the avatar manager should
be used in the avatar manager method get_driver() instead of the container
itself.

PHPBB3-11857
2013-10-27 15:08:58 +01:00
9b0b5481fe [ticket/11534] Check remote avatar content type if possible
This should make sure that error pages like 404 or 503 pages are not treated
as remote avatar images.

PHPBB3-11534
2013-10-24 23:43:40 +02:00
9d4d212e0f [ticket/11525] Only remove group or user prefix from given avatar data
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.

PHPBB3-11525
2013-10-24 13:55:23 +02:00
d607f1c927 [ticket/11746] Add "admin activation required" notification.
PHPBB3-11746
2013-10-24 02:37:20 -07:00
a7e41b23fd Merge pull request from nickvergessen/ticket/11948
Ticket/11948 Extensions should be allowed to have more then 1 routing file
2013-10-22 00:29:20 -07:00
51561ed538 [ticket/11948] Allow resource importing for routing
PHPBB3-11948
2013-10-21 21:52:48 +02:00
a80d5c93e3 [ticket/11930] Update docblock of avatar driver constructor
PHPBB3-11930
2013-10-21 11:02:59 +02:00