Marc Alexander
378fef022f
Merge branch 'develop-ascraeus' into develop
2014-10-22 17:42:51 -05:00
Marc Alexander
6a0727acdc
Merge pull request #3058 from naderman/ticket/13205
...
[ticket/13205] Add a mark all messages read link to PM folders
2014-10-22 17:39:13 -05:00
Nils Adermann
df72846b89
[ticket/13205] Explicitly cast ids to integers and reformat SQL
...
PHPBB3-13205
2014-10-22 18:35:07 -04:00
Nils Adermann
b5594371ab
[ticket/13205] Remove superfluous newline
...
PHPBB3-13205
2014-10-22 18:31:29 -04:00
Nils Adermann
00c57ed122
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/security-159] Only show first 8 characters of login keys in UCP
2014-10-22 18:21:12 -04:00
Nils Adermann
d7553893c4
Merge pull request #3057 from marc1706/ticket/security-159
...
[ticket/security-159] Only show first 8 characters of login keys in UCP
2014-10-22 18:20:46 -04:00
Nils Adermann
48dc4c02ae
[ticket/13205] Add a mark all messages read link to PM folders
...
PHPBB3-13205
2014-10-22 18:02:43 -04:00
Marc Alexander
f796f92058
[ticket/security-159] Only show first 8 characters of login keys in UCP
...
SECURITY-159
2014-10-22 16:21:16 -05:00
Nils Adermann
d08a47d857
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13203] Fix passwords manager tests
[ticket/13203] Use string_compare method in passwords drivers
[ticket/13203] Add method for byte by byte comparison to drivers helper
2014-10-22 16:58:50 -04:00
Nils Adermann
fad280f94b
Merge pull request #3056 from marc1706/ticket/13203
...
[ticket/13203] Use constant time comparison method for comparing password hashes
2014-10-22 16:57:50 -04:00
Marc Alexander
cf9d1fbd1a
[ticket/13203] Fix passwords manager tests
...
PHPBB3-13203
2014-10-22 15:09:58 -05:00
Marc Alexander
0bc04a4df0
[ticket/13203] Use string_compare method in passwords drivers
...
PHPBB3-13203
2014-10-22 14:54:55 -05:00
Marc Alexander
2b47ef1266
[ticket/13203] Add method for byte by byte comparison to drivers helper
...
PHPBB3-13203
2014-10-22 14:54:22 -05:00
Marc Alexander
14bfba5070
Merge branch 'develop-ascraeus' into develop
2014-10-21 19:25:09 -05:00
Marc Alexander
e43d1781bf
Merge branch 'develop-olympus' into develop-ascraeus
...
Conflicts:
phpBB/docs/AUTHORS
2014-10-21 19:24:48 -05:00
Marc Alexander
d51c1707e3
Merge pull request #3051 from nickvergessen/ticket/12120
...
[ticket/12120] Remove EXreaction from active authors
2014-10-21 19:22:11 -05:00
Marc Alexander
7c4b7f63fc
Merge branch 'develop-ascraeus' into develop
2014-10-21 18:58:06 -05:00
Marc Alexander
faec26b873
Merge pull request #3053 from Senky/ticket/13194
...
[ticket/13194] BBCode isn't parsed when issuing a warning for a post
2014-10-21 18:57:43 -05:00
Marc Alexander
49d91a2ceb
Merge branch 'develop-ascraeus' into develop
2014-10-21 18:54:12 -05:00
Marc Alexander
0de7adfa37
Merge pull request #3052 from VSEphpbb/ticket/13041
...
[ticket/13041] Help_faq.php language file needs to be revised
2014-10-21 18:53:51 -05:00
Jakub Senko
defeb1a56f
[ticket/13194] Use correct array to access bbcode_bitfield
...
PHPBB3-13194
2014-10-21 22:21:48 +02:00
Matt Friedman
4b99ab7066
[ticket/13041] Final grammar and language changes to help_faq
...
PHPBB3-13041
2014-10-21 09:54:25 -07:00
Joas Schilling
9cf81ac7f5
[ticket/12120] Remove EXreaction from active authors
...
PHPBB3-12120
2014-10-21 18:17:59 +02:00
Nils Adermann
b7386c0c82
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13189] Do not use confirm box for marking all notifications read
2014-10-21 09:49:42 -04:00
Nils Adermann
1358acfd7c
Merge pull request #3049 from marc1706/ticket/13189
...
[ticket/13189] Do not use confirm box for marking all notifications read
2014-10-21 09:49:16 -04:00
Marc Alexander
75c5d6085b
Merge branch 'develop-ascraeus' into develop
2014-10-20 22:44:47 -05:00
Marc Alexander
99eeb52b76
Merge pull request #3050 from prototech/ticket/13070
...
[ticket/13070] Adjust template hook name to match that provided in the class.
2014-10-20 22:44:33 -05:00
Cesar G
b9b15b7007
[ticket/13070] Adjust template hook name to match that provided in the class.
...
PHPBB3-13070
2014-10-20 19:59:56 -07:00
Marc Alexander
293d64e122
[ticket/13189] Do not use confirm box for marking all notifications read
...
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.
PHPBB3-13189
2014-10-20 21:55:36 -05: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
b71cf56bda
Merge pull request #3047 from Elsensee/ticket/13168
...
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
* Elsensee/ticket/13168:
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:42 +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
Joas Schilling
7c2ed57a99
Merge branch 'develop-ascraeus' into develop
2014-10-20 22:19:43 +02:00
Joas Schilling
75b6545bc2
Merge pull request #3040 from nickvergessen/ticket/13138-asc
...
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id
Conflicts:
phpBB/phpbb/session.php
2014-10-20 22:19:25 +02:00
Nils Adermann
79d6f67e81
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13188] Correctly format string concatenation
[ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:31:06 -04:00
Nils Adermann
973dfbf868
Merge pull request #3048 from naderman/ticket/13188
...
[ticket/13188] Add missing where clause to post_id query in sphinx index
2014-10-20 15:30:08 -04:00
Nils Adermann
ee97b92e5d
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13138] Do not use cookie data and autologin while forcing a user_id
2014-10-20 14:53:52 -04:00
Nils Adermann
99f63f39eb
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13138] Do not use cookie data and autologin while forcing a user_id
Conflicts:
phpBB/phpbb/session.php
2014-10-20 14:53:38 -04:00
Nils Adermann
d4faeb064b
Merge pull request #3039 from nickvergessen/ticket/13138
...
[ticket/13138] Only use cookie data when we do not force a user_id
2014-10-20 14:49:29 -04:00
Nils Adermann
941cf6979e
[ticket/13188] Correctly format string concatenation
...
PHPBB3-13188
2014-10-20 12:20:44 -04:00
Nils Adermann
566c8a1bbc
[ticket/13188] Add missing where clause to post_id query in sphinx index
...
PHPBB3-13188
2014-10-20 12:08:35 -04: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
Joas Schilling
ac29211f91
Merge branch 'develop-ascraeus' into develop
2014-10-20 16:28:59 +02:00
Joas Schilling
57a575b5f0
Merge pull request #3046 from Elsensee/ticket/13187
...
[ticket/13187] Fix HTML validity of INSTALL.html
2014-10-20 16:28:44 +02:00
Oliver Schramm
51044167d1
[ticket/13187] Fix HTML validity of INSTALL.html
...
PHPBB3-13187
2014-10-20 15:36:27 +02:00
Joas Schilling
9c6b3d3931
Merge branch 'develop-ascraeus' into develop
2014-10-20 15:21:11 +02:00
Joas Schilling
009d59335f
Merge pull request #2960 from prototech/ticket/12568
...
[ticket/12568] Update user docs
2014-10-20 15:21:00 +02:00
Joas Schilling
c08563b6a8
Merge branch 'develop-ascraeus' into develop
2014-10-20 14:24:15 +02:00
Joas Schilling
ec5729a99f
Merge pull request #3045 from Elsensee/ticket/13186
...
[ticket/13186] Don't show link on post count when search disabled
2014-10-20 14:23:46 +02:00
Oliver Schramm
86c472f4f7
[ticket/13186] Don't show link on post count when search disabled
...
PHPBB3-13186
2014-10-20 13:25:07 +02:00
