Commit graph

25617 commits

Author SHA1 Message Date
Marc Alexander
040fc6dd0f [ticket/13332] Pass user row to passwords manager check method
PHPBB3-13332
2014-11-11 19:02:01 +01:00
omniError
65f83b814c [ticket/13326] fix CS
https://tracker.phpbb.com/browse/PHPBB3-13326

PHPBB3-13326
2014-11-11 10:51:03 -06:00
omniError
b648d3eb4c [ticket/13328] fix CS
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
2014-11-11 10:47:39 -06:00
Tristan Darricau
9b4c284102 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
2014-11-11 15:30:15 +01:00
Tristan Darricau
cd6085ebdc Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
2014-11-11 15:29:58 +01:00
Tristan Darricau
6949f64d28 Merge pull request #3133 from bantu/ticket/13324
[ticket/13324] Update sami/sami and fabpot/goutte for new zipball location

* bantu/ticket/13324:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
2014-11-11 15:27:53 +01:00
Andreas Fischer
d266c7ae26 [develop] Update / Fix composer.lock hash. 2014-11-11 13:59:16 +01:00
Tristan Darricau
16de388437 Merge pull request #1880 from nicolas-grekas/develop
[3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback

* nicolas-grekas/develop:
  [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback
  [feature/patchwork-utf8] Remove utf8_str_replace
  [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
2014-11-11 13:07:54 +01:00
Andreas Fischer
9bd24e2efb [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
PHPBB3-13324
2014-11-11 12:23:02 +01:00
Tristan Darricau
4535740aa2 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13083] Fix language string NO_ENTRIES for logs
2014-11-11 11:57:12 +01:00
Tristan Darricau
4dfd4e4cd3 Merge pull request #3112 from Elsensee/ticket/13083
[ticket/13083] Fix language string NO_ENTRIES for logs

* Elsensee/ticket/13083:
  [ticket/13083] Fix language string NO_ENTRIES for logs
2014-11-11 11:56:23 +01:00
omniError
71e0de5588 [ticket/13328] add core.mcp_view_forum_modify_sql
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
2014-11-10 22:57:54 -06:00
omniError
42b595e7e7 [ticket/13326] add viewtopic_url to event
https://tracker.phpbb.com/browse/PHPBB3-13326

PHPBB3-13326
2014-11-10 20:35:23 -06:00
omniError
a143a19b8b [ticket/13306] add error level to collector
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
2014-11-10 18:05:18 -06:00
omniError
2d0917c56e [ticket/13323] empty auth option in posting.php
https://tracker.phpbb.com/browse/PHPBB3-13323

PHPBB3-13323
2014-11-10 17:23:23 -06:00
Matt Friedman
971b30a76d [ticket/13290] Add EVENT index_body_forumlist_body_after
PHPBB3-13290
2014-11-10 13:56:52 -08:00
lavigor
8171087cfb [ticket/13318] login_username needs to have the multibyte parameter set to true
This is needed for usernames with UTF-8 characters.

PHPBB3-13318
2014-11-10 20:12:10 +03:00
Marc Alexander
9bb302b92c [ticket/security-169] Stop loop through referer dir in top directory
SECURITY-169
2014-11-09 23:00:39 +01:00
Marc Alexander
697ae43b2e Merge branch 'develop-ascraeus' into develop 2014-11-09 20:01:42 +01:00
Marc Alexander
6a4cb42565 Merge pull request #3113 from prototech/ticket/13251
[ticket/13251] Escape container parameters defined from config.php.
2014-11-09 20:01:20 +01:00
Oliver Schramm
b6f0c789d5 [ticket/13310] Add event core.acp_email_modify_sql
PHPBB3-13310
2014-11-09 15:34:54 +01:00
rxu
483af1d036 [ticket/13297] Add unicode modifier to url/email regular expression patterns.
PHPBB3-13297
2014-11-09 20:59:14 +07:00
Joas Schilling
e29eece45f Merge branch 'develop-ascraeus' into develop 2014-11-09 14:50:15 +01:00
Joas Schilling
7ab774bc8d Merge pull request #3121 from Elsensee/ticket/13300
[ticket/13300] Don't show jabber in profile if jabber is disabled
2014-11-09 14:50:06 +01:00
Marc Alexander
f23634d580 [ticket/13197] Fix tabbing
PHPBB3-13197
2014-11-09 13:43:26 +01:00
Marc Alexander
8dd32c2bb5 [ticket/13197] Correctly format sql query
PHPBB3-13197
2014-11-09 13:07:38 +01:00
Marc Alexander
e603451b2f Merge branch 'develop-ascraeus' into develop 2014-11-09 10:43:02 +01:00
Marc Alexander
10b628a20a Merge pull request #3120 from Elsensee/ticket/13301
[ticket/13301] Fix called function in apche auth module
2014-11-09 10:42:30 +01:00
Marc Alexander
b8636ab961 Merge branch 'develop-ascraeus' into develop 2014-11-09 10:39:17 +01:00
Marc Alexander
8e64652d80 Merge pull request #3119 from Elsensee/ticket/13243
[ticket/13243] Validate announcement entry for existence in version_helper
2014-11-09 10:38:48 +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
Oliver Schramm
98711450dd [ticket/13309] Add event acp_email_options_after
PHPBB3-13309
2014-11-09 02:31:20 +01:00
Oliver Schramm
ced316d88c [ticket/13300] Don't show jabber in profile if jabber is disabled
PHPBB3-13300
2014-11-09 02:22:39 +01:00
Oliver Schramm
c4628bd92a [ticket/13301] Fix called function in apche auth module
PHPBB3-13301
2014-11-09 01:37:28 +01:00
Oliver Schramm
3fba5e317a [ticket/13243] Validate announcement entry for existence in version_helper
PHPBB3-13243
2014-11-09 01:21:40 +01:00
Joas Schilling
5b7178badf Merge branch 'develop-ascraeus' into develop 2014-11-09 00:39:36 +01:00
Joas Schilling
101945acf9 Merge pull request #3110 from Elsensee/ticket/13242
[ticket/13242] Fix HTML validity
2014-11-09 00:39:19 +01:00
Cesar G
c136b4e5fa Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13265] Don't show link to edit own profile to those without permission
2014-11-08 13:53:45 -08:00
Cesar G
92c509bc48 Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus
* Elsensee/ticket/13265:
  [ticket/13265] Don't show link to edit own profile to those without permission
2014-11-08 13:53:11 -08:00
rxu
70641e701a [ticket/13220] Add template events to memberlist_search.html
PHPBB3-13220
2014-11-08 21:22:59 +07:00
Nicolas Grekas
d1a879a56c [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback 2014-11-08 11:41:58 +01:00
Nicolas Grekas
a2300eb3aa [feature/patchwork-utf8] Remove utf8_str_replace 2014-11-08 11:41:55 +01:00
Nicolas Grekas
5a7caf6508 [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback 2014-11-08 11:36:13 +01:00
Tristan Darricau
9aa8f44489 [ticket/13133] Rename $ok variable
PHPBB3-13133
2014-11-07 15:57:31 +01:00
Tristan Darricau
1601b61ef9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
2014-11-07 15:21:01 +01:00
Tristan Darricau
778e0e06f3 Merge pull request #3118 from prototech/ticket/13270
[ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.

* prototech/ticket/13270:
  [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
2014-11-07 15:19:35 +01:00
Tristan Darricau
b5ddd87c42 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13303] Speed up migration dependency calculation.
2014-11-07 11:40:40 +01:00
Tristan Darricau
8956ec0bd4 Merge pull request #3117 from prototech/ticket/13303
[ticket/13303] Speed up migration dependency calculation.

* prototech/ticket/13303:
  [ticket/13303] Speed up migration dependency calculation.
2014-11-07 11:38:40 +01:00
Cesar G
757e1eac7a [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
PHPBB3-13270
2014-11-07 02:31:11 -08:00
Cesar G
95140bb724 [ticket/13303] Speed up migration dependency calculation.
PHPBB3-13303
2014-11-07 02:30:44 -08:00