makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 19:28:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
25809 commits 18 branches 192 tags 207 MiB
Commit graph

22142 commits

Author SHA1 Message Date
Marc Alexander
171837eefe [ticket/13358] Do not pass variables by reference 
PHPBB3-13358
 2014-11-21 23:16:22 +01:00
Joas Schilling
0017fad554 Merge pull request #3108 from Elsensee/ticket/13284 
[ticket/13284] Message body not included in email
 2014-11-21 23:10:00 +01:00
Joas Schilling
c98cceaf22 Merge pull request #3068 from marc1706/ticket/13204 
[ticket/13204] Tell user that password was incorrect when exceeding attempts
 2014-11-21 22:52:24 +01:00
Joas Schilling
dd7e09d092 Merge pull request #3064 from marc1706/ticket/13197 
[ticket/13197] Also delete group avatar from users that have it set
 2014-11-21 22:41:17 +01:00
Marc Alexander
4ee05b1c17 [ticket/security-171] Add tests for retrieved remote data in version_helper 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Marc Alexander
34004612ac [ticket/security-171] Sanitize data from composer.json 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Marc Alexander
da1888a7fa [ticket/security-171] Use type cast helper for json data 
SECURITY-171
 2014-11-21 22:32:28 +01:00
Cesar G
8d8c2930d2 [ticket/13354] Fix incorrect column name when deleting all topic logs. 
PHPBB3-13354
 2014-11-21 12:48:26 -08:00
Marc Alexander
352648f173 [ticket/13358] Fix tests and use exceptions instead of user object 
PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Marc Alexander
f6e7a94bd5 [ticket/13358] Use file_downloader in get_remote_file() 
get_remote_file() has been marked as deprecated.

PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Marc Alexander
2793f9c078 [ticket/13358] Add file_downloader to version_helper 
PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Marc Alexander
a080173010 [ticket/13358] Add file_downloader as replacement for get_remote_file 
PHPBB3-13358
 2014-11-21 21:37:43 +01:00
Cesar G
f3373e1e32 [ticket/13316] Ensure Recaptcha image uses https when necessary. 
PHPBB3-13316
 2014-11-21 12:17:04 -08:00
Joas Schilling
f719803fdc Merge pull request #3144 from marc1706/ticket/13337 
[ticket/13337] Do not use SQL IN comparison with empty array
 2014-11-21 21:04:11 +01:00
Joas Schilling
d56da0d68f Merge pull request #3044 from Elsensee/ticket/13100 
[ticket/13100] Display only confirmation buttons when deleting shadow topic
 2014-11-21 20:59:22 +01:00
Joas Schilling
1689191f29 Merge pull request #3023 from Nicofuma/ticket/13133 
[ticket/13133] Allow @vendor_name for includecss
 2014-11-21 20:36:41 +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
Joas Schilling
707a85b6c1 Merge pull request #3043 from rxu/ticket/13182 
[ticket/13182] Add posting.php core event to allow modifying the message text
 2014-11-21 20:14:36 +01:00
Joas Schilling
71a015557f Merge pull request #3150 from omniError/ticket/13347 
[ticket/13347] missing acp_forums template events

Conflicts:
	phpBB/docs/events.md
 2014-11-21 20:09:13 +01:00
Joas Schilling
bc52a84998 Merge pull request #3131 from omniError/ticket/13328 
[ticket/13328] add core.mcp_view_forum_modify_sql
 2014-11-21 20:05:19 +01:00
Joas Schilling
d6e8cce44b Merge pull request #3130 from omniError/ticket/13326 
[ticket/13326] add viewtopic_url to event
 2014-11-21 19:58:43 +01:00
Joas Schilling
2d6734cb0a Merge pull request #3126 from VSEphpbb/ticket/13290 
[ticket/13290] Add EVENT index_body_forumlist_body_after
 2014-11-21 19:53:15 +01:00
Joas Schilling
7bc1917908 Merge pull request #3122 from Elsensee/ticket/13309 
[ticket/13309] Add event acp_email_options_after
 2014-11-21 19:42:14 +01:00
rxu
bb75cd40f5 [ticket/13182] Add posting.php core event to allow modifying the message text 
posting.php core event to allow modifying the message before parsing
would be needed for some extensions, like for adding topic title to the
topic URL etc.
Also removed 'delete' var from core.posting_modify_template_vars and
core.modify_posting_parameters as it does not exist.

PHPBB3-13182
 2014-11-22 01:33:12 +07:00
Joas Schilling
4bf3dcbebd Merge pull request #3114 from rxu/ticket/13294 
[ticket/13294] Add function parse() core event for additional message checks
 2014-11-21 19:28:07 +01:00
Joas Schilling
c31b53942d Merge pull request #3071 from rxu/ticket/13220 
[ticket/13220] Add template events to memberlist_search.html
 2014-11-21 19:23:10 +01:00
rxu
1e867ce52b [ticket/13294] Add function parse() core event for additional message checks 
Add core event to the function parse() in includes/message_parser.php to allow
additional handling message before parsing (i.e. perform custom message
checks, cleanup etc.).

