aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10783] Fixed an HTML error with assets_version.Callum Macrae2012-04-131-1/+1
| | | | PHPBB3-10783
* [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-117-11/+11
| | | | PHPBB3-10783
* [ticket/10783] Added assets_version to subsilver2.Callum Macrae2012-04-111-1/+1
| | | | PHPBB3-10783
* [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-115-10/+24
| | | | PHPBB3-10783
* Merge branch 'develop-olympus' into developAndreas Fischer2012-04-083-1/+57
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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). Conflicts: phpBB/install/database_update.php
| * 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 'develop-olympus' into developOleg Pudeyev2012-04-071-4/+0
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10455] Removed NOTE from prosilver overall_header.html.
| * | 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 'develop-olympus' into developOleg Pudeyev2012-04-071-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10764] FAQ now mentions Area51 instead of SourceForge [ticket/10764] FAQ now mentions GitHub instead of SourceForge
| * | | 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 branch 'develop-olympus' into developOleg Pudeyev2012-04-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10508] Marked as read message now less specific.
| * | | 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 'brunoais/ticket/10575' into developAndreas Fischer2012-04-056-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10575: [ticket/10575] Adding public visibility to the methods. [ticket/10575] Fixing non-static access to static functions get_instance
| * | | | | [ticket/10575] Adding public visibility to the methods.Bruno Ais2012-04-056-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added public visibility to the methods PHPBB3-10575
| * | | | | [ticket/10575] Fixing non-static access to static functions get_instanceBruno Ais2012-04-056-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes should solve the strict standards error about accessing the non-static get_instance() in a non-static way. For that, I changed the get_instance methods to static methods. PHPBB3-10575
* | | | | | Merge remote-tracking branch 'p/ticket/10547' into developAndreas Fischer2012-04-051-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10547: [ticket/10547] User is not logged in as admin after installation
| * | | | | | [ticket/10547] User is not logged in as admin after installationGabriel Anca2012-04-041-0/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After installing, when user clicks Login button (final installation step), he is not logged in because there's a missing var ($data) PHPBB3-10547
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-051-6/+59
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | | | | 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 branch 'ticket/10650' into developOleg Pudeyev2012-04-0414-33/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10650: [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
| * | | | | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-0414-33/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
* | | | | | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-0414-1/+33
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10650] Added checking for empty subjectsRahul R2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now empty subjects will not be displayed in a new line on the forum list. PHPBB3-10650
| * | | | | | | [ticket/10650] Corrected intendationRahul R2012-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected the intendation of if condition. PHPBB3-10650
| * | | | | | | [ticket/10650]Added permission checking and utf8 functionsRahul R2012-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passworded forums and ones in which user doesn't have read access will be excluded. Also uft8 based string functions and html encode/decode functions have been used to sanitise subject. PHPBB3-10650
| * | | | | | | [ticket/10650] Cropped subject and inserted newlineRahul R2012-04-052-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subject being displayed in the forum list have been shortened to 30 characters. Also it is now being shown in a separate line. PHPBB3-10650