aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch '3.1.x'Marc Alexander2015-07-221-2/+74
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_profile.php
| * | | | Merge pull request #3719 from javiexin/ticket/13911Marc Alexander2015-07-221-2/+74
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13911] Add events to configure options for profile fields
| | * | | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number again. PHPBB3-13911
| | * | | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fixed version number and event name. PHPBB3-13911
| | * | | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-021-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. Fix bamboo formatting errors. PHPBB3-13911
| | * | | | [ticket/13911] Add events to configure options for profile fieldsjaviexin2015-06-021-2/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds core events to includes/acp/acp_profile.php and template events to adm/style/acp_profile.html to support adding configuration options to profile fields. PHPBB3-13911
* | | | | | Merge branch '3.1.x'Marc Alexander2015-07-221-1/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13311] Remove whitespace at end of lineMarc Alexander2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13311
| * | | | | [ticket/13311] Update @since to 3.1.6-RC1Marc Alexander2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13311
| * | | | | [ticket/13311] Add core event on acp_forums for forum content deletesalf0072015-07-221-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Event added for the function delete_forum_content() in includes/acp/acp_forums.php, so that you can insert any extension's table(s) to be updated when forum content is deleted Incude parameters forum_id, topic_ids and post_counts PHPBB3-13311
| * | | | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-111-5/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-093-6/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
* | | | | | | | [ticket/11444] Moving the in-board notifications to a method classNicofuma2015-07-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the in-board method for the notifications is hardcoded and cannot be disabled. This method should be in his own class extending `phpbb\notification\method\method_interface`. It also add the possibility, for each method, to be enabled by default (ie: no entry in the DB => notification enabled). https://tracker.phpbb.com/browse/PHPBB3-11444 https://tracker.phpbb.com/browse/PHPBB3-11967 PHPBB3-11444
* | | | | | | | Merge pull request #3618 from marc1706/ticket/13832Tristan Darricau2015-06-241-5/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13832] Use preg_replace_callback instead of /e modifier
| * | | | | | | | [ticket/13832] Use preg_replace_callback in acp_bbcodesMarc Alexander2015-05-191-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
| * | | | | | | | [ticket/13832] Use preg_replace_callback instead of /e modifierMarc Alexander2015-05-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13832
* | | | | | | | | Merge pull request #3661 from marc1706/ticket/6466Tristan Darricau2015-06-171-18/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
| * | | | | | | | | [ticket/6466] Support form reset and do not loose role upon resubmitMarc Alexander2015-05-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | | | | | | [ticket/6466] Remove remnants of old codeMarc Alexander2015-05-291-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466
| * | | | | | | | | [ticket/6466] Use jQuery and custom dropdown for permission roles tooltipsMarc Alexander2015-05-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-6466
* | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-06-111-5/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | | | | | | [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13823
* | | | | | | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-091-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * \ \ \ \ \ \ \ \ Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-081-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * | | | | | | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-083-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13930
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-092-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | | | | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-092-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| | * | | | | | | [ticket/13685] This should take care of the restbrunoais2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-072-3/+3
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | | | Merge branch '3.1.x'Tristan Darricau2015-06-071-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [ticket/13823] Remove the unnecessary bracketsJoas Schilling2015-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the line with non-whitespace changes, so the packaging script should correctly detect them as changed and put the file into the update. PHPBB3-13823
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-072-3/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_board.php phpBB/includes/acp/acp_jabber.php
| * | | | | | | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-041-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
| * | | | | | | [ticket/sec-184] Do not output Jabber password to HTMLJoas Schilling2015-06-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
| * | | | | | | [ticket/sec-184] Do not output config passwords to the HTML pageJoas Schilling2015-06-041-1/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | SECURITY-184
* | | | | | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | | [ticket/13777] Move module management into serviceMateBartus2015-05-311-529/+88
| |/ / / / / |/| | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | Merge pull request #3613 from nickvergessen/ticket/13844Tristan Darricau2015-05-292-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ticket/13844 Better FAQ language files
| * | | | | | [ticket/13844] FAQ in new controller formatJoas Schilling2015-05-162-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-13844
* | | | | | Merge pull request #3597 from s9e/ticket/13614Nicofuma2015-05-191-5/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()
| * | | | | [ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()JoshyPHP2015-05-111-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all calls to phpbb_pcre_utf8_support() as well as unreachable code. PHPBB3-13614
* | | | | | Merge branch '3.1.x'Joas Schilling2015-05-161-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | [ticket/13838] Fix coding styleNicofuma2015-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-13838
| * | | | [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-051-0/+1
| | |_|/ | |/| | | | | | | | | | PHPBB3-13819
* | | | [ticket/13762] Moving language related functionality into a separate classMateBartus2015-05-022-32/+14
| | | | | | | | | | | | | | | | PHPBB3-13762
* | | | [ticket/13793] Remove translation on throwing exceptionsMateBartus2015-05-011-5/+9
| | | | | | | | | | | | | | | | PHPBB3-13793
* | | | Merge pull request #3487 from MateBartus/ticket/13697Tristan Darricau2015-04-162-5/+17
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13697] Moving filesystem related functions to filesystem service
| * | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-162-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | Merge pull request #3461 from s9e/ticket/11768Tristan Darricau2015-04-055-4/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [3.2][ticket/11768] Integrate s9e\TextFormatter
| * | | | | [ticket/11768] Updated annotation [ci skip]JoshyPHP2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11768