aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
...
* [ticket/10273] Added phpbb.ajaxify_form and converted accept / deny to it.Callum Macrae2012-03-312-49/+80
| | | | | | Also made a few minor improvements to other JavaScript. PHPBB3-10273
* [ticket/10270] Cleaned up code and made popups fade.Callum Macrae2012-03-311-27/+15
| | | | | | | | This commit cleans up some code - mostly, replacing all instances of __self with "that", and also replacing the parse_hidden function with jQuerys built in .serialize. It also adds animations to the popups. PHPBB3-10270
* [ticket/10273] AJAXified approve / disapprove posts (in viewtopic).Callum Macrae2012-03-316-2/+68
| | | | | | | | This commit AJAXifies the moderator approval functionality, and adds it to viewtopic instead of the MCP. This commit has involved some language changes, which may affect fallbacks. PHPBB3-10273
* [feature/ajax] Cleaned up AJAX-related JavaScript.Callum Macrae2012-03-311-11/+14
| | | | | | Mostly just added comments, but has cleaned up some actual code too. PHPBB3-10270
* [ticket/10272] AJAXified most links.Callum Macrae2012-03-311-25/+76
| | | | | | | | This commit makes some significant changes to the phpbb.confirm_box function (namely, removing some duplicate code), and also manually adds most link to the phpBB AJAX functions. PHPBB3-10272
* [ticket/10271] Added phpbb.confirm_box (JavaScript).Callum Macrae2012-03-311-27/+70
| | | | | | | | As well as adding the method, this commit also changes the previous commit so that deleting a post from viewtopic uses this method, too. This commit has also made some improvements to phpbb.alert and phpbb.confirm. PHPBB3-10271
* [ticket/10270] Added JavaScript popups and basic AJAX functionality to PHP.Callum Macrae2012-03-314-8/+158
| | | | | | | | 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-302-6/+2
|\
| * [feature/purge-cache] Allow all admins to purge cacheVjacheslav Trushkin2012-02-182-6/+2
| | | | | | | | | | | | Allow all administrators to purge cache PHPBB3-10659
* | Merge remote-tracking branch ↵David King2012-03-306-363/+78
|\ \ | | | | | | | | | 'cyberalien/feature/prosilver-cleanup/duplicate-colors' into develop
| * \ Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colorsVjacheslav Trushkin2012-03-2486-366/+1004
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (117 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 ... Conflicts: phpBB/styles/prosilver/theme/cp.css
| * | | [feature/prosilver-cleanup/duplicate-colors] Removing duplicate colorsVjacheslav Trushkin2012-02-166-365/+80
| | | | | | | | | | | | | | | | | | | | | | | | Removing color values from files other than colours.css PHPBB3-10619
* | | | Merge branch 'callumacrae/ticket/10510-' into developDavid King2012-03-304-19/+64
|\ \ \ \
| * | | | [ticket/10510] Added docs to viewtopic quick mod tools array.Callum Macrae2012-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| * | | | [ticket/10510] Moved a $user->lang call into the function.Callum Macrae2012-03-172-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| * | | | [ticket/10510] Shortened an if statement.Callum Macrae2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced an isset() and var check with a !empty. PHPBB3-10510
| * | | | [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.Callum Macrae2012-03-172-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| * | | | [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.Callum Macrae2012-03-172-91/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| * | | | [ticket/10510] Fixed a bug where quickmod tools weren't being displayed.Callum Macrae2012-03-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was referring to some template variables that were removed in a previous commit. Changed! PHPBB3-10510
| * | | | [ticket/10510] Moved quick-mod tools into a loop.Callum Macrae2012-03-173-39/+99
| | | | | | | | | | | | | | | | | | | | PHPBB3-10510
| * | | | [ticket/10510] Updated quick-mod conditional in subsilver2.Callum Macrae2012-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was still trying to use the old conditional, which was referring to a variable which had been removed. PHPBB3-10510
| * | | | [ticket/10510] Moved quick-mod tools markup to template.callumacrae2012-03-043-18/+54
| | | | | | | | | | | | | | | | | | | | PHPBB3-10510
* | | | | Merge remote-tracking branch 'imkingdavid/ticket/10727' into developVjacheslav Trushkin2012-03-312-60/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10727: [ticket/10727] Do not hide Quick Reply with javascript on prosilver
| * | | | | [ticket/10727] Do not hide Quick Reply with javascript on prosilverDavid King2012-03-242-60/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10727
* | | | | | Merge remote-tracking branch ↵David King2012-03-306-84/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 'cyberalien/feature/prosilver-cleanup/remove-tweaks2' into develop
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Updating tweaksVjacheslav Trushkin2012-03-081-79/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing unnecessary tweaks, changing IE7 tweaks to modern code PHPBB3-10622
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaksVjacheslav Trushkin2012-03-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copying commonly used code from tweaks.css to common.css PHPBB3-10622
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from formsVjacheslav Trushkin2012-03-081-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing IE6 tweaks from forms.css PHPBB3-10622
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IEVjacheslav Trushkin2012-03-083-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements PHPBB3-10622
* | | | | | | Merge pull request #662 from imkingdavid/ticket/10586Igor Wiedler2012-03-303-3/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [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] Moved some loading stuff below extension controller, updated ↵David King2012-03-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests PHPBB3-10586
| * | | | | | | [ticket/10586] Undo change in language/en/common.phpDavid King2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | [ticket/10586] Remove handle() from abstract class, undo change in index.phpDavid King2012-03-283-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-284-33/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3029-37/+160
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 branch 'develop-olympus' into developDavid King2012-03-292-10/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/language/en/acp/common.php
| | * \ \ \ \ \ \ \ Merge branch 'harderthanfire/ticket/10129' into develop-olympusDavid King2012-03-292-10/+10
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> ↵HTF2012-03-242-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permissions language file as per ticket. PHPBB3-10129
| * | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10730] Added label tag around "select" text in post splitting UI
| | * | | | | | | | | [ticket/10730] Added label tag around "select" text in post splitting UIJan Schejbal2012-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added label tags around the "select" text in the post splitting UI in the MCP. Had to add IDs based on the post ID to the select boxes to allow label to work. Tested in Firefox and Chrome. PHPBB3-10730
| | * | | | | | | | | 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
| * | | | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10586' into developIgor Wiedler2012-03-284-0/+90
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-272-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | | | | | | | | [ticket/10586] Copy/paste fail fixedDavid King2012-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| | * | | | | | | | | | [ticket/10586] Sanitize periods from class names, use manager to get path.David King2012-03-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586