aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | [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-308-26/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10586] Use an abstract class that implements the interface
| * | | | | | | | | | | | | | | | [ticket/10586] Removed incorrect method callDavid King2012-03-285-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | [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-285-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developDavid King2012-03-300-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into ↵David King2012-03-301-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus
| | * | | | | | | | | | | | | | | | [feature/events-dispatcher] Adding phpBB/vendor to .gitignoreMichael Cullum2012-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'igorw/feature/event-dispatcher' into developDavid King2012-03-3016-0/+263
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | [feature/event-dispatcher] Fix copyright yearsIgor Wiedler2012-03-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9550
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-3044-37/+498
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympusOleg Pudeyev2012-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * janschejbal/ticket/10730: [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 branch 'develop-olympus' into developAndreas Fischer2012-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10708] Check converted passwords for multi-byte characters Conflicts: phpBB/includes/auth/auth_db.php
| * | | | | | | | | | | | | | | | | 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 branch 'develop-olympus' into developIgor Wiedler2012-03-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10732] Add config_dev.php and config_test.php to .gitignore
| * | | | | | | | | | | | | | | | | Merge pull request #664 from imkingdavid/ticket/10732Igor Wiedler2012-03-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignore
| | * | | | | | | | | | | | | | | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignoreDavid King2012-03-281-0/+2
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10732
* | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10586' into developIgor Wiedler2012-03-2818-0/+426
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Added space in if statementDavid King2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Tidy up commentsDavid King2012-03-272-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Tests finally work (thanks naderman)David King2012-03-192-23/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Correctly purge board cache and don't rename install directoryNils Adermann2012-03-194-20/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] trying to get tests to workDavid King2012-03-192-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] more work on getting tests to passDavid King2012-03-193-17/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Tests are coming along, just a little more to goDavid King2012-03-195-32/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Rename install directory back to install/ after testsDavid King2012-03-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] browse tests now work, but mine dont. at least we are making ↵David King2012-03-193-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | progress PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] initial work on copying fixtures. Note that this depends on 10706David King2012-03-191-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Adding the extensions used by the testsDavid King2012-03-1913-6/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] Now tests run, but fail. But here is what I have.David King2012-03-193-38/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586
| * | | | | | | | | | | | | | | | | [ticket/10586] some bootstrap additions and test changes to try and make it workDavid King2012-03-192-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10586