makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
25447 commits 18 branches 192 tags 206 MiB
Commit graph

1970 commits

Author SHA1 Message Date
Nicofuma
a3f7e0f441 Merge branch '3.1.x' 2015-03-29 19:50:58 +02:00
Nicofuma
d9f4964d91 Merge pull request #3376 from marc1706/ticket/13568-asc 
[ticket/13568] Validate imagick path as readable absolute path

closes #3376
 2015-03-29 19:50:19 +02:00
Nicofuma
9e66a10bac Merge branch '3.1.x' 2015-03-24 23:57:26 +01:00
Nicofuma
50b3c2b49e Merge pull request #3398 from marc1706/ticket/13612 
[ticket/13612] Run meta refresh until extension is fully enabled
 2015-03-24 23:32:29 +01:00
Cesar G
8a6e3f208a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13719] Remove superfluous $search_options in acp_search.
 2015-03-23 09:43:43 -07:00
brunoais
754b5d6349 [ticket/13719] Remove superfluous $search_options in acp_search. 
PHPBB3-13719
 2015-03-23 12:58:05 +00:00
Marc Alexander
5e7560845b Merge branch '3.1.x' 2015-03-06 14:36:22 +01:00
Marc Alexander
d7f4715b96 Merge pull request #3473 from RMcGirr83/ticket/13675 
[ticket/13675] Add validate to acp_profile event and add template events
 2015-03-06 14:36:20 +01:00
Richard McGirr
6b87e06292 [ticket/13675] Add validate to acp_profile event and add template events 
for acp users profile

PHPBB3-13675
 2015-03-06 07:26:35 -05:00
Marc Alexander
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
Joas Schilling
17b00812a7 Merge branch '3.1.x' 2015-02-24 20:44:37 +01:00
RMcGirr83
80e1c233d9 [ticket/13587] SQL syntax errors in get_prune_users() 
PHPBB3-13587
 2015-02-24 13:28:47 -05:00
Joas Schilling
19a236205f [ticket/13647] Generate route links for faq 
PHPBB3-13647
 2015-02-22 22:44:50 +01:00
Joas Schilling
1e3175cca3 [ticket/10748] Fix class type hinting 
PHPBB3-10748
 2015-02-15 17:01:20 +01:00
Marc Alexander
27cfda74fc [ticket/13612] Always display success message if extension was enabled 
An error will already be triggered if enable_step() is not successful.
Redirecting for no obvious reason will just confuse users.

PHPBB3-13612
 2015-02-14 23:41:53 +01:00
Andreas Fischer
069738a1f2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13597] Modify variable-variable syntax to be compatible with PHP7
 2015-02-11 16:53:25 +01: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
Joas Schilling
37ae99c75d [ticket/10748] Replace direct creations of tools(); 
PHPBB3-10748
 2015-02-07 14:41:39 +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
Gaëtan Muller
52446c8327 [ticket/13455] Remove request_var() references from comments 
PHPBB3-13455
 2015-02-03 20:56:48 +01:00
Gaëtan Muller
abcb2680ee [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var() 
PHPBB3-13455
 2015-02-03 20:50:40 +01:00
Andreas Fischer
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
Joas Schilling
917a5ce0df Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2015-02-02 23:23:26 +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
f31d12ddf2 Merge branch 'develop-ascraeus' into develop 2015-02-02 23:00:48 +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
Gaëtan Muller
a633f3484c [ticket/13496] Update calls to set_config_count() 
PHPBB3-13496
 2015-02-02 21:52:59 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config() 
PHPBB3-13494
 2015-02-02 19:28:23 +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
19421fcdef [ticket/13568] Validate imagick path as readable absolute path 
PHPBB3-13568
 2015-02-02 15:59:52 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log() 
PHPBB3-13468
 2015-01-27 18:34:33 +01:00
rxu
be1b114114 [ticket/13536] Add core events to allow modifying user profile data on editing 
Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744

PHPBB3-13536
 2015-01-23 00:35:02 +07:00
Andreas Fischer
d17904884e Merge pull request #3312 from bantu/ticket/13527 
[ticket/13527] Escape information received from version server

* bantu/ticket/13527:
  [ticket/13527] Apply htmlspecialchars() to data from version server.
  [ticket/13527] Remove two unused variables.
 2015-01-20 23:14:38 +01:00
Andreas Fischer
5069da8d52 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13519] Correctly validate imagick path as path and not string
 2015-01-20 23:11:40 +01:00
Andreas Fischer
4d0b04a397 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13519] Correctly validate imagick path as path and not string

Conflicts:
	phpBB/includes/acp/acp_attachments.php
 2015-01-20 23:11:29 +01:00
Andreas Fischer
92b5222295 [ticket/13527] Apply htmlspecialchars() to data from version server. 
PHPBB3-13527
 2015-01-20 22:40:39 +01:00
Andreas Fischer
251868dd7e [ticket/13527] Remove two unused variables. 
PHPBB3-13527
 2015-01-20 22:34:14 +01:00
Joas Schilling
358ca14ade Merge branch 'develop-ascraeus' into develop 2015-01-20 20:58:21 +01:00
Joas Schilling
40006376f2 Merge pull request #3226 from prototech/ticket/13420 
[ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
 2015-01-20 20:58:12 +01:00
Joas Schilling
2dcce57806 Merge branch 'develop-ascraeus' into develop 2015-01-20 17:31:24 +01:00
rxu
8002af7526 [ticket/13492] Add the migration to update custom bbcodes with IDN regexps 
Also fix the $utf8 checking regexp removing the curly braces.

PHPBB3-13492
 2015-01-20 08:47:56 +07:00
Marc Alexander
6564446b0f [ticket/13519] Correctly validate imagick path as path and not string 
PHPBB3-13519
 2015-01-19 20:47:47 +01:00
Tristan Darricau
0344e61b8c Merge pull request #3237 from MGaetan89/ticket/12487 
[ticket/12487] Update PHP code

* MGaetan89/ticket/12487:
  [ticket/12487] Update PHP code
 2015-01-16 10:05:23 +01:00
Oliver Schramm
c6557e3800 [ticket/13313] Update version in @since tag of event 
PHPBB3-13313
 2015-01-15 22:08:10 +01:00
Gaëtan Muller
b5544b2f47 [ticket/13450] Type-hint return value of $phpbb_container->get() 
PHPBB3-13450
 2015-01-12 20:19:07 +01:00
Oliver Schramm
3bfd87cda4 [ticket/13313] Add event core.acp_email_display 
PHPBB3-13313
 2015-01-11 20:55:00 +01:00
rxu
17f4dce0fc [ticket/13492] Add IDN support for custom BBCode URL tokens 
Custom BBCode URL tokens does not support IDN.
Custom BBCodes added earlier than IDN has been applied are unaffected.

PHPBB3-13492
 2015-01-11 20:36:22 +07:00
Gaëtan Muller
63da128ee5 [ticket/12487] Update PHP code 
PHPBB3-12487
 2015-01-11 13:22:59 +01:00
Joas Schilling
ff44579523 Merge branch 'develop-ascraeus' into develop 2015-01-09 17:41:47 +01:00