aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympusAndreas Fischer2012-02-261-12/+37
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10532: [ticket/10532] Remove unnecessary parentheses around calculations of addition. [ticket/10532] Remove one unnecessary level of if block nesting. [ticket/10532] Get rid of inline calculation of $start, remove duplicated check [ticket/10532] Put $total_match_count assignment onto its own line. [ticket/10532] Adjust total match count and limit [ticket/10532] Fix $start out of range for pre-made searches
| | * | | | | | | | [ticket/10532] Remove unnecessary parentheses around calculations of addition.Andreas Fischer2012-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | | | | | [ticket/10532] Remove one unnecessary level of if block nesting.Andreas Fischer2012-02-261-37/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | | | | | [ticket/10532] Get rid of inline calculation of $start, remove duplicated checkAndreas Fischer2012-02-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | | | | | [ticket/10532] Put $total_match_count assignment onto its own line.Andreas Fischer2012-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
| | * | | | | | | | [ticket/10532] Adjust total match count and limitrxu2012-01-141-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a variable for the limit of total matches count. Adjust total match count to limit to provide proper $start value calculation. Adjust $start value if no matches were found. PHPBB3-10532
| | * | | | | | | | [ticket/10532] Fix $start out of range for pre-made searchesrxu2012-01-141-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10532
* | | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10458' into developAndreas Fischer2012-02-251-5/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10458: [ticket/10458] Fix xHTML errors when print-viewing PMs
| * | | | | | | | | | [ticket/10458] Fix xHTML errors when print-viewing PMsJoas Schilling2012-02-231-5/+2
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10458
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-254-3/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10456] Add tabindex to subsilver2 captcha
| * | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympusAndreas Fischer2012-02-254-3/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10456: [ticket/10456] Add tabindex to subsilver2 captcha
| | * | | | | | | | | [ticket/10456] Add tabindex to subsilver2 captchaJoas Schilling2012-02-214-3/+4
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did not set tabindex on registration page, as the hole page does not have any. PHPBB3-10456
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-02-253-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%' [ticket/10630] Perform array_unique on authors array before creating the query
| * | | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympusAndreas Fischer2012-02-253-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10630: [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%' [ticket/10630] Perform array_unique on authors array before creating the query
| | * | | | | | | | | [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'Joas Schilling2012-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10630
| | * | | | | | | | | [ticket/10630] Perform array_unique on authors array before creating the queryJoas Schilling2012-02-202-2/+2
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to avoid an additional appearance for an author for every post he made. PHPBB3-10630
* | | | | | | | | | Merge branch 'develop-olympus' into developVjacheslav Trushkin2012-02-246-47/+35
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10453] PM viewmessage page is misplacing the online icon [ticket/10453] PM viewmessage page is misplacing the online icon
| * | | | | | | | | Merge branch 'ticket/raimon/10453' into develop-olympusVjacheslav Trushkin2012-02-246-47/+35
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/raimon/10453: [ticket/10453] PM viewmessage page is misplacing the online icon [ticket/10453] PM viewmessage page is misplacing the online icon
| | * | | | | | | | [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-143-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the position: absolute value, and made it so that if the buttons are bigger the text move with it, also added support for bidi.css (text right to left). PHPBB3-10453 http://tracker.phpbb.com/browse/PHPBB3-10453
| | * | | | | | | | [ticket/10453] PM viewmessage page is misplacing the online iconRaimon2011-11-135-50/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10453 http://tracker.phpbb.com/browse/PHPBB3-10453
* | | | | | | | | | [ticket/10663] Extension finder should not find subdirs with directory filterNils Adermann2012-02-211-0/+4
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directory filter pattern now has a $ in the end, do avoid subdirectories from being matched as well. PHPBB3-10663
* | | | | | | | | 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 '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 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 branch 'develop' into ticket/10380Igor Wiedler2012-02-17367-2608/+4630
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | | | | | | 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().