aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
| * | | | [ticket/10328] Added capital to "Content-type" in phpbb_json_response.Callum Macrae2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was originally Content-type, but has been replaced with Content-Type, which is correct. PHPBB3-10328
| * | | | [ticket/10272] AJAXified the bots page in the ACP.Callum Macrae2012-03-311-1/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-10272
| * | | | [ticket/10271] AJAXified buttons on acp_main.Callum Macrae2012-03-311-2/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-10271
| * | | | [ticket/10271] AJAXified the styles tab in the ACP.Callum Macrae2012-03-311-2/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-10271
| * | | | [ticket/10271] AJAXified various deletions in the ACP.Callum Macrae2012-03-313-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following places have had deletion AJAXified: * Smilies and icons * Word censors * BBCodes * Attachment groups * Groups * Admin / User / Moderator / Forum roles * Report / denial reasons * Module management * Custom profile fields PHPBB3-10271
| * | | | [ticket/10328] Renamed the JSON class, also now using autoloading.Callum Macrae2012-03-314-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer static, and uses autoloading. It has also been renamed from JSON to phpbb_json_response. PHPBB3-10328
| * | | | [ticket/10272] Zebra operations using AJAX are now less hacky.Callum Macrae2012-03-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, they were splitting stuff by the <br />, and now JSON::add() is being used. PHPBB3-10272
| * | | | [ticket/10328] Added a JSON class.Callum Macrae2012-03-313-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON class adds a consistent way to send JSON to the client, making it perfect for AJAX (jQuery automatically parses it). PHPBB3-10328
| * | | | [ticket/10271] Changed AJAX functions to $request->is_ajax().Callum Macrae2012-03-312-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10271
| * | | | [ticket/10281] AJAXified reordering forums in the ACP.Callum Macrae2012-03-311-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-10281
| * | | | [ticket/10270] Added JavaScript popups and basic AJAX functionality to PHP.Callum Macrae2012-03-311-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the phpbb object (JavaScript), and alert and confirm box methods. It also adds the first basic AJAX functionality, to deleting posts in viewtopic. PHPBB3-10270
| * | | | Merge remote-tracking branch 'cyberalien/feature/purge-cache' into developDavid King2012-03-301-5/+0
| |\ \ \ \
| | * | | | [feature/purge-cache] Allow all admins to purge cacheVjacheslav Trushkin2012-02-181-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow all administrators to purge cache PHPBB3-10659
| * | | | | Merge branch 'callumacrae/ticket/10510-' into developDavid King2012-03-301-2/+18
| |\ \ \ \ \
| | * | | | | [ticket/10510] Moved a $user->lang call into the function.Callum Macrae2012-03-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| | * | | | | [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.Callum Macrae2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| | * | | | | [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.Callum Macrae2012-03-171-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| * | | | | | Merge pull request #662 from imkingdavid/ticket/10586Igor Wiedler2012-03-302-1/+78
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/10586] Use an abstract class that implements the interface
| | * | | | | | [ticket/10586] Added visibility indication to __construct()David King2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | | | | [ticket/10586] Remove handle() from abstract class, undo change in index.phpDavid King2012-03-282-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | | | | [ticket/10586] Do not pass as referenceDavid King2012-03-281-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | | | | [ticket/10586] Make the abstract class implement the original interfaceDavid King2012-03-282-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586