aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | [ticket/9582] Removing a report reason leaves reports with an unknown reason ↵Rob House2010-05-031-0/+1
| | | | | | | | | | | | | | under MSSQL native. PHPBB3-9564 PHPBB3-9582
* | [ticket/9582] Custom profile fields cannot be created under MSSQL native.Rob House2010-05-031-0/+1
|/ | | | | PHPBB3-9565 PHPBB3-9582
* Merge branch 'bug/nickvergessen/59135' into develop-olympusNils Adermann2010-04-012-4/+4
|\ | | | | | | | | | | | | | | * bug/nickvergessen/59135: [bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135) Conflicts: phpBB/docs/CHANGELOG.html
| * [bug/59135] Fix open_basedir issues when accessing styles- and ↵Joas Schilling2010-03-132-4/+4
| | | | | | | | | | | | language-management. (Bug #59135) introduced in r10496 and r10360/r10361
* | Allow setting parent forums regardless of permission settings. (Bug #58415)Josh Woody2010-03-171-2/+2
|/
* Make the new {INTTEXT} work on pcre installations without utf8 support, it ↵Nils Adermann2010-02-271-9/+20
| | | | | | only matches ascii characters & numbers there. [Bug #58055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10551 89ea8834-ac86-4346-8a33-228a782c2dd0
* #58055 againHenry Sudhof2010-02-271-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10546 89ea8834-ac86-4346-8a33-228a782c2dd0
* okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10544 89ea8834-ac86-4346-8a33-228a782c2dd0
* possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10542 89ea8834-ac86-4346-8a33-228a782c2dd0
* only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10540 89ea8834-ac86-4346-8a33-228a782c2dd0
* Enter stage left: the INTTEXT tokenHenry Sudhof2010-02-211-1/+7
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
* warn users about TEXTHenry Sudhof2010-02-201-91/+107
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10511 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.Joas Schilling2010-02-171-0/+5
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10496 89ea8834-ac86-4346-8a33-228a782c2dd0
* r10491 - Also in the Post Settings section. Thanks leviatan21Andreas Fischer2010-02-161-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10492 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add sql_bit_or() dbal method. Add ability to enable quick reply in all ↵Andreas Fischer2010-02-151-2/+21
| | | | | | forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10491 89ea8834-ac86-4346-8a33-228a782c2dd0
* Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris ↵Nils Adermann2010-02-111-0/+102
| | | | | | | | | | | | | Pucci at Microsoft [Bug #57055] If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If you want to try it on a current phpBB version you can apply the latest version of the patch to your board which you can find attached to the bug tracker ticket (look in the comments for the latest version, the one in the ticket itself is outdated): http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=57055 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10489 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #57455 - Fix problems with firebird by no longer using 'count' as a ↵Andreas Fischer2010-02-081-2/+3
| | | | | | column alias. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10484 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix Bug #57385Andreas Fischer2010-02-061-2/+2
| | | | | | | | Correctly sort database backup file list by date on database restore page. Take admin's time zone settings into account when listing database backup files. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10478 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add a warning for users of old PHP versions about ending support.Josh Woody2010-01-261-0/+8
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10458 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.Joas Schilling2010-01-251-3/+3
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Feature] Ability to use HTTP authentication in ATOM feeds by passing the ↵Andreas Fischer2010-01-191-0/+1
| | | | | | GET parameter auth=http git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10430 89ea8834-ac86-4346-8a33-228a782c2dd0
* spacesHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10413 89ea8834-ac86-4346-8a33-228a782c2dd0
* Mirror login captcha option on captcha settingsHenry Sudhof2010-01-171-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10410 89ea8834-ac86-4346-8a33-228a782c2dd0
* No longer include subforums in forum feed.Andreas Fischer2010-01-121-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
* Integrate active topics feed. Some language adjustments and rearrangements.Andreas Fischer2009-12-271-1/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10382 89ea8834-ac86-4346-8a33-228a782c2dd0
* Let's try this. Split feed user interface into sections. This partly reverts ↵Andreas Fischer2009-12-231-3/+9
| | | | | | r10366. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10374 89ea8834-ac86-4346-8a33-228a782c2dd0
* Rearrange items. Move post based feeds up.Andreas Fischer2009-12-231-3/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10367 89ea8834-ac86-4346-8a33-228a782c2dd0
* Split feed_limit into feed_limit_post and feed_limit_topic. Drop ↵Andreas Fischer2009-12-231-2/+2
| | | | | | feed_overall_topics_limit. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10366 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add ability to disable overall (aka board-wide) feed.Andreas Fischer2009-12-221-0/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10363 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix r10360, Bug #55665Andreas Fischer2009-12-221-1/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10361 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #55665 - Restrict search for styles/../style.cfg to folders.Joas Schilling2009-12-211-0/+4
| | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10360 89ea8834-ac86-4346-8a33-228a782c2dd0
* Cache forever, destroy on change.Andreas Fischer2009-12-201-1/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10354 89ea8834-ac86-4346-8a33-228a782c2dd0
* permit current year in ACP - UCP changed in r8807 #55115Chris Smith2009-12-111-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10323 89ea8834-ac86-4346-8a33-228a782c2dd0
* Log activation through inactive users ACP. #30145Chris Smith2009-12-091-14/+20
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10310 89ea8834-ac86-4346-8a33-228a782c2dd0