aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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().
| * | | | | [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().Andreas Fischer2012-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from 4c77903129749008cd08c346006d2a57cf6ff544. PHPBB3-10636
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/10637' into developOleg Pudeyev2012-02-106-25/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10637: [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/10637] Leftovers from implementation of extensions in convertorVjacheslav Trushkin2012-02-091-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in convertor that was missed in ticket 10323 PHPBB3-10637
| * | | | | | [ticket/10637] Leftovers from implementation of extensions in develop toolsVjacheslav Trushkin2012-02-092-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in development tools that was missed in ticket 10323 PHPBB3-10637
| * | | | | | [ticket/10637] Leftovers from implementation of extensions in mcp_postVjacheslav Trushkin2012-02-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323 PHPBB3-10637
| * | | | | | [ticket/10637] Leftovers from implementation of extensions in mcp_mainVjacheslav Trushkin2012-02-091-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323 PHPBB3-10637
| * | | | | | [ticket/10637] Leftovers from implementation of extensionsVjacheslav Trushkin2012-02-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing code in includes/functions_admin.php that was missed in ticket 10323 PHPBB3-10637
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10495' into developOleg Pudeyev2012-02-101-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10495: [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
| * | | | | | | [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc dropAndreas Fischer2012-02-041-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-10495
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-02-101-18/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | * develop-olympus: [ticket/10512] Call startup.php from tests/bootstrap.php
| * | | | | Merge remote-tracking branch 'bantu/ticket/10512' into develop-olympusOleg Pudeyev2012-02-101-18/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * bantu/ticket/10512: [ticket/10512] Call startup.php from tests/bootstrap.php
| | * | | | [ticket/10512] Call startup.php from tests/bootstrap.phpAndreas Fischer2012-02-041-18/+2
| | | |_|/ | | |/| | | | | | | | | | | | PHPBB3-10512
* | | | | Merge remote-tracking branch 'cyberalien/ticket/10634' into developIgor Wiedler2012-02-092-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10634: [ticket/10634] Specify module type when viewing profile [ticket/10634] Changing p_master::is_full_class
| * | | | | [ticket/10634] Specify module type when viewing profileVjacheslav Trushkin2012-02-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify module type when checking for enabled modules when viewing user's profile PHPBB3-10634
| * | | | | [ticket/10634] Changing p_master::is_full_classVjacheslav Trushkin2012-02-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Changing p_master::is_full_class to check allow all module types, not only current type PHPBB3-10634
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-074-9/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
| * | | | Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympusIgor Wiedler2012-02-074-9/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10616: [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/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template inheritance when exporting template.cfg PHPBB3-10616
| | * | | | [ticket/10616] Ignore template inheritance that points to selfVjacheslav Trushkin2012-02-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore template inheritance if it points to self PHPBB3-10616
| | * | | | [ticket/10616] Add template inheritance to default stylesVjacheslav Trushkin2012-02-032-0/+9
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Adding template inheritance field to prosilver and subsilver2 PHPBB3-10616
* | | | | Merge branch 'develop-olympus' into developDavid King2012-02-032-0/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * develop-olympus: [ticket/9914] Add backup warning to updater.
| * | | Merge remote-tracking branch 'unknownbliss/ticket/9914' into develop-olympusDavid King2012-02-032-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | * unknownbliss/ticket/9914: [ticket/9914] Add backup warning to updater.