aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge PR #716 branch 'callumacrae/ticket/10455' into develop-olympusOleg Pudeyev2012-04-071-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10455: [ticket/10455] Removed NOTE from prosilver overall_header.html.
| * | | | [ticket/10455] Removed NOTE from prosilver overall_header.html.Callum Macrae2012-04-051-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10455
* | | | | Merge PR #718 branch 'NeoAdonis/ticket/10764' into develop-olympusOleg Pudeyev2012-04-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * NeoAdonis/ticket/10764: [ticket/10764] FAQ now mentions Area51 instead of SourceForge [ticket/10764] FAQ now mentions GitHub instead of SourceForge
| * | | | | [ticket/10764] FAQ now mentions Area51 instead of SourceForgeAdonais Romero González2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The answer of the question "Why isn't X feature available?" in the FAQ now mentions Area51 instead of SourceForge and GitHub as the way to handle feature requests. PHPBB3-10764
| * | | | | [ticket/10764] FAQ now mentions GitHub instead of SourceForgeAdonais Romero González2012-04-051-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The answer of the question "Why isn't X feature available?" in the FAQ now mentions GitHub instead of SourceForge as the way to handle feature requests. PHPBB3-10764
* | | | | Merge remote-tracking branch 'Fyorl/ticket/10508' into develop-olympusOleg Pudeyev2012-04-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10508: [ticket/10508] Marked as read message now less specific.
| * | | | | [ticket/10508] Marked as read message now less specific.Fyorl2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed 'The selected forums have been marked read' to 'Forums have been marked read' PHPBB3-10508
* | | | | | Merge remote-tracking branch 'p/ticket/10760' into develop-olympusAndreas Fischer2012-04-051-6/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10760: [ticket/10760] Fix numbering in php fun facts. [ticket/10760] Value must be quoted as it might be two words. [ticket/10760] PHP is great. This commit is the proof. [ticket/10760] Catch both versions of parse error output in php. [ticket/10760] Account for display_errors=stderr in pre-commit hook. [ticket/10760] Quote PHP_BIN when using it. [ticket/10760] Use echo -e only if echo understands -e. [ticket/10760] Use externally specified PHP_BIN if any.
| * | | | | | [ticket/10760] Fix numbering in php fun facts.Oleg Pudeyev2012-04-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10760
| * | | | | | [ticket/10760] Value must be quoted as it might be two words.Oleg Pudeyev2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10760
| * | | | | | [ticket/10760] PHP is great. This commit is the proof.Oleg Pudeyev2012-04-041-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10760
| * | | | | | [ticket/10760] Catch both versions of parse error output in php.Oleg Pudeyev2012-04-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10760
| * | | | | | [ticket/10760] Account for display_errors=stderr in pre-commit hook.Oleg Pudeyev2012-04-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With that php.ini value set errors are printed to stderr, therefore by redirecting stderr to /dev/null we also throw out the errors. Instead merge stderr into stdout. PHPBB3-10760
| * | | | | | [ticket/10760] Quote PHP_BIN when using it.Oleg Pudeyev2012-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make a difference on windows where paths may include spaces. PHPBB3-10760
| * | | | | | [ticket/10760] Use echo -e only if echo understands -e.Oleg Pudeyev2012-04-031-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /bin/echo on freebsd and dash's builtin echo do not understand -e, therefore -e is printed with the other messages in such cases. Test if echo understands -e, if not do not use it. PHPBB3-10760
| * | | | | | [ticket/10760] Use externally specified PHP_BIN if any.Oleg Pudeyev2012-04-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a PHP_BIN variable but we always set it unconditionally, therefore in order to use a different php binary one had to modify the hook script. Instead set PHP_BIN if it is not set. Now one can set PHP_BIN in their environment to use a non-default php binary. PHPBB3-10760
* | | | | | | Merge remote-tracking branch 'Fyorl/ticket/10607' into develop-olympusOleg Pudeyev2012-04-049-6/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10607: [ticket/10607] Added 'Powered by' translation string.
| * | | | | | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-049-6/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | | | | Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympusOleg Pudeyev2012-04-031-15/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10658: [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used. [ticket/10658] Use get_user_rank() for group ranks on group view.
| * | | | | [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.Andreas Fischer2012-03-081-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10658
| * | | | | [ticket/10658] Use get_user_rank() for group ranks on group view.Andreas Fischer2012-02-181-10/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The old code was buggy because it did not prefix the path with the phpBB root path which causes problems with bridges and other URL rewriting. PHPBB3-10658
* | | | | Merge remote-tracking branch 'sadu/ticket/10699' into develop-olympusVjacheslav Trushkin2012-04-023-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sadu/ticket/10699: [ticket/10699] Long h2 title breaks div.minitabs in MCP [ticket/10699] Long h2 title breaks div.minitabs in MCP
| * | | | | [ticket/10699] Long h2 title breaks div.minitabs in MCPHari Sankar R2012-04-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed minor issues in formatting. PHPBB3-10699
| * | | | | [ticket/10699] Long h2 title breaks div.minitabs in MCPHari Sankar R2012-04-023-2/+29
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed overlapping of Subject title over the minitabs. Added css property to cp.css under MCP Specific tweaks. Wrapped h2 and #minitabs under .tabs-container with clear: both PHPBB3-10699
* | | | | [ticket/10731] Fixed addquote() to work on opera browser.Hari Sankar R2012-04-012-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | In opera, window.getSelection() returned incorrect values, should be using document.getSelection() instead. Fixed in prosilver and subsilver2 templates. PHPBB3-10731
* | | | Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-312-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10675: [Ticket/10675] Correct language string ATTACH_DISK_FULL [ticket/10675] Add disk full language string when posting attachments
| * | | | [Ticket/10675] Correct language string ATTACH_DISK_FULLRichard Foote2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add period to ATTACH_DISK_FULL language string PHPBB3-10675
| * | | | [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-192-1/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Add language string visible by admins only for when the disk does not have enough free space to upload attachments. PHPBB3-10675
* | | | Merge pull request #668 from unknownbliss/feature/events-dispatcher-olympusIgor Wiedler2012-03-301-0/+1
|\ \ \ \ | | | | | | | | | | Feature/events dispatcher olympus
| * | | | [feature/event-dispatcher] Adding composer.phar to .gitignore for olympusMichael Cullum2012-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To keep the .gitignore's the same. PHPBB3-9550
* | | | | Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into ↵David King2012-03-301-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | develop-olympus
| * | | | | [feature/events-dispatcher] Adding phpBB/vendor to .gitignoreMichael Cullum2012-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | Merge branch 'harderthanfire/ticket/10129' into develop-olympusDavid King2012-03-292-10/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> ↵HTF2012-03-242-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions language file as per ticket. PHPBB3-10129
* | | | | | Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympusOleg Pudeyev2012-03-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * janschejbal/ticket/10730: [ticket/10730] Added label tag around "select" text in post splitting UI
| * | | | | | [ticket/10730] Added label tag around "select" text in post splitting UIJan Schejbal2012-03-291-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added label tags around the "select" text in the post splitting UI in the MCP. Had to add IDs based on the post ID to the select boxes to allow label to work. Tested in Firefox and Chrome. PHPBB3-10730
* | | | | | Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympusAndreas Fischer2012-03-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10708: [ticket/10708] Check converted passwords for multi-byte characters
| * | | | | | [ticket/10708] Check converted passwords for multi-byte charactersRichard Foote2012-03-191-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for multi-byte characters in converted passwords. PHPBB3-10708
* | | | | | Merge pull request #664 from imkingdavid/ticket/10732Igor Wiedler2012-03-281-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignore
| * | | | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignoreDavid King2012-03-281-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10732
* | | | | | Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympusAndreas Fischer2012-03-261-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/10694: [ticket/10694] Adjusting details link to 5.3 announcement [ticket/10694] Update PHP warning to 5.3.2
| * | | | | | [ticket/10694] Adjusting details link to 5.3 announcementMichael Cullum2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10694
| * | | | | | [ticket/10694] Update PHP warning to 5.3.2Michael Cullum2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10694
* | | | | | | Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympusAndreas Fischer2012-03-242-14/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/10723: [ticket/10723] Stop Travis running all tests on sqlite
| * | | | | | [ticket/10723] Stop Travis running all tests on sqliteMichael Cullum2012-03-232-14/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct information so all tests don't run on sqlite PHPBB3-10723
* | | | | | Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympusAndreas Fischer2012-03-223-37/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10684: [ticket/10684] Adjust function and parameter name, minor changes. [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter [ticket/10684] Remove intval mapping for array keys [ticket/10684] Adjust pm_notifications() to handle stale bans [ticket/10684] Cast user_id to integer [ticket/10684] Refactor $sql_ignore_users array update [ticket/10684] Remove isset() for $sql_ignore_users update [ticket/10684] Fix 2 typos in comment lines. [ticket/10684] Send notifications for users with stale bans
| * | | | | | [ticket/10684] Adjust function and parameter name, minor changes.rxu2012-03-223-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | | | [ticket/10684] Rename function phpbb_get_banned_users_ids() parameterrxu2012-03-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10684
| * | | | | | [ticket/10684] Remove intval mapping for array keysrxu2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP manual for arrays http://php.net/manual/en/language.types.array.php states that the following key cast will occur: Strings containing valid integers will be cast to the integer type. E.g. the key "8" will actually be stored under 8. Thus, no intval mapping for numeric array keys is needed. PHPBB3-10684
| * | | | | | [ticket/10684] Adjust pm_notifications() to handle stale bansrxu2012-03-122-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add parameter (array) to the function phpbb_get_banned_users_ids() - Fix function pm_notification() to handle users with stale bans PHPBB3-10684