aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | [ticket/10586] Change the interface to an abstract classDavid King2012-03-282-31/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the common phpBB objects to be automatically accessible to extensions without the author having to globalize and assign each one himself. This is better because it also gives purpose to the phpbb_extension_controller class; instead of just being the way to ensure a handle() method is present, it also does this work for us. PHPBB3-10586
* | | | [feature/event-dispatcher] Fix copyright yearsIgor Wiedler2012-03-302-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9550
* | | | Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-304-6/+64
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (35 commits) [ticket/10730] Added label tag around "select" text in post splitting UI [ticket/10732] Add config_dev.php and config_test.php to .gitignore [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [task/php5.3] Updated range of tested PHP versions [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2 [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. [ticket/10703] Added a condition to check if ext directory exists [ticket/10708] Check converted passwords for multi-byte characters [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. ...
| * \ \ \ Merge remote-tracking branch 'imkingdavid/ticket/10586' into developIgor Wiedler2012-03-282-0/+53
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10586: [ticket/10586] Added space in if statement [ticket/10586] Tidy up comments [ticket/10586] Tests finally work (thanks naderman) [ticket/10586] Correctly purge board cache and don't rename install directory [ticket/10586] trying to get tests to work [ticket/10586] more work on getting tests to pass [ticket/10586] Tests are coming along, just a little more to go [ticket/10586] Rename install directory back to install/ after tests [ticket/10586] browse tests now work, but mine dont. at least we are making progress [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 [ticket/10586] Adding the extensions used by the tests [ticket/10586] Now tests run, but fail. But here is what I have. [ticket/10586] some bootstrap additions and test changes to try and make it work [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php [ticket/10586] Copy/paste fail fixed [ticket/10586] Sanitize periods from class names, use manager to get path. [ticket/10586] Removed file_exists() check because class_exists() covers that. [ticket/10586] Extension front controller
| | * | | [ticket/10586] Tidy up commentsDavid King2012-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | [ticket/10586] Sanitize periods from class names, use manager to get path.David King2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | [ticket/10586] Extension front controllerDavid King2012-03-192-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle extension front pages PHPBB3-10586
| * | | | Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into developOleg Pudeyev2012-03-271-4/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/feature/save-post-on-report: [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic [feature/save-post-on-report] bbcode_nl2br missing. [feature/save-post-on-report] Change the column type of reported text [feature/save-post-on-report] Changed the name of the column [feature/save-post-on-report] Bug fix table name [feature/save-post-on-report] Saves the post reported when a report is creat [feature/save-post-on-report] The complete changes for this feature
| | * | | | [feature/save-post-on-report] bbcode_nl2br missing.Bruno Ais2012-03-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New lines were missing in the reported_post_text. By adding the bbcode_nl2br() became as it is supposed to. PHPBB3-10600
| | * | | | [feature/save-post-on-report] Changed the name of the columnBruno Ais2012-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name of the column was changed from reported_post AND reported_text to reported_post_text. This change was made by request PHPBB3-10600
| | * | | | [feature/save-post-on-report] The complete changes for this featureBruno Ais2012-03-191-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This covers all the changes so that when a report is made, the post itself is copied and displayed in the MCP instead of the current post. Unfortunatly, I made all commits in the wrong way and they were lost. Now I have only the final files.
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-261-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10694] Adjusting details link to 5.3 announcement [ticket/10694] Update PHP warning to 5.3.2
| | * \ \ \ Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympusAndreas Fischer2012-03-261-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/10694: [ticket/10694] Adjusting details link to 5.3 announcement [ticket/10694] Update PHP warning to 5.3.2
| | | * | | | [ticket/10694] Adjusting details link to 5.3 announcementMichael Cullum2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10694
| | | * | | | [ticket/10694] Update PHP warning to 5.3.2Michael Cullum2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10694
| * | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into developAndreas Fischer2012-03-251-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10703: [ticket/10703] Added a condition to check if ext directory exists
| | * | | | | | [ticket/10703] Added a condition to check if ext directory existsDhruv Goel2012-03-231-0/+4
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existence of ext directory is checked, if not present a proper error message that file doesn't exist is printed out. No Fatal Error messages. PHPBB3-10703
* | | | | | | [feature/event-dispatcher] Update core.page_header eventMichael Cullum2012-03-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update it to the new correct format. PHPBB3-9550
* | | | | | | [feature/event-dispatcher] Braces CS fixIgor Wiedler2012-03-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | [feature/event-dispatcher] Fix docblock in phpbb_event_dataIgor Wiedler2012-03-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10732
* | | | | | | [feature/event-dispatcher] Rename PHPBB_NO_AUTOLOAD=>PHPBB_NO_COMPOSER_AUTOLOADIgor Wiedler2012-03-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | [feature/event-dispatcher] Change composer autoloading optionsIgor Wiedler2012-03-241-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if composer's generated autoloader is present, and if not give an error. PHPBB3-9550
* | | | | | | [feature/event-dispatcher] Change phpbb_event_dispatcher to inheritance, testsIgor Wiedler2012-03-242-88/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-237-45/+91
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (30 commits) [task/travis] Refactor php version check for dbunit install [task/travis] Exclude functional and slow tests [ticket/10719] Revert "Skip functional tests on PHP 5.2" [task/travis-develop2] Update version from 5.3 to 5.3.2 [task/travis] Dropping support for 5.2 in develop branch [task/travis] Some more small travis fixes [task/travis] Rename travis phpunit config files [task/travis] Fixing some travis issues [ticket/10684] Adjust function and parameter name, minor changes. [task/travis] Add automated testing to readme [task/travis] Removing development information [task/travis] Adding Travis Continuous Intergration Support [ticket/10704] minor typo in a comment [ticket/10717] Fix profile field sample in prosilver“s memberlist_view.html [ticket/10691] Fixed the speed of creating search index [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era. [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. [task/php54] Refactor error_reporting call slightly. [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue [ticket/10689] Fix "First character"-option in "Find a member"-search ...
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-223-37/+59
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10684] Adjust function and parameter name, minor changes. [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter [ticket/10684] Remove intval mapping for array keys [ticket/10684] Adjust pm_notifications() to handle stale bans [ticket/10684] Cast user_id to integer [ticket/10684] Refactor $sql_ignore_users array update [ticket/10684] Remove isset() for $sql_ignore_users update [ticket/10684] Fix 2 typos in comment lines. [ticket/10684] Send notifications for users with stale bans Conflicts: phpBB/includes/functions_user.php
| | * | | | | Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympusAndreas Fischer2012-03-223-37/+59
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rxu/ticket/10684: [ticket/10684] Adjust function and parameter name, minor changes. [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter [ticket/10684] Remove intval mapping for array keys [ticket/10684] Adjust pm_notifications() to handle stale bans [ticket/10684] Cast user_id to integer [ticket/10684] Refactor $sql_ignore_users array update [ticket/10684] Remove isset() for $sql_ignore_users update [ticket/10684] Fix 2 typos in comment lines. [ticket/10684] Send notifications for users with stale bans
| | | * | | | | [ticket/10684] Adjust function and parameter name, minor changes.rxu2012-03-223-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10684