Marc Alexander
9e3bc9a3f9
Merge branch 'develop-olympus' into develop-ascraeus
...
Conflicts:
.travis.yml
travis/phpunit-mysqli-travis.xml
2015-02-13 12:06:07 +01:00
Marc Alexander
877774a296
Merge pull request #3393 from bantu/ticket/13599
...
[ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
2015-02-13 12:02:25 +01:00
Andreas Fischer
0a775e0433
[ticket/13599] Remove Travis CI PHP 5.2 environment. No longer supported.
...
PHPBB3-13599
2015-02-12 22:12:32 +01:00
Andreas Fischer
39a3f4f6c8
Merge pull request #3391 from marc1706/ticket/13597
...
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
* marc1706/ticket/13597:
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
2015-02-11 16:53:25 +01:00
Marc Alexander
25b54791f9
[ticket/13493] Append page name to base url if it doesn't contain it
...
PHPBB3-13493
2015-02-11 13:03:22 +01:00
brunoais
93185574b5
[ticket/13142] BUMPed version
...
PHPBB3-13142
2015-02-11 11:42:43 +00:00
Marc Alexander
3df25babce
[ticket/13597] Modify variable-variable syntax to be compatible with PHP7
...
PHPBB3-13597
2015-02-11 12:03:54 +01:00
brunoais
bf20fb03ef
[ticket/13592] The name didn't make proper sense
...
PHPBB3-13592
2015-02-11 10:56:36 +00:00
rxu
67a963ac42
[ticket/13596] Add display_forums() event to allow modifying forums list data
...
Add display_forums() core event in includes/functions_display.php to allow
modifying forums list data before the list is being generated and dumped
to the template.
PHPBB3-13596
2015-02-10 10:05:44 +07:00
brunoais
74385b8fce
[ticket/13592] Empty line before event comment block.
...
I had forgotten this one
PHPBB3-13592
2015-02-09 11:58:35 +00:00
brunoais
6111f5fa74
[ticket/13592] Removed unwanted space in self line.
...
PHPBB3-13592
2015-02-09 11:56:53 +00:00
brunoais
bb7d294190
[ticket/13592] Allow full override of get_visibility_sql()
...
PHPBB3-13592
2015-02-09 10:44:12 +00:00
brunoais
8a4df90dac
[ticket/13592] Allow changing get_visibility_sql's result
...
PHPBB3-13592
2015-02-09 08:42:37 +00:00
brunoais
1bcce75633
[ticket/13592] Allow changing get_visibility_sql's result
...
PHPBB3-13592
2015-02-08 23:52:27 +00:00
rxu
072df2217c
[ticket/13591] Add core events to the function obtain_users_online_string()
...
Add functions.php core events to the function obtain_users_online_string()
to allow extensions adding/modifying online users data.
PHPBB3-13591
2015-02-08 12:28:28 +07:00
n-aleha
e1eac80b8f
[ticket/13586] Allow '0' as username with Jabber notifications
...
PHPBB3-13586
2015-02-07 19:33:19 +02:00
Joas Schilling
c6a371531b
Merge pull request #3379 from Crizz0/ticket/13588
...
[ticket/13588] Fixes wrong message in info fsockopen() disabled
2015-02-07 14:33:34 +01:00
Crizzo
fbc603861d
[ticket/13588] Fixes wrong message in info fsockopen() disabled
...
PHPBB3-13588
2015-02-07 13:50:08 +01:00
Marc Alexander
1da6b30cf0
[ticket/13568] Add unit tests for validating absolute path
...
PHPBB3-13568
2015-02-06 10:39:55 +01:00
Marc Alexander
cd85f1b632
Merge branch 'ticket/13568' into ticket/13568-asc
...
Conflicts:
phpBB/adm/index.php
phpBB/includes/acp/acp_attachments.php
2015-02-06 10:19:39 +01:00
Marc Alexander
7c5d872344
[ticket/13568] Also check if absolute_path_writable is writable
...
PHPBB3-13568
2015-02-06 10:15:36 +01:00
Marc Alexander
48b64b0a61
[ticket/13577] Skip filespec test requiring mimetype check on windows
...
PHPBB3-13577
2015-02-05 13:37:34 +01:00
Marc Alexander
c1d644769f
[ticket/13577] Skip functional tests requiring fileinfo if not enabled
...
PHPBB3-13577
2015-02-04 15:24:25 +01:00
Andreas Fischer
1e4853507a
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
2015-02-03 20:36:46 +01:00
Andreas Fischer
8832851b8e
Merge pull request #3366 from marc1706/ticket/13348
...
[ticket/13348] Use close method to free feed query result handle
* marc1706/ticket/13348:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
2015-02-03 20:36:41 +01:00
Andreas Fischer
2787e799e1
Merge pull request #3365 from marc1706/ticket/13348-olympus
...
[ticket/13348] Use close method to free query result handle
* marc1706/ticket/13348-olympus:
[ticket/13348] Remove unnecessary global $cache
[ticket/13348] Use close method to free query result handle
2015-02-03 20:36:27 +01:00
Marc Alexander
a09d022d5e
Merge branch 'ticket/13348-olympus' into ticket/13348
...
Conflicts:
phpBB/feed.php
2015-02-03 18:30:45 +01:00
Marc Alexander
4e06ab16f0
[ticket/13348] Remove unnecessary global $cache
...
$cache is not used in the method get_item().
PHPBB3-13348
2015-02-03 18:24:16 +01:00
Marc Alexander
1f2cb69c8a
[ticket/13348] Use close method to free query result handle
...
PHPBB3-13348
2015-02-03 18:23:13 +01:00
Andreas Fischer
5347eac69c
Merge pull request #3328 from marc1706/ticket/13538
...
[ticket/13538] Add tests for pagination in nested loops
* marc1706/ticket/13538:
[ticket/13538] Add tests for double nested pagination loop
[ticket/13538] Fix tests for pagination in nested loop
[ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:46 +01:00
Andreas Fischer
2864e77d6c
Merge pull request #3361 from marc1706/ticket/13569
...
[ticket/13569] Add missing sql_freeresults and remove unneeded results
* marc1706/ticket/13569:
[ticket/13569] Add missing sql_freeresults and remove unneeded results
2015-02-03 17:38:00 +01:00
Marc Alexander
a3be531020
[ticket/13568] Use correct data provider on windows
...
PHPBB3-13568
2015-02-03 16:34:41 +01:00
Andreas Fischer
427d2de3ea
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:03 +01:00
Andreas Fischer
e86b7ce562
Merge pull request #3363 from Nicofuma/ticket/13572
...
[ticket/13572] Update composer to version 1.0.0-alpha9
* Nicofuma/ticket/13572:
[ticket/13572] Update composer to version 1.0.0-alpha9
2015-02-03 10:30:02 +01:00
Nicofuma
f4f983c0f6
[ticket/13572] Update composer to version 1.0.0-alpha9
...
PHPBB3-13572
2015-02-03 10:25:39 +01:00
Joas Schilling
bbb6d6a452
Merge pull request #3330 from kasimi/ticket/13540
...
[ticket/13540] Add core event for modifying topic review block data
2015-02-02 23:30:06 +01:00
Joas Schilling
efee422707
Merge pull request #3326 from Wolfsblvt-Test/ticket/13537
...
Add core events on mcp_queue for approval and disapproval
2015-02-02 23:25:53 +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
6678570f49
Merge pull request #3324 from rxu/ticket/13336
...
[ticket/13336] Add core events to the function user_active_flip()
2015-02-02 23:19:44 +01:00
Joas Schilling
e9eafece3f
Merge pull request #3323 from rxu/ticket/13535
...
[ticket/13535] Add core event to allow modifying account settings on editing
2015-02-02 23:18:15 +01:00
Joas Schilling
0e6cd94fb4
Merge pull request #3317 from Wolfsblvt/ticket/13532
...
Add core event to get_unread_topics() in functions.php
2015-02-02 23:12:42 +01:00
Joas Schilling
0aea283ab0
Merge pull request #3305 from Wolfsblvt/ticket/13518
...
Add core event to markread() in functions.php
2015-02-02 23:09:34 +01:00
Joas Schilling
b1336ae016
Merge pull request #3302 from rxu/ticket/13512
...
[ticket/13512] Add template events before/after the post details
2015-02-02 23:05:50 +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
Marc Alexander
5182d02da5
Merge pull request #3334 from paul999/ticket/13542
...
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
2015-02-02 21:05:44 +01:00
Marc Alexander
ffe0e46e82
[ticket/13568] Add imagick tests for windows
...
PHPBB3-13568
2015-02-02 20:39:58 +01:00
Marc Alexander
d50cec998c
[ticket/13568] Correctly check rpath and rwpath validation options
...
PHPBB3-13568
2015-02-02 18:44:48 +01:00
Marc Alexander
b53fd867be
[ticket/13568] Add more test cases for imagick path
...
PHPBB3-13568
2015-02-02 18:33:53 +01:00
Marc Alexander
a93df0e511
[ticket/13568] Use more descriptive validation names and merge with path block
...
PHPBB3-13568
2015-02-02 18:30:05 +01:00
Marc Alexander
a166f6f42c
[ticket/13569] Add missing sql_freeresults and remove unneeded results
...
PHPBB3-13569
2015-02-02 17:36:39 +01:00