PHPBB3-13294
 2014-11-20 00:47:51 +07:00
Tristan Darricau
acfe6dd37d Merge pull request #3149 from prototech/ticket/13342 
[ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha

* prototech/ticket/13342:
  [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha.
 2014-11-18 16:28:59 +01:00
Tristan Darricau
0019039bc1 Merge pull request #3148 from prototech/ticket/13315 
[ticket/13315] Fix loss of CAPTCHA plugin config value.

* prototech/ticket/13315:
  [ticket/13315] Check for the includes/captcha/plugins/ directory instead.
  [ticket/13315] Fix loss of CAPTCHA plugin config value.
 2014-11-18 15:11:07 +01:00
Marc Alexander
ba3e4da853 Merge pull request #3154 from cyberalien/ticket/13349 
[ticket/13349] Fix breadcrumb arrow entity
 2014-11-18 15:00:45 +01:00
cyberalien
795fd75d60 [ticket/13349] Fix breadcrumb arrow entity 
PHPBB3-13349
 2014-11-18 14:13:07 +02:00
Marc Alexander
b84d151afa Merge pull request #3151 from nickvergessen/ticket/13298 
[ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php
 2014-11-18 13:11:55 +01:00
Marc Alexander
17d76de7b8 Merge pull request #3152 from prototech/ticket/13277 
[ticket/13277] Force IE to not cache AJAX requests.
 2014-11-18 13:08:58 +01:00
Cesar G
052fdcc8d9 Merge remote-tracking branch 'Nicofuma/ticket/13023' into develop-ascraeus 
* Nicofuma/ticket/13023:
  [ticket/13023] Add template event posting_editor_buttons_custom_tags_before
 2014-11-18 01:30:06 -08:00
Cesar G
266755bd82 [ticket/13277] Force IE to not cache AJAX requests. 
Caching causes problems, such as the inability to move a forum/CPF/module in the
same direction by more than one row.

PHPBB3-13277
 2014-11-18 00:41:57 -08:00
Cesar G
7c68964153 [ticket/13315] Check for the includes/captcha/plugins/ directory instead. 
PHPBB3-13315
 2014-11-18 00:37:07 -08:00
Joas Schilling
31c59cad83 [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php 
PHPBB3-13298
 2014-11-17 23:56:33 +01:00
omniError
c1a0d1bf3d [ticket/13347] update event docs 
PHPBB3-13347
 2014-11-17 16:25:56 -06:00
omniError
115bf63538 [ticket/13347] fix CS 
PHPBB3-13347
 2014-11-17 16:14:57 -06:00
omniError
bd0107a2ab [ticket/13347] missing acp_forums template events 
PHPBB3-13347
 2014-11-17 16:09:40 -06:00
Cesar G
7b33018ade [ticket/13315] Fix loss of CAPTCHA plugin config value. 
The plugins were moved to phpbb/captcha/plugins/ after this migration was
created, thus the check is no longer valid and ends up resetting the value
prematurely.

PHPBB3-13315
 2014-11-16 17:01:38 -08:00
Cesar G
fb34cbf7cd [ticket/13342] Fix invalid resetting of CAPTCHA plugin when using Recaptcha. 
The Recaptcha plugin class name does not follow the phpbb_captcha_ prefix
convention as all others. Instead it simply uses phpbb_, hence the check
for its existence under phpbb/captcha/plugins/ fails.

PHPBB3-13342
 2014-11-16 17:01:03 -08:00
Nils Adermann
4ffdb12938 Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascraeus 
* github-nicofuma/ticket/13280:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:15 +01:00
Tristan Darricau
0dfe1d0d8b [ticket/13280] Output escaping for the symfony request object 
PHPBB3-13280
 2014-11-16 16:45:19 +01:00
Tristan Darricau
e27b69f42a Merge pull request #3136 from marc1706/ticket/13332 
[ticket/13332] Pass user row to passwords manager check method

* marc1706/ticket/13332:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
 2014-11-16 12:22:51 +01:00
Tristan Darricau
074b91497b [ticket/13023] Add template event posting_editor_buttons_custom_tags_before 
PHPBB3-13023
 2014-11-16 11:52:30 +01:00
Marc Alexander
556565d072 [ticket/13337] Allow empty array passed to sql_in_set() 
is_array() will evaluate to true even if the array is just an empty array.
Make sure we also expect an empty array passed to sql_in_set().

PHPBB3-13337
 2014-11-14 11:08:35 +01:00
omniError
0a4ffb7cf8 [ticket/13306] move error_reporting call 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-13 20:55:10 -06:00
Marc Alexander
9f9ce10f2f Merge pull request #3125 from lavigor/ticket/13318 
[ticket/13318] login_username needs to have the multibyte parameter set to true
 2014-11-13 01:02:49 +01:00
Marc Alexander
2f54ab0a24 Merge pull request #3137 from prototech/ticket/13209 
[ticket/13209] Fix loss of CPF language field values when switching steps
 2014-11-13 00:14:54 +01:00