aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ | | | | | | | | * VSEphpbb/ticket/10779: [ticket/10779] Move jQuery CDN option to Load Settings
| * [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
| | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-10779 PHPBB3-10779
* | Merge branch 'develop-olympus' into developNils Adermann2012-04-211-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10492] Fix line endings [ticket/10492] Backporting functional tests [ticket/10492] Separate config generation from the installer Conflicts: phpBB/includes/functions_install.php phpunit.xml.functional tests/bootstrap.php tests/test_framework/phpbb_functional_test_case.php tests/test_framework/phpbb_test_case_helpers.php
| * | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-201-0/+52
| | | | | | | | | | | | PHPBB3-10492
| * | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-201-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
* | \ \ Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-192-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | | [ticket/10688] Updated version to 3.1Shibu Lijack2012-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace phpBB 3.0.x to phpBB 3.1.x PHPBB-10688
* | | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-201-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * | | | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | | | | [ticket/10756] Fixing variable declarations in style and template classesVjacheslav Trushkin2012-04-193-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variable declaration, removing function from template locator that does not belong there PHPBB3-10756
* | | | | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-196-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
* | | | | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-193-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* | | | | [ticket/10756] Creating locator interfaceVjacheslav Trushkin2012-04-193-5/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating locator interface to be used in template class PHPBB3-10756
* | | | | [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-198-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming template classes from phpbb_style_template_ to phpbb_template_ PHPBB3-10756
* | | | | [ticket/10756] Moving template classesVjacheslav Trushkin2012-04-196-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix PHPBB3-10756
* | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10762' into developNils Adermann2012-04-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-cyberalien/ticket/10762: [ticket/10762] Check for phpbb_version when installing style [ticket/10762] Changing version format in style.cfg
| * | | | | [ticket/10762] Check for phpbb_version when installing styleVjacheslav Trushkin2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch. PHPBB3-10762
* | | | | | [ticket/10783] Correctly add assets_version config var to includejs urlsNils Adermann2012-04-132-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-132-4/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-callumacrae/ticket/10783: [ticket/10783] Added assets_version to ACP and simple_*.html. [ticket/10783] Added assets_version to subsilver2. [ticket/10783] Added ?assets_version to assets.
| * | | | | [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-112-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-101-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
* | | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-092-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | * github-cyberalien/ticket/10754: [ticket/10754] Changing $style to $phpbb_style
| * | | | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-032-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming global variable $style to $phpbb_style PHPBB3-10754
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-082-1/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-082-1/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] 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-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10561
| | * | | | | [ticket/10561] Reverted to phpbb_style_is_active()Hari Sankar R2012-04-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes made to function name, reverted to old. 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 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
* | | | | | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-042-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | [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-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | [ticket/10650] Corrected space before trueRahul2012-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inserted a space before 'true' as per coding guidelines. PHPBB3-10650
| * | | | | | | | [ticket/10650] Displaying last topic on forum listRahul2012-04-052-0/+5
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-042-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | | | | | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-041-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | | | | [ticket/10752] Fixes for acp_stylesVjacheslav Trushkin2012-04-031-39/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding form token, changing functions to public/protected, fixing few more errors PHPBB3-10752
* | | | | | [ticket/10752] Changing private to protected variables in acp_stylesVjacheslav Trushkin2012-04-031-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing private to protected variables in acp_styles PHPBB3-10752
* | | | | | [ticket/10752] More fixes for acp_stylesVjacheslav Trushkin2012-04-031-102/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing return doc blocks, spacing, incorrect sorting function and other minor fixes PHPBB3-10752
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-15 22:08:04 +0000