aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/duplicate-...David King2012-03-306-363/+78
|\ \
| * \ Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colorsVjacheslav Trushkin2012-03-24103-409/+1192
| |\ \
| * | | [feature/prosilver-cleanup/duplicate-colors] Removing duplicate colorsVjacheslav Trushkin2012-02-166-365/+80
* | | | 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
| * | | | [ticket/10510] Moved a $user->lang call into the function.Callum Macrae2012-03-172-4/+4
| * | | | [ticket/10510] Shortened an if statement.Callum Macrae2012-03-171-1/+1
| * | | | [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option.Callum Macrae2012-03-172-3/+3
| * | | | [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it.Callum Macrae2012-03-172-91/+38
| * | | | [ticket/10510] Fixed a bug where quickmod tools weren't being displayed.Callum Macrae2012-03-172-2/+2
| * | | | [ticket/10510] Moved quick-mod tools into a loop.Callum Macrae2012-03-173-39/+99
| * | | | [ticket/10510] Updated quick-mod conditional in subsilver2.Callum Macrae2012-03-041-1/+1
| * | | | [ticket/10510] Moved quick-mod tools markup to template.callumacrae2012-03-043-18/+54
* | | | | Merge remote-tracking branch 'imkingdavid/ticket/10727' into developVjacheslav Trushkin2012-03-312-60/+1
|\ \ \ \ \
| * | | | | [ticket/10727] Do not hide Quick Reply with javascript on prosilverDavid King2012-03-242-60/+1
* | | | | | Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/remove-twe...David King2012-03-306-84/+28
|\ \ \ \ \ \
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Updating tweaksVjacheslav Trushkin2012-03-081-79/+13
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaksVjacheslav Trushkin2012-03-081-0/+7
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from formsVjacheslav Trushkin2012-03-081-4/+0
| * | | | | | [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IEVjacheslav Trushkin2012-03-083-1/+8
* | | | | | | Merge pull request #662 from imkingdavid/ticket/10586Igor Wiedler2012-03-308-26/+92
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10586] Removed incorrect method callDavid King2012-03-285-11/+1
| * | | | | | | [ticket/10586] Added visibility indication to __construct()David King2012-03-281-1/+1
| * | | | | | | [ticket/10586] Moved some loading stuff below extension controller, updated t...David King2012-03-285-18/+17
| * | | | | | | [ticket/10586] Undo change in language/en/common.phpDavid King2012-03-281-1/+1
| * | | | | | | [ticket/10586] Remove handle() from abstract class, undo change in index.phpDavid King2012-03-283-9/+2
| * | | | | | | [ticket/10586] Do not pass as referenceDavid King2012-03-281-6/+5
| * | | | | | | [ticket/10586] Make the abstract class implement the original interfaceDavid King2012-03-282-1/+32
| * | | | | | | [ticket/10586] Change the interface to an abstract classDavid King2012-03-284-33/+87
* | | | | | | | Merge branch 'develop-olympus' into developDavid King2012-03-300-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'unknownbliss/feature/events-dispatcher-olympus' into develop-ol...David King2012-03-301-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [feature/events-dispatcher] Adding phpBB/vendor to .gitignoreMichael Cullum2012-03-211-0/+1
* | | | | | | | | | 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
| * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcherIgor Wiedler2012-03-3044-37/+498
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'develop-olympus' into developDavid King2012-03-292-10/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'harderthanfire/ticket/10129' into develop-olympusDavid King2012-03-292-10/+10
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | [ticket/10129] Remove apostrophes and plurals in ACP user management -> permi...HTF2012-03-242-10/+10
* | | | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-03-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'janschejbal/ticket/10730' into develop-olympusOleg Pudeyev2012-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/10730] Added label tag around "select" text in post splitting UIJan Schejbal2012-03-291-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympusAndreas Fischer2012-03-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/10708] Check converted passwords for multi-byte charactersRichard Foote2012-03-191-1/+1
* | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-03-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #664 from imkingdavid/ticket/10732Igor Wiedler2012-03-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | [ticket/10732] Add config_dev.php and config_test.php to .gitignoreDavid King2012-03-281-0/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10586' into developIgor Wiedler2012-03-2818-0/+426
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |