aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-071-0/+3
| | | | | | Fix consecutive asterisks issue in word censor. PHPBB3-9933
* [ticket/9850] Display upgrade instructions for feature release in acpIgor Wiedler2010-11-021-0/+10
| | | | PHPBB3-9850
* Merge branch 'ticket/naderman/9686' into develop-olympusAndreas Fischer2010-10-251-23/+31
|\ | | | | | | | | * ticket/naderman/9686: [ticket/9686] Fix mssqlnative database data export
| * [ticket/9686] Fix mssqlnative database data exportNils Adermann2010-10-251-23/+31
| | | | | | | | | | | | | | | | | | We require version 1.1 of the sqlsrv extension anyway so the regular sqlsrv_num_rows can be used instead of buffering the result. The result buffer (class result_mssqlnative) should never automatically free the resource it receives - we consistently close resources using sql_freeresult(). PHPBB3-9686
* | [ticket/9478] Validate maximum number of allowed recipients per PM value.rxu2010-10-251-0/+9
|/ | | | | | Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8). PHPBB3-9478
* [ticket/9613] Slightly update language strings.Andreas Fischer2010-08-291-1/+1
| | | | PHPBB3-9613
* [ticket/9613] Implement a load switch for unread posts search feature.rxu2010-08-291-0/+1
| | | | | | | | Since unread posts search can produce a high server load in certain circumstances, we implement a switch for ACP "Load settings" to have an option to disable this type of search. PHPBB3-9613
* Merge branch 'ticket/nickvergessen/7296' into develop-olympusAndreas Fischer2010-08-281-5/+0
|\ | | | | | | | | * ticket/nickvergessen/7296: [ticket/7296] Exporting styles to tar creates corrupted archives.
| * [ticket/7296] Exporting styles to tar creates corrupted archives.Joas Schilling2010-08-221-5/+0
| | | | | | | | | | | | | | Add the folders to the archive before putting the files inside, seems to break the tar-archives. PHPBB3-7296
* | Merge branch 'ticket/nickvergessen/9519' into develop-olympusAndreas Fischer2010-08-284-9/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9519: [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable(). [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().
| * | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-104-9/+9
| | | | | | | | | | | | | | | | | | | | | acm_memory.php is untested. install/install_convert.php and includes/functions_convert.php are going to be tested and committed afterwards. PHPBB3-9519
* | | Merge branch 'ticket/jellydoughnut/9646' into develop-olympusAndreas Fischer2010-08-221-2/+10
|\ \ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9646: [ticket/9646] Honor CSS comments in @import statements
| * | | [ticket/9646] Honor CSS comments in @import statementsJosh Woody2010-08-201-2/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add a basic CSS comment parser that allows comments to prevent loading an @import statement. For simplicity, only whitespace is allowed between /* and the @import. Also adjust regex to not parse improper quotation marks. PHPBB3-9646 PHPBB3-8169
* | | Merge branch 'ticket/bantu/9167' into develop-olympusJosh Woody2010-08-191-0/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | * ticket/bantu/9167: [ticket/9167] Detect and remove any dead left over shadow topics on update. [ticket/9167] Remove shadow topics from remaining forums when deleting a forum Conflicts: phpBB/install/database_update.php
| * | [ticket/9167] Remove shadow topics from remaining forums when deleting a forumAndreas Fischer2010-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | including posts. The function delete_topic_shadows() had to be reimplemented. It was there but it was completly broken and hasn't been used at all. PHPBB3-9167
* | | Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-191-4/+1
|\ \ \ | |_|/ |/| | | | | | | | * ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
| * | [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-171-4/+1
| | | | | | | | | | | | PHPBB3-9611
* | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-101-0/+5
|\ \ \ | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9650: [ticket/9650] Do not allow banning the anonymous user by username
| * | | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-081-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Banning anonymous can result in bad things, like not being able to log in. However, it was possible until now. PHPBB3-9650
* | | | Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| * | | | [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-061-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9570
* | | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| * | | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-071-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-281-1/+1
| | |/ / | |/| | | | | | | | | | PHPBB3-9578
* | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| * | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-011-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
|/ / / | | | | | | | | | PHPBB3-9697
* | | Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| * | | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | |/ | |/| | | | | | | PHPBB3-9655
* | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| * | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| |/ / | | | | | | | | | PHPBB3-9656
* | | [ticket/9623] Proper UTF8 encoding for usernames in pruning sectionJosh Woody2010-06-151-4/+4
|/ / | | | | | | | | | | The username textboxes were not being properly encoded in UTF8. PHPBB3-9623
* | [ticket/9094] Hide "Copy permissions" message, when permissions were copied.Joas Schilling2010-05-271-2/+4
|/ | | | | | When creating a forum, you afterwards read "Forum created successfully. Now you are able to set permissions for this forum.", also when you already copied the permissions from another forum. PHPBB3-9094
* Merge branch 'ticket/bantu/9547' into develop-olympusNils Adermann2010-05-161-2/+3
|\ | | | | | | | | * ticket/bantu/9547: [ticket/9547] Use separate constants for display/enable active topics.
| * [ticket/9547] Use separate constants for display/enable active topics.Andreas Fischer2010-05-161-2/+3
| | | | | | | | | | | | | | | | Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the forum type. PHPBB3-9547
* | Merge branch 'ticket/nickvergessen/9548' into develop-olympusNils Adermann2010-05-161-13/+20
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/9548: [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
| * | [ticket/9548] Delete user quicktool drop down should have an empty or ↵Joas Schilling2010-04-181-13/+20
| | | | | | | | | | | | | | | | | | invalid selection as the default PHPBB3-9548
* | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-2/+2
| |/ |/| | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | Merge branch 'ticket/nickvergessen/7717' into develop-olympusNils Adermann2010-05-141-1/+8
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/7717: [ticket/7717] Localise default extension groups for attachments
| * | [ticket/7717] Localise default extension groups for attachmentsJoas Schilling2010-05-141-1/+8
| |/ | | | | | | PHPBB3-7717
* | Merge branch 'ticket/bantu/9536' into develop-olympusNils Adermann2010-05-141-2/+2
|\ \ | | | | | | | | | | | | * ticket/bantu/9536: [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
| * | [ticket/9536] Small improvement for query against user/session tables when ↵Andreas Fischer2010-05-141-2/+2
| |/ | | | | | | | | | | | | | | managing users from the ACP. There can be multiple entries in the session table for one user_id. We only need and also only fetch one. Using LIMIT 1 should therefore increase performance slightly. This is especially true when editing the anonymous user account because the session table can have many entries for the user_id ANONYMOUS. PHPBB3-9536
* | Merge branch 'ticket/bantu/9526' into develop-olympusNils Adermann2010-05-141-0/+25
|\ \ | | | | | | | | | | | | * ticket/bantu/9526: [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
| * | [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to ↵Andreas Fischer2010-05-141-0/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists. In the UCP this is not necessary, because there is code in $user->setup() that updates the session table on the next page reload. Since we cannot tell if the user generally wants to be hidden or the user only wants to be hidden for one session, we only update the session table when setting the flag to 'hide me', but not 'show me' - equivalent to how it works in the UCP. If the user is a bot we however also update the session when setting the flag to 'show me' because bots cannot login at all. PHPBB3-9526
* | Merge branch 'ticket/bantu/9514' into develop-olympusNils Adermann2010-05-141-2/+5
|\ \ | | | | | | | | | | | | * ticket/bantu/9514: [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
| * | [ticket/9514] Correctly delete big datasets when deleting a forum including ↵Andreas Fischer2010-05-141-2/+5
| | | | | | | | | | | | | | | | | | topics/posts on non-MySQL databases. PHPBB3-9514
* | | Merge branch 'ticket/bantu/9176' into develop-olympusNils Adermann2010-05-141-2/+2
|\ \ \ | |/ / |/| | | | | | | | * ticket/bantu/9176: [ticket/9176] Take current board timezone settings into account when setting board date format.
| * | [ticket/9176] Take current board timezone settings into account when setting ↵Andreas Fischer2010-05-131-2/+2
| |/ | | | | | | | | | | board date format. PHPBB3-9176
* | [ticket/9582] MSSQL native backups can now be restored.Chris Smith2010-05-031-0/+1
| | | | | | | | | | PHPBB3-9583 PHPBB3-9582