aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+3
| | | | | | Separates active and deactivated styles in styles list in acp PHPBB3-10563
* Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympusAndreas Fischer2012-01-021-4/+8
|\ | | | | | | | | | | * Dickyf/ticket/10407a: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| * [ticket/10407] Fix check for empty image paths in convertorRichard Foote2012-01-021-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | This applies to avatar_path,avatar_gallery_path,smilies_path and upload_path. Currently, the convertor gets each path from the config table and adds a trailing slash. If there is no entry in the config table for the path, the path can never be empty because of the added trailing slash. This patch will check the path without the trailing slash to see if the path is actually empty. PHPBB3-10407
| * [ticket/10407] Fix check for empty image paths in convertorRichard Foote2011-12-291-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | This applies to avatar_path,avatar_gallery_path,smilies_path and upload_path. Currently, the convertor gets each path from the config table and adds a trailing slash. If there is no entry in the config table for the path, the path can never be empty because of the added trailing slash. This patch will temporarily remove the trailing slash, then check if the path is empty. PHPBB3-10407
* | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
|\ \ | | | | | | | | | | | | * bantu/ticket/10538: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| * | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| |/ | | | | | | PHPBB3-10538
* | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
|\ \ | | | | | | | | | | | | * p/ticket/9681: [ticket/9681] Add password length to security settings
| * | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
| | | | | | | | | | | | PHPBB3-9681
* | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10428: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| * | | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-252-4/+36
| | | | | | | | | | | | | | | | PHPBB3-10428
| * | | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-252-32/+24
| | | | | | | | | | | | | | | | PHPBB3-10428
| * | | [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not work properly when custom $data is provided, and making it work will make the code so complicated that any benefits from having this cache in the first place will be nullified. Just get rid of it. PHPBB3-10428
| * | | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-252-8/+8
| |/ / | | | | | | | | | | | | | | | | | | Users may pass 0 or '' for $data, this should cause the user-specified $data code path to be taken. PHPBB3-10428
* | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-241-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10507: [ticket/10507] DBAL unit test [ticket/10507] Sort styles in acp
| * | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Sort styles by name in admin control panel PHPBB3-10507
* | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
| |/ / |/| | | | | | | | PHPBB3-10546
* | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-221-10/+10
|\ \ \ | |_|/ |/| | | | | | | | | | | * cyberalien/ticket/10399: [ticket/10399] Correctly encoding template component urls (3.0) [ticket/10399] Correctly encoding template component urls (3.0)
| * | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
| | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
* | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
|\ \ \ | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10531] Disallow deleting of the last style
| * \ \ Merge remote-tracking branch 'nickvergessen/ticket/10531' into ↵Andreas Fischer2011-12-161-2/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10531: [ticket/10531] Disallow deleting of the last style
| | * | | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from PHPBB3-9675 commit 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d PHPBB3-9675 PHPBB3-10531
* | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-091-1/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10319] Missing hidden fields in search form
| * | | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing hidden fields in search form (bug added in 3.0.9) PHPBB3-10319
| * | | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-032-46/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10349: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| * | | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10349
| * | | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-282-46/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what now runs in the unit tests. The COMMENTS field in the dbms data is no longer needed, so it has been removed. PHPBB3-10349
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * prep-release-3.0.10: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| * | | Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10497: [ticket/10497] Fix SQL error when guest visits forum with unread topic
| | * | | [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from the ticket PHPBB3-9008 fix. When topic marking was enabled for guests, and a guest visited a forum with a new topic which is marked unread, the built SQL missed an alias for a TOPICS_TABLE which resulted in the following error: Unknown column 't.topic_approved' in 'where clause' [1054] The fix is to add an alias for the table. PHPBB3-10497 PHPBB3-9008
| * | | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-1/+1
| |/ / /
* | | | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use a select box to be consistent with other settings. PHPBB3-10280
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| * | | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | | | | | | | | | | | | | | PHPBB3-10461
| * | | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We pass $log_count as false now when we do not need to know how many log entries there are. However when $log_count is false, $log_count == 0 will be true as well and thus we will return early with 0. PHPBB3-9874 PHPBB3-10461
* | | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-211-1/+1
|/ / /
* | | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-1/+1
| | |
* | | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-208-13/+16
| | | | | | | | | | | | PHPBB3-10446
* | | [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| | | | | | | | | | | | PHPBB3-10446
* | | [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| | | | | | | | | | | | PHPBB3-10446
* | | [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-208-42/+24
| | | | | | | | | | | | PHPBB3-10446
* | | Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
| * | | [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line returns were being removed and links weren't being made clickable. This commit adds a line (contributed by AmigoJack) to retain the link breaks and make links clickable. PHPBB3-10402
* | | | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10239: [ticket/10239] Correct undefined variable error. [ticket/10239] Add confirm box to backup restore.
| * | | | [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10239
| * | | | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-1/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10239
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into ↵Nils Adermann2011-11-181-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/9776: [ticket/9776] Delete poll if no poll options were submitted.
| * | | | | [ticket/9776] Delete poll if no poll options were submitted.Joas Schilling2011-11-181-4/+4
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-9776
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into ↵Nils Adermann2011-11-181-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/9956: [ticket/9956] Display error message if no disapprove reason given
| * | | | | [ticket/9956] Display error message if no disapprove reason givenJoas Schilling2011-10-141-0/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9956
generated by cgit v1.2.1 (git 2.21.0) at 2024-09-22 23:25:24 +0000