aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | [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
* | | | | | [ticket/10752] Pass-by-reference fix for acp_stylesVjacheslav Trushkin2012-04-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing pass-by-reference bug in acp_styles PHPBB3-10752
* | | | | | [ticket/10752] Removing globals acp_stylesVjacheslav Trushkin2012-04-031-141/+127
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Removing global variables from functions in acp_styles PHPBB3-10752
* | | | | Merge remote-tracking branch 'sadu/ticket/10438' into developIgor Wiedler2012-04-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * sadu/ticket/10438: [ticket/10438] Alligning the Smileys on the same line as the text.
| * | | | | [ticket/10438] Alligning the Smileys on the same line as the text.Hari Sankar R2012-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the styling of smilies to appear at the same level as text, by adding vertical-align: text-bottom css property to all smilies. Edited functions_content.php to add class="smilies" to all parsed smilies. PHPBB3-10438
* | | | | | [ticket/10665] Solution for T_SUPER_TEMPLATE_PATHVjacheslav Trushkin2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary solution for T_SUPER_TEMPLATE_PATH pointing to wrong directory, variable will be completely removed later because it will be obsolete PHPBB3-10665
* | | | | | [ticket/10665] Changing template->_js_include to publicVjacheslav Trushkin2012-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing template->_js_include to public function PHPBB3-10665
* | | | | | [ticket/10665] Moving filter parameters to one arrayVjacheslav Trushkin2012-04-011-28/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving filter parameters to one array in template compiler class PHPBB3-10665
* | | | | | Merge remote-tracking branch 'upstream/develop' into ticket/10665Vjacheslav Trushkin2012-04-011-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10731] Fixed addquote() to work on opera browser. [ticket/10731] Fixed addquote() to work on opera browser. [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2 [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language [ticket/10675] Add disk full language string when posting attachments
| * \ \ \ \ \ Merge remote-tracking branch 'cyberalien/ticket/10733' into developIgor Wiedler2012-04-013-4/+142
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10733: [ticket/10733] Fixing test [ticket/10733] Removing static from data providers [ticket/10733] Adding test for locator [ticket/10733] Adding functions to locate resources [ticket/10733] Extending get_source_file_for_handle
| * | | | | | Merge remote-tracking branch 'cyberalien/ticket/10735' into developIgor Wiedler2012-03-316-85/+62
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10735: [ticket/10735] Changing locator paths structure
| * \ \ \ \ \ \ Merge branch 'develop-olympus' into developIgor Wiedler2012-03-311-1/+8
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [Ticket/10675] Correct language string ATTACH_DISK_FULL [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus [ticket/10675] Add disk full language string when posting attachments
| | * | | | | | Merge remote-tracking branch 'Dickyf/ticket/10675' into develop-olympusIgor Wiedler2012-03-311-1/+8
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10675: [Ticket/10675] Correct language string ATTACH_DISK_FULL [ticket/10675] Add disk full language string when posting attachments
| | | * | | | | | [ticket/10675] Add disk full language string when posting attachmentsRichard Foote2012-03-191-1/+8
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add language string visible by admins only for when the disk does not have enough free space to upload attachments. PHPBB3-10675
| | * | | | | | 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
* | | | | | | | [ticket/10665] INCLUDEJS template tagVjacheslav Trushkin2012-04-013-5/+109
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementing INLCUDEJS template tag in style classes PHPBB3-10665
* | | | | | | [ticket/10733] Adding functions to locate resourcesVjacheslav Trushkin2012-04-013-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding $style->locate() and $template->locate() functions PHPBB3-10733
* | | | | | | [ticket/10733] Extending get_source_file_for_handleVjacheslav Trushkin2012-03-311-4/+27
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extending resource locator's function get_source_file_for_handle to find all files. This modified function should be used by template events to locate all templates before compiling them. PHPBB3-10733
* | | | | | [ticket/10735] Changing locator paths structureVjacheslav Trushkin2012-03-316-85/+62
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Changing locator paths to 2 dimensional array PHPBB3-10735
* | | | | [feature/class-prefix] Rename auth => phpbb_authIgor Wiedler2012-03-317-9/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-10609
* | | | | [feature/class-prefix] Rename user and session to phpbb_*Igor Wiedler2012-03-314-839/+854
| | | | | | | | | | | | | | | | | | | | PHPBB-10609
* | | | | [feature/merging-style-components] Fix back link on install pageIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When on install page and all styles are installed, fix back link to go to main styles page. PHPBB3-10632
* | | | | [feature/merging-style-components] Moving template initialization out of styleVjacheslav Trushkin2012-03-313-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving template initialization out of style constructor PHPBB3-10632
* | | | | [feature/merging-style-components] Renaming "delete" to "uninstall" for stylesVjacheslav Trushkin2012-03-311-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing from "delete" to "uninstall" in acp_styles to avoid confusing users PHPBB3-10632
* | | | | [feature/merging-style-components] Initializing locator and provider separatelyVjacheslav Trushkin2012-03-313-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving locator and path provider initialization out of style class PHPBB3-10632
* | | | | [feature/merging-style-components] Fixing few errors in acp_stylesVjacheslav Trushkin2012-03-311-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing notices and usability issues PHPBB3-10632
* | | | | [feature/merging-style-components] Fix notices in acp_stylesIgor Wiedler2012-03-311-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10632
* | | | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-3120-29/+543
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | | | | [feature/ajax] Add entirely unrelated but nice newlinesIgor Wiedler2012-03-312-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | | [feature/ajax] Unify phpbb_json_response instantiationIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | | [feature/ajax] Send correct activate/deactivate JSON response in acp_profileIgor Wiedler2012-03-311-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | | [feature/ajax] Replace static call to phpbb_request with OOIgor Wiedler2012-03-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | | [ticket/10273] Fixed accepting / denying posts AJAX.Callum Macrae2012-03-311-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10273
| * | | | | [feature/ajax] Handle acp_modules error cases with JSON responseIgor Wiedler2012-03-311-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | | [ticket/10328] Fixed the header of json_response.php.Callum Macrae2012-03-311-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10328