aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-igorw/extensions-tests-mysq55' into developNils Adermann2012-02-212-0/+7
|\ | | | | | | | | * github-igorw/extensions-tests-mysq55: [ticket/10667] Fix tests under MySQL 5.5 strict mode
| * [ticket/10667] Fix tests under MySQL 5.5 strict modeIgor Wiedler2012-02-212-0/+7
| | | | | | | | PHPBB3-10667
* | Merge remote-tracking branch 'github-cyberalien/ticket/10655' into developNils Adermann2012-02-211-1/+1
|\ \ | | | | | | | | | | | | * github-cyberalien/ticket/10655: [ticket/10655] Error in template inheritance test
| * | [ticket/10655] Error in template inheritance testVjacheslav Trushkin2012-02-181-1/+1
|/ / | | | | | | | | | | Fixing error in template inheritance test PHPBB3-10655
* | Merge remote-tracking branch 'cyberalien/ticket/10378' into developIgor Wiedler2012-02-172-1/+17
|\ \ | | | | | | | | | | | | | | | * cyberalien/ticket/10378: [ticket/10378] Missing entries from imageset to css conversion [ticket/10378] Imageset to css convertor typo
| * | [ticket/10378] Missing entries from imageset to css conversionVjacheslav Trushkin2012-01-201-0/+16
| | | | | | | | | | | | | | | | | | Adding missing entries from imageset to css conversion to prosilver/theme/en/stylesheet.css PHPBB3-10378
| * | [ticket/10378] Imageset to css convertor typoVjacheslav Trushkin2012-01-201-1/+1
| | | | | | | | | | | | | | | | | | Imageset to css convertor typo PHPBB3-10378
* | | Merge branch 'ticket/10380' into developIgor Wiedler2012-02-174-31/+198
|\ \ \ | | | | | | | | | | | | | | | | * ticket/10380: [ticket/10380] BIDI support for imageset
| * \ \ Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-175-7/+156
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: [ticket/10652] Fixing typo in template class [ticket/10645] Missing CSS for checkboxes [ticket/10614] Change not installed heading to available. [ticket/10614] Unbreak all_available on extension manager. [ticket/10614] Check if cache exists before destroying it [ticket/10614] Remove ext manager exceptions for now [ticket/10614] Refactor list command to use manager API [ticket/10614] Add purge command [ticket/10614] Tweak list output, show state, purge cache, handle missing exts [ticket/10614] Make script accessible from anywhere [ticket/10614] Better usage output [ticket/10614] Add a script to enable, disable and view status of extensions. [ticket/10500] Use correct class name in @uses. [ticket/10500] Fix phpbb_template_compile instantiation.
| * \ \ \ Merge branch 'develop' into ticket/10380Igor Wiedler2012-02-17488-2884/+6176
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (325 commits) [ticket/10641] Update MCP template with new plurality forms [ticket/10637] Leftovers from implementation of extensions in convertor [ticket/10637] Leftovers from implementation of extensions in develop tools [ticket/10637] Leftovers from implementation of extensions in mcp_post [ticket/10637] Leftovers from implementation of extensions in mcp_main [ticket/10637] Leftovers from implementation of extensions [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header(). [ticket/10633] Stop leaking filename of attachments when thumbnail is requested [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators(). [ticket/10634] Specify module type when viewing profile [ticket/10634] Changing p_master::is_full_class [ticket/10569] Invalid string comparison in prosilver [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop [ticket/10512] Call startup.php from tests/bootstrap.php [ticket/10535] Delete no longer needed email confirm language entries. [ticket/9914] Add backup warning to updater. [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles ...
| * | | | | [ticket/10380] BIDI support for imagesetVjacheslav Trushkin2012-01-164-31/+198
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines PHPBB3-10380
* | | | | Merge branch 'master' of github.com:phpbb/phpbb3 into developIgor Wiedler2012-02-170-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | * 'master' of github.com:phpbb/phpbb3:
| * | | | Merge branch 'prep-release-3.0.10'Andreas Fischer2012-01-02157-3144/+2284
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: (221 commits) [prep-release-3.0.10] Bumping version number for 3.0.10 final. [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release. [ticket/10531] Disallow deleting of the last style [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 [ticket/8996] Revert initial fix to keep old behaviour on empty selection [ticket/10319] Missing hidden fields in search form [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485 [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'. [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog. [ticket/10501] Fix description of table prefixes [ticket/10503] Debug error "Invalid arguments" when previewing edits [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release. [ticket/10497] Fix SQL error when guest visits forum with unread topic [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. [ticket/10461] Add a comment explaining the logic here. ...
| * \ \ \ \ Merge branch 'prep-release-3.0.9'Andreas Fischer2011-07-11228-2110/+6130
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.9: (359 commits) [prep-release-3.0.9] Bumping version number for 3.0.9 final. [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release. [prep-release-3.0.9] Decreasing version for an RC4 release. [ticket/9859] Changing all phpBB footers to match the new credit line [ticket/9859] New footer copyright line with registered symbol [ticket/10250] The site_logo hash is different depending on imageset & language [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imageset [ticket/10250] Overwrite the site_logo width&height when the phpbb logo is used [ticket/10247] Remove attempt_id as primary key from database_update.php [ticket/10250] Added the new phpBB Logo with the Registered Trademark Symbol [ticket/10247] Use COUNT(*) instead of COUNT(attempt_id) [prep-release-3.0.9] Update Changelog for 3.0.9 release. [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater. [ticket/10247] Add a db_tools test for the removal of a primary key column. [ticket/10247] Add empty data section to database update for RC4 [ticket/10247] Remove unecessary attempt_id primary key column [prep-release-3.0.9] Bump database version to RC3 too. [prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release. [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. ...
| * \ \ \ \ \ Merge commit 'release-3.0.8'Nils Adermann2010-11-20231-1182/+7971
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'release-3.0.8': (393 commits) [prep-release-3.0.8] Incrementing version number to 3.0.8 and update changelog [ticket/9903] Script for detecting potentially malicious flash bbcodes [ticket/9904] Update WebPI Parameters.xml to work with WebMatrix. [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP. [ticket/9509] Fix a typo and wrong period placement [ticket/9903] Fix XSS in BBcode-parser's Flash-BBcode. [develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes. [ticket/9140] Check current board version in incremental update packages [ticket/9891] Updater drops language-selection after database-update [develop-olympus] Updating changelog with latest changes for 3.0.8-RC1 [ticket/9884] Reduce queue interval to 60 seconds, email package size to 20 [ticket/9886] Update fails on PostgreSQL because of an error in _add_module [ticket/9888] Update fails when Bing [Bot] was already added to the users table [develop-olympus] Bumping version number for 3.0.8-RC1. [ticket/9885] Fix extension group name updater. Loop through all languages. [ticket/9847] Fix typo in search synonyms. Use british english for 'judgement'. [ticket/9883] Change an American English spelling to British English. [task/phing-build] Correct the path for update package patch files. [ticket/9880] Change "antibot" to "anti-spambot". [ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir. ...
* | \ \ \ \ \ \ Merge pull request #576 from cyberalien/ticket/10652Igor Wiedler2012-02-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/10652] Fixing typo in template class
| * | | | | | | | [ticket/10652] Fixing typo in template classVjacheslav Trushkin2012-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing typo in template class that prevents template inheritance from working PHPBB3-10652
* | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10645' into developOleg Pudeyev2012-02-161-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10645: [ticket/10645] Missing CSS for checkboxes
| * | | | | | | | [ticket/10645] Missing CSS for checkboxesVjacheslav Trushkin2012-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing CSS for checkboxes, invalid cursor for radio input PHPBB3-10645
* | | | | | | | | Merge pull request #526 from p/ticket/10500Igor Wiedler2012-02-142-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Ticket/10500 Miscellaneous issues in the new template engine
| * | | | | | | | [ticket/10500] Use correct class name in @uses.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10500
| * | | | | | | | [ticket/10500] Fix phpbb_template_compile instantiation.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The required $allow_php argument was missing. PHPBB3-10500
* | | | | | | | | Merge pull request #546 from p/ticket/10614Igor Wiedler2012-02-112-2/+151
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | [ticket/10614] Add a script to enable, disable and view status of extens...
| * | | | | | | | [ticket/10614] Change not installed heading to available.Oleg Pudeyev2012-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Not installed" implies that extensions listed there can be installed, but the operation is called enable. Reduce the confusion by using "available" for the heading, this matches extension manager code. PHPBB3-10614
| * | | | | | | | [ticket/10614] Unbreak all_available on extension manager.Oleg Pudeyev2012-02-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default RecursiveIteratorIterator skips all directories. This results in extension manager not finding any extensions. Add RecursiveIteratorIterator::SELF_FIRST to correct this. PHPBB3-10614
| * | | | | | | | [ticket/10614] Check if cache exists before destroying itIgor Wiedler2012-02-091-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Remove ext manager exceptions for nowIgor Wiedler2012-02-091-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Refactor list command to use manager APIIgor Wiedler2012-02-092-53/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Add purge commandIgor Wiedler2012-02-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Tweak list output, show state, purge cache, handle missing extsIgor Wiedler2012-02-092-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Make script accessible from anywhereIgor Wiedler2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Better usage outputIgor Wiedler2012-02-061-29/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
| * | | | | | | | [ticket/10614] Add a script to enable, disable and view status of extensions.Oleg Pudeyev2012-02-031-0/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10614
* | | | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10641' into developAndreas Fischer2012-02-112-27/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10641: [ticket/10641] Update MCP template with new plurality forms
| * | | | | | | | | [ticket/10641] Update MCP template with new plurality formsPatrick Webster2012-02-112-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the MCP template according to PHPBB3-10345 PHPBB3-10641
* | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10633] Stop leaking filename of attachments when thumbnail is requested Conflicts: phpBB/download/file.php
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'bantu/ticket/10633' into develop-olympusOleg Pudeyev2012-02-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10633: [ticket/10633] Stop leaking filename of attachments when thumbnail is requested
| | * | | | | | | | | | [ticket/10633] Stop leaking filename of attachments when thumbnail is requestedAndreas Fischer2012-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While filenames are chosen at random and there is no correlation between the original filename and the new filesystem filename, there is a correlation between filesystem filename and filesytem filename of thumbnails. Adjust error message to no longer include the physical filename and make it consistent with the error message that is shown when there is no attachment at all. This information was mostly useless for regular users (i.e. non-admins) anyway. PHPBB3-10633
* | | | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-113-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header().
| * | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10606' into develop-olympusOleg Pudeyev2012-02-113-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10606: [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic). [ticket/10606] Fix incorrect hidden fields array name in page_header().
| | * | | | | | | | | | [ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).Andreas Fischer2012-02-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649. PHPBB3-10606
| | * | | | | | | | | | [ticket/10606] Fix incorrect hidden fields array name in page_header().James King2012-02-091-1/+1
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from dfb7cc625a37c6345fa647ee3a21f890ba5c9649. PHPBB3-10606
* | | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-102-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| * | | | | | | | | | Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympusOleg Pudeyev2012-02-102-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10569: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| | * | | | | | | | | | [ticket/10569] Invalid string comparison in prosilverVjacheslav Trushkin2012-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in prosilver PHPBB3-10569
| | * | | | | | | | | | [ticket/10569] Invalid string comparison in subsilver2Vjacheslav Trushkin2012-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in subsilver2 PHPBB3-10569
* | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10076' into developOleg Pudeyev2012-02-101-20/+93
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10076: [ticket/10076] STARTTLS support for SMTP via smtp_class. [ticket/10076] Move EHLO/HELO code into its own method.
| * | | | | | | | | | | | [ticket/10076] STARTTLS support for SMTP via smtp_class.Andreas Fischer2012-01-281-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10076
| * | | | | | | | | | | | [ticket/10076] Move EHLO/HELO code into its own method.Andreas Fischer2012-01-281-23/+39
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10076
* | | | | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10636' into developOleg Pudeyev2012-02-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10636: [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().