aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10767] Default to non-fatal behavior.Oleg Pudeyev2012-04-171-4/+6
| | | | PHPBB3-10767
* [ticket/10767] Revert unconditional unfatality in commit-msg hook.Oleg Pudeyev2012-04-161-3/+18
| | | | | | | | | Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic." This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26. PHPBB3-10093 PHPBB3-10767
* Merge remote-tracking branch 'bantu/ticket/10788' into develop-olympusAndreas Fischer2012-04-121-2/+3
|\ | | | | | | | | | | * bantu/ticket/10788: [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section. [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
| * [ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.Andreas Fischer2012-04-111-2/+2
| | | | | | | | PHPBB3-10788
| * [ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.Andreas Fischer2012-04-111-0/+1
|/ | | | PHPBB3-10788
* Merge remote-tracking branch 'github-bantu/ticket/10774' into develop-olympusNils Adermann2012-04-102-1/+12
|\ | | | | | | | | | | * github-bantu/ticket/10774: [ticket/10774] Correctly specify index name when creating unique index on MySQL. [ticket/10774] Add unit tests for UNIQUE index existence and creation.
| * [ticket/10774] Correctly specify index name when creating unique index on MySQL.Andreas Fischer2012-04-101-1/+1
| | | | | | | | PHPBB3-10774
| * [ticket/10774] Add unit tests for UNIQUE index existence and creation.Andreas Fischer2012-04-101-0/+11
|/ | | | PHPBB3-10774
* Merge remote-tracking branch 'sadu/ticket/10561' into develop-olympusAndreas Fischer2012-04-083-1/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sadu/ticket/10561: [ticket/10561] Removed extra tabs, changes made to $db->sql_query() [ticket/10561] Changed $temp_style_id to $style_id [ticket/10561] Added function desc for phpbb_style_is_active() [ticket/10561] Casted $config['default_style'] to int [ticket/10561] Reverted to phpbb_style_is_active() [ticket/10561] Added to database_update:database_update_info() [ticket/10561] Added section in database_update.php [ticket/10561] Moved and renamed the funtion validate_style(). [ticket/10561] Fixed syntax error and renamed return variables. [ticket/10561] Changes made to $db->sql_fetchrow(). [ticket/10561] Changes made to function phpbb_style_is_active(). [ticket/10561] All users can choose deactivated styles (fixed).
| * [ticket/10561] Removed extra tabs, changes made to $db->sql_query()Hari Sankar R2012-04-091-5/+5
| | | | | | | | | | | | Substituted $db->sql_query() with _sql() PHPBB3-10561
| * [ticket/10561] Changed $temp_style_id to $style_idHari Sankar R2012-04-091-2/+2
| | | | | | | | PHPBB3-10561
| * [ticket/10561] Added function desc for phpbb_style_is_active()Hari Sankar R2012-04-091-0/+2
| | | | | | | | PHPBB3-10561
| * [ticket/10561] Casted $config['default_style'] to intHari Sankar R2012-04-092-2/+2
| | | | | | | | PHPBB3-10561
| * [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-073-5/+6
| | | | | | | | | | | | Changes made to function name, reverted to old. PHPBB3-10561
| * [ticket/10561] Added to database_update:database_update_info()Hari Sankar R2012-04-071-18/+27
| | | | | | | | | | | | Updates made to database_update.php PHPBB3-10561
| * [ticket/10561] Added section in database_update.phpHari Sankar R2012-04-061-0/+18
| | | | | | | | | | | | | | Added section to check for existing users using a deactivated style, and revert it to default style. PHPBB3-10561
| * [ticket/10561] Moved and renamed the funtion validate_style().Hari Sankar R2012-04-053-22/+27
| | | | | | | | | | | | Fixed minor changes as suggested by @bantu. PHPBB3-10561
| * [ticket/10561] Fixed syntax error and renamed return variables.Hari Sankar R2012-04-031-2/+2
| | | | | | | | | | | | Renamed $style_verified to $style_is_active and fixed extra ';'. PHPBB3-10561
| * [ticket/10561] Changes made to $db->sql_fetchrow().Hari Sankar R2012-04-031-2/+2
| | | | | | | | | | | | Changed $db->sql_fetchrow() to $db->sql_fetchfield(). PHPBB3-10561
| * [ticket/10561] Changes made to function phpbb_style_is_active().Hari Sankar R2012-04-032-6/+8
| | | | | | | | | | | | | | Fixed return type, documented function and, removed style_id from fetch. PHPBB3-10561
| * [ticket/10561] All users can choose deactivated styles (fixed).Hari Sankar R2012-04-032-1/+20
| | | | | | | | | | | | | | | | A form exploit enabled the users to select a deactivated style. Fixed with extra check on submit, with a new function styles_verify to check if the selected style is activated or not. PHPBB3-10561
* | 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