01097a24b5
Merge branch '3.1.x'
...
Conflicts:
tests/template/template_includecss_test.php
2015-07-08 22:54:26 +02:00
04d34e6c8b
[ticket/13995] Invalid avatar HTML missing space between elements
...
PHPBB3-13995
2015-07-07 20:10:18 -07:00
ef890e3363
Merge branch '3.1.x'
2015-06-17 15:39:12 +02:00
4f05364eb9
[ticket/13882] Add lazy load avatars to phpbb wrappers
...
PHPBB3-13882
2015-06-16 11:58:31 -07:00
80768b526b
Merge branch '3.1.x'
...
Conflicts:
phpBB/phpbb/user_loader.php
2015-06-16 12:35:51 +02:00
dc9245dd7a
Merge pull request #3653 from callumacrae/ticket/13882
...
[ticket/13882] Lazy load the notification avatars.
2015-06-16 12:33:17 +02:00
2eceaaddf6
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00
89f7fc63e8
Merge pull request #3703 from javiexin/ticket/10711
...
[ticket/10711] Duplicate key error on forum_tracks_table
* javiexin/ticket/10711:
[ticket/10711] Duplicate key error on forum_tracks_table
2015-06-13 16:27:44 +02:00
7b026eff79
[ticket/10711] Duplicate key error on forum_tracks_table
...
In certain situations, an SQL error DUPLICATE ERROR for KEY 'PRIMARY'
in the forums_track table is produced when marking forums read
(viewforum.php?f=xx&mark=forums).
The problem happens when there are duplicates in the forum_id array.
The solution is to remove those duplicates.
PHPBB3-10711
2015-06-13 01:08:18 +02:00
01073ffcbf
Merge pull request #3560 from Nicofuma/ticket/13790
...
[ticket/13790] Update phpcs
2015-05-30 10:53:47 +02:00
9366f29fd7
[ticket/13882] no more egyptian brackets /o/
...
PHPBB3-13882
2015-05-30 10:48:38 +02:00
a3d46575c7
Merge pull request #3613 from nickvergessen/ticket/13844
...
Ticket/13844 Better FAQ language files
2015-05-29 15:44:39 +02:00
be1d1c7d05
[ticket/13882] Lazy load the notification avatars.
...
This moves them further down the waterfall, making the page load
quicker.
PHPBB3-13882
2015-05-28 18:05:07 +02:00
a462f14aa3
[ticket/13790] Update phpcs
...
PHPBB3-13790
2015-05-19 22:19:18 +02:00
07231e7943
[ticket/13844] FAQ in new controller format
...
PHPBB3-13844
2015-05-16 22:09:05 +02:00
8b7a42f338
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
...
Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code.
PHPBB3-13614
2015-05-11 20:43:47 +02:00
179a470022
[ticket/13762] Moving language related functionality into a separate class
...
PHPBB3-13762
2015-05-02 13:37:12 +02:00
39f1e8c009
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/security-180] Use language variable for redirect error in 3.1+
[ticket/security-180] Merge if statement with previous one in 3.1.x
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:51 +02:00
aa0c55ed8f
Merge branch 'prep-release-3.1.4' into 3.1.x
...
* prep-release-3.1.4:
[ticket/security-180] Use language variable for redirect error in 3.1+
[ticket/security-180] Merge if statement with previous one in 3.1.x
[ticket/security-180] Add tests for redirecting to main URL
[ticket/security-180] Always fail when redirecting to an insecure URL
[ticket/security-180] Make sure that redirect goes to full URL plus slash
[ticket/security-180] Check if redirect URL contains board URL
2015-04-28 22:17:37 +02:00
d7c96cc60c
[ticket/security-180] Use language variable for redirect error in 3.1+
...
SECURITY-180
2015-04-28 22:12:04 +02:00
416728fc17
Merge branch 'ticket/security-180' into ticket/security-180-asc
...
Conflicts:
tests/security/redirect_test.php
2015-04-28 22:12:03 +02:00
ec207d0a71
[ticket/security-180] Merge if statement with previous one in 3.1.x
...
SECURITY-180
2015-04-28 22:08:19 +02:00
89723b17d9
Merge branch 'ticket/security-180' into ticket/security-180-asc
...
Conflicts:
tests/security/redirect_test.php
2015-04-28 22:08:15 +02:00
7c2115d95a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
2015-04-27 22:15:57 +02:00
e25e411e2b
[ticket/12101] Remove HTML redirect workaround for Microsoft/IIS webserver
...
The code was added as a workaround for bugs in very old versions of IIS,
dating back to 2002: see commit 849d766974
2015-04-26 22:10:06 +02:00
80d4fb1847
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
2015-04-25 18:11:19 +02:00
901875a1fb
Merge branch 'ticket/13765' into ticket/13765-3.1.4
...
* ticket/13765:
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
Conflicts:
phpBB/includes/functions.php
phpBB/includes/startup.php
2015-04-25 17:41:17 +02:00
463c62df18
[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.
...
PHPBB3-13765
2015-04-25 17:22:10 +02:00
4bdef6fd21
[ticket/13697] Moving filesystem related functions to filesystem service
...
* Moving filesystem service to \phpbb\filesystem namespace
* Wraping Symfony's Filesystem component
* Moving filesystem related functions from includes/functions.php
into \phpbb\filesystem\filesystem
Functions moved (and deprecated):
- phpbb_chmod
- phpbb_is_writable
- phpbb_is_absolute
- phpbb_own_realpath
- phpbb_realpath
* Adding interface for filesystem service
PHPBB3-13697
2015-04-16 13:24:10 +02:00
ee658bfe7b
[ticket/security-180] Always fail when redirecting to an insecure URL
...
SECURITY-180
2015-04-11 17:08:28 +02:00
bca1b96b2e
[ticket/security-180] Make sure that redirect goes to full URL plus slash
...
SECURITY-180
2015-04-11 16:41:20 +02:00
eed355b798
[ticket/security-180] Check if redirect URL contains board URL
...
SECURITY-180
2015-04-10 18:10:32 +02:00
9a5aefd4c2
Merge branch '3.1.x'
2015-03-24 23:20:03 +01:00
0bc2f9f242
[ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
...
LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid
while hitting the LOGIN_ERROR_ATTEMPTS error.
PHPBB3-13698
2015-03-23 17:52:17 -07:00
7c26cd25c7
Merge pull request #3434 from nickvergessen/ticket/13647
...
[ticket/13647] Move FAQ page to a controller
2015-03-05 15:25:30 +01:00
261c3bc1d0
Merge branch '3.1.x'
2015-02-24 21:57:14 +01:00
3ac583271f
Merge pull request #3381 from rxu/ticket/13591
...
[ticket/13591] Add core events to the function obtain_users_online_string()
2015-02-24 21:56:34 +01:00
19a236205f
[ticket/13647] Generate route links for faq
...
PHPBB3-13647
2015-02-22 22:44:50 +01:00
ddc96a7d07
Merge branch '3.1.x'
2015-02-18 00:19:10 +01:00
fa1c61f608
[ticket/13433] Fix parsing of email addresses
...
Currently email addresses are parsed incorrectly due to the regex structure.
Namely, if localpart consists of several dot separated parts, only the last
part with the trailing dot will be captured.
The patch change this behavior to capture the whole localpart.
PHPBB3-13433
2015-02-17 17:24:30 +07:00
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
f6e06da4c6
[ticket/13455] Update calls to request_var()
...
PHPBB3-13455
2015-02-03 20:50:40 +01:00
284aa8c496
Merge pull request #3281 from MGaetan89/ticket/13496
...
[ticket/13496] Change set_config_count() calls with $config->increment()
* MGaetan89/ticket/13496:
[ticket/13496] Update calls to `set_config_count()`
2015-02-03 18:13:20 +01:00
eadacaa3ad
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:12:47 +01:00
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
517549eae6
Merge branch 'develop-ascraeus' into develop
2015-02-02 23:09:41 +01:00
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
a633f3484c
[ticket/13496] Update calls to set_config_count()
...
PHPBB3-13496
2015-02-02 21:52:59 +01:00
79d4ff5538
[ticket/13494] Update calls to set_config()
...
PHPBB3-13494
2015-02-02 19:28:23 +01:00
7fc586080b
[ticket/13468] Update calls to add_log()
...
PHPBB3-13468
2015-01-27 18:34:33 +01:00
