Marc Alexander
77bc8ee68b
Merge branch '3.1.x'
...
Conflicts:
phpBB/includes/acp/acp_board.php
phpBB/includes/acp/acp_jabber.php
2015-06-07 14:59:33 +02:00
Joas Schilling
78b0c938a2
[ticket/sec-184] Do not output LDAP password to HTML
...
SECURITY-184
2015-06-04 14:29:03 +02:00
Joas Schilling
9c84b3b5fb
[ticket/sec-184] Do not output Jabber password to HTML
...
SECURITY-184
2015-06-04 14:13:07 +02:00
Joas Schilling
6ca3a30576
[ticket/sec-184] Do not output config passwords to the HTML page
...
SECURITY-184
2015-06-04 14:06:35 +02:00
MateBartus
4044b5df89
[ticket/13777] Reorder get_module_infos() method's arguments
...
PHPBB3-13777
2015-05-31 16:03:11 +02:00
MateBartus
71d03647f0
[ticket/13777] Move module management into service
...
PHPBB3-13777
2015-05-31 13:22:44 +02:00
Tristan Darricau
a3d46575c7
Merge pull request #3613 from nickvergessen/ticket/13844
...
Ticket/13844 Better FAQ language files
2015-05-29 15:44:39 +02:00
Nicofuma
9ccc7f4d65
Merge pull request #3597 from s9e/ticket/13614
...
[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
2015-05-19 23:53:27 +02:00
Joas Schilling
07231e7943
[ticket/13844] FAQ in new controller format
...
PHPBB3-13844
2015-05-16 22:09:05 +02:00
Joas Schilling
3b91b243b0
Merge branch '3.1.x'
2015-05-16 13:40:07 +02:00
Nicofuma
62e13e945c
[ticket/13838] Fix coding style
...
PHPBB3-13838
2015-05-14 15:43:44 +02:00
JoshyPHP
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
Marc Alexander
de90dd25b2
[ticket/13819] Add missing sql_freeresult() to files in includes/
...
PHPBB3-13819
2015-05-05 23:55:13 +02:00
MateBartus
179a470022
[ticket/13762] Moving language related functionality into a separate class
...
PHPBB3-13762
2015-05-02 13:37:12 +02:00
MateBartus
57072a1e28
[ticket/13793] Remove translation on throwing exceptions
...
PHPBB3-13793
2015-05-01 12:40:53 +02:00
Tristan Darricau
f077b72d0d
Merge pull request #3487 from MateBartus/ticket/13697
...
[ticket/13697] Moving filesystem related functions to filesystem service
2015-04-16 20:44:02 +02:00
MateBartus
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
Tristan Darricau
3a6a61a8dd
Merge pull request #3461 from s9e/ticket/11768
...
[3.2][ticket/11768] Integrate s9e\TextFormatter
2015-04-05 23:32:38 +02:00
Tristan Darricau
30cf75a011
Merge pull request #3430 from MateBartus/ticket/12466
...
[ticket/12466] Move classes from acp_database.php to their own files
2015-04-05 20:13:38 +02:00
JoshyPHP
718ace2121
[ticket/11768] Updated annotation [ci skip]
...
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
ec77ff7838
[ticket/11768] Invalidate the text_formatter cache whenever a style is installed
...
The acp_styles module purges the cache every time a style is uninstalled,
modified or made default, but it does not purge the cache when a new style
is installed. Here we invalidate the text_formatter cache (not purge the
whole cache) so that new styles take effect immediately.
PHPBB3-11768
2015-04-02 19:16:03 +02:00
JoshyPHP
cfbf02bcba
[ticket/11768] Re-added the code that got lost in rebase
...
PHPBB3-11768
2015-04-02 19:16:01 +02:00
s9e
147a713cc0
[ticket/11768] This commit integrates s9e\TextFormatter
...
This commit integrates s9e\TextFormatter as outlined in
http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=44467
PHPBB3-11768
2015-04-02 19:16:01 +02:00
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
MateBartus
193c5b86b4
[ticket/12466] Move classes from acp_database.php to their own files
...
* Moving classes from acp_database.php to phpbb/db/extractor namespace,
also into separate files
* Adding DocBlocks and property visibility to classes
* Removing globals from code
* Passing former globals to base_extractor's constructor
* Adding DB extractor as a service, also implementing the extractor interface
as well as the extractor factory.
PHPBB3-12466
2015-02-27 16:18:50 +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