Joas Schilling
|
917a5ce0df
|
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/includes/ucp/ucp_profile.php
|
2015-02-02 23:23:26 +01:00 |
|
Joas Schilling
|
7330c0afd3
|
Merge pull request #3325 from rxu/ticket/13536
[ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
|
2015-02-02 23:22:23 +01:00 |
|
Joas Schilling
|
f31d12ddf2
|
Merge branch 'develop-ascraeus' into develop
|
2015-02-02 23:00:48 +01:00 |
|
Joas Schilling
|
7254a52812
|
Merge pull request #3282 from Elsensee/ticket/13313
[ticket/13313] Add event core.acp_email_display
|
2015-02-02 23:00:29 +01:00 |
|
Gaëtan Muller
|
79d4ff5538
|
[ticket/13494] Update calls to set_config()
PHPBB3-13494
|
2015-02-02 19:28:23 +01:00 |
|
Gaëtan Muller
|
7fc586080b
|
[ticket/13468] Update calls to add_log()
PHPBB3-13468
|
2015-01-27 18:34:33 +01:00 |
|
rxu
|
be1b114114
|
[ticket/13536] Add core events to allow modifying user profile data on editing
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744
PHPBB3-13536
|
2015-01-23 00:35:02 +07:00 |
|
Andreas Fischer
|
5069da8d52
|
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13519] Correctly validate imagick path as path and not string
|
2015-01-20 23:11:40 +01:00 |
|
Andreas Fischer
|
4d0b04a397
|
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13519] Correctly validate imagick path as path and not string
Conflicts:
phpBB/includes/acp/acp_attachments.php
|
2015-01-20 23:11:29 +01:00 |
|
Joas Schilling
|
358ca14ade
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-20 20:58:21 +01:00 |
|
Joas Schilling
|
40006376f2
|
Merge pull request #3226 from prototech/ticket/13420
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
|
2015-01-20 20:58:12 +01:00 |
|
Joas Schilling
|
2dcce57806
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-20 17:31:24 +01:00 |
|
rxu
|
8002af7526
|
[ticket/13492] Add the migration to update custom bbcodes with IDN regexps
Also fix the $utf8 checking regexp removing the curly braces.
PHPBB3-13492
|
2015-01-20 08:47:56 +07:00 |
|
Marc Alexander
|
6564446b0f
|
[ticket/13519] Correctly validate imagick path as path and not string
PHPBB3-13519
|
2015-01-19 20:47:47 +01:00 |
|
Tristan Darricau
|
0344e61b8c
|
Merge pull request #3237 from MGaetan89/ticket/12487
[ticket/12487] Update PHP code
* MGaetan89/ticket/12487:
[ticket/12487] Update PHP code
|
2015-01-16 10:05:23 +01:00 |
|
Oliver Schramm
|
c6557e3800
|
[ticket/13313] Update version in @since tag of event
PHPBB3-13313
|
2015-01-15 22:08:10 +01:00 |
|
Gaëtan Muller
|
b5544b2f47
|
[ticket/13450] Type-hint return value of $phpbb_container->get()
PHPBB3-13450
|
2015-01-12 20:19:07 +01:00 |
|
Oliver Schramm
|
3bfd87cda4
|
[ticket/13313] Add event core.acp_email_display
PHPBB3-13313
|
2015-01-11 20:55:00 +01:00 |
|
rxu
|
17f4dce0fc
|
[ticket/13492] Add IDN support for custom BBCode URL tokens
Custom BBCode URL tokens does not support IDN.
Custom BBCodes added earlier than IDN has been applied are unaffected.
PHPBB3-13492
|
2015-01-11 20:36:22 +07:00 |
|
Gaëtan Muller
|
63da128ee5
|
[ticket/12487] Update PHP code
PHPBB3-12487
|
2015-01-11 13:22:59 +01:00 |
|
Joas Schilling
|
ff44579523
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-09 17:41:47 +01:00 |
|
Oliver Schramm
|
e3571fc6eb
|
[ticket/13470] Fix non-empty username array if no usernames are given
PHPBB3-13470
|
2015-01-08 22:17:05 +01:00 |
|
Marc Alexander
|
7b84b8bba8
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-04 11:26:00 +01:00 |
|
Matt Friedman
|
86f66b5f72
|
[ticket/13439] Update event version to 3.1.3-RC1
PHPBB3-13439
|
2015-01-04 01:38:50 -08:00 |
|
Marc Alexander
|
4749dbbc1a
|
Merge branch 'develop-ascraeus' into develop
|
2015-01-04 00:39:21 +01:00 |
|
Matt Friedman
|
179a7a4c71
|
[ticket/13439] Add event core.acp_users_overview_before
PHPBB3-13439
|
2015-01-03 15:21:47 -08:00 |
|
Joas Schilling
|
8aadee60f7
|
Merge branch 'develop-ascraeus' into develop
|
2014-12-27 13:46:46 +01:00 |
|
Cesar G
|
75780d7fc8
|
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
PHPBB3-13420
|
2014-12-09 18:27:04 -08:00 |
|
Joas Schilling
|
ec90f2b380
|
[ticket/13421] Move tools to subdirectory
PHPBB3-13421
|
2014-12-06 17:10:07 +01:00 |
|
Oliver Schramm
|
a349db54d6
|
[ticket/13312] Use empty for usernames array
PHPBB3-13312
|
2014-11-26 23:10:02 +01:00 |
|
Oliver Schramm
|
41d0b5d3a2
|
[ticket/13312] Add event core.acp_email_send_before
PHPBB3-13312
|
2014-11-26 23:01:58 +01:00 |
|
Joas Schilling
|
11c9d11482
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 15:43:33 +01:00 |
|
Joas Schilling
|
fd993cbaf2
|
Merge pull request #3157 from marc1706/ticket/13358
[ticket/13358] Add class for retrieving remote file data
|
2014-11-22 15:42:37 +01:00 |
|
Marc Alexander
|
f3ae5e4cb2
|
[ticket/13358] Correctly create version_helper in acp_extensions
The full namespace for the file_downloader is now also being used in
version_helper.
PHPBB3-13358
|
2014-11-22 15:23:26 +01:00 |
|
Joas Schilling
|
45aafe0b09
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 12:21:30 +01:00 |
|
Joas Schilling
|
8b71103836
|
Merge pull request #3123 from Elsensee/ticket/13310
[ticket/13310] Add event core.acp_email_modify_sql
|
2014-11-22 12:21:24 +01:00 |
|
Marc Alexander
|
afc658c71a
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-22 00:15:24 +01:00 |
|
Joas Schilling
|
c174862b7e
|
[ticket/10744] Fix some doc blocks
PHPBB3-10744
|
2014-11-21 23:59:29 +01:00 |
|
Joas Schilling
|
7c683608ab
|
[ticket/10744] Type hint objects for IDE usages
PHPBB3-10744
|
2014-11-21 23:58:53 +01:00 |
|
Joas Schilling
|
7f8c4d877a
|
[ticket/10744] Prevent installing styles with reserved names
PHPBB3-10744
|
2014-11-21 23:55:48 +01:00 |
|
Joas Schilling
|
a191708601
|
Merge branch 'develop-ascraeus' into develop
|
2014-11-21 20:20:45 +01:00 |
|
Joas Schilling
|
973c2a9a3a
|
Merge pull request #2765 from Elsensee/ticket/11863
[ticket/11863] Set require_activation to none if emails are disabled
|
2014-11-21 20:18:15 +01:00 |
|
Oliver Schramm
|
b6f0c789d5
|
[ticket/13310] Add event core.acp_email_modify_sql
PHPBB3-13310
|
2014-11-09 15:34:54 +01:00 |
|
Oliver Schramm
|
054ab67771
|
[ticket/13310] Always use sql_build_query in acp_email.php
PHPBB3-13310
|
2014-11-09 02:46:50 +01:00 |
|
Joas Schilling
|
acf6eaf8a8
|
Merge branch 'develop-ascraeus' into develop
|
2014-10-23 01:38:54 +02:00 |
|
Joas Schilling
|
e4c8e4905c
|
Merge pull request #3 from phpbb/ticket/security-161
[ticket/security-161] Add form token to styles management form.
|
2014-10-23 01:38:12 +02:00 |
|
Cesar G
|
4d30633cd4
|
[ticket/security-161] Add form token to styles management form.
SECURITY-161
|
2014-10-22 15:46:00 -07:00 |
|
Andreas Fischer
|
a16f185413
|
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
|
2014-10-20 23:20:43 +02:00 |
|
Andreas Fischer
|
afada9ed40
|
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
|
2014-10-20 23:20:42 +02:00 |
|
Oliver Schramm
|
53f166274a
|
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
PHPBB3-13168
|
2014-10-20 16:47:52 +02:00 |
|