aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-184-103/+138
|\
| * [ticket/11415] Send the extension base the finder rather than the managerNathan Guse2013-05-102-10/+9
| * [ticket/11415] Create function in finder find_from_extensionNathan Guse2013-05-102-13/+30
| * [ticket/11415] Make migrator/ext.manager dependencies of the base ext classNathaniel Guse2013-05-012-13/+23
| * [ticket/11415] Remove migrator dependency from extension managerNathaniel Guse2013-05-011-4/+1
| * [ticket/11415] Move migrator to base extension class from ext.managerNathaniel Guse2013-05-012-75/+86
| * [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-012-27/+28
* | Merge remote-tracking branch 'remotes/blitze/ticket/11458' into developNathaniel Guse2013-05-181-25/+16
|\ \
| * | [ticket/11458] Use finder to get all permission language filesOpenShift guest2013-05-101-35/+12
| * | [ticket/11458] We still auto add language files from the mods and acpOpenShift guest2013-04-131-4/+31
| * | [ticket/11458] Search for permission language files in extensionsOpenShift guest2013-03-251-24/+11
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-1/+1
|\ \ \
| * | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-161-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-1/+1
|\ \ \ \ | |/ / /
| * | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-151-1/+1
* | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-121-0/+4
|\ \ \ \
| * | | | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
* | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11465' into developNathan Guse2013-05-121-47/+26
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-1262-620/+1999
| |\ \ \ \ \
| * | | | | | [ticket/11465] Check if class exists before including info fileMarc Alexander2013-04-141-1/+1
| * | | | | | [ticket/11465] The info file does not have _info suffixJoas Schilling2013-04-101-3/+4
| * | | | | | [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-121-1/+1
* | | | | Merge remote-tracking branch 'remotes/bantu/ticket/11452' into developNathaniel Guse2013-05-111-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/11452] Now notification_method_email checks whether user has address.Andreas Fischer2013-03-171-1/+1
* | | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-0/+31
|\ \ \ \ \
| * | | | | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| * | | | | [ticket/10155] Make effectively installed test more specificMatt Friedman2013-03-221-1/+1
| * | | | | [ticket/10155] Use more descriptive title for migration fileMatt Friedman2013-03-171-1/+1
| * | | | | [ticket/10155] Use new migration file for jQuery config updateMatt Friedman2013-03-152-1/+32
| * | | | | [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-141-1/+1
| |/ / / /
* | | | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-083-0/+34
|\ \ \ \ \
| * | | | | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| * | | | | [ticket/10325] fix language keyDhruv2013-04-251-1/+1
| * | | | | [ticket/10325] fix language variableDhruv2013-04-251-1/+1
| * | | | | [ticket/10325] change language varDhruv2013-04-253-3/+3
| * | | | | [ticket/10325] fix languageDhruv2013-04-251-1/+1
| * | | | | [ticket/10325] add new config value to databaseDhruv2013-04-251-0/+2
| * | | | | [ticket/10325] trigger error if forgot password option disabledDhruv2013-04-251-0/+5
| * | | | | [ticket/10325] add allow forgot password option in acpDhruv2013-04-251-0/+1
* | | | | | [ticket/11450] Fix all instances of phpbb_extension_metadata_managerJoas Schilling2013-05-082-2/+2
* | | | | | [ticket/11450] Fix doc blocks and add missing class var $configJoas Schilling2013-05-081-3/+41
* | | | | | [ticket/11450] Sort parameters alphabeticallyJoas Schilling2013-05-081-3/+4
* | | | | | [ticket/11450] Remove unused $db and $phpEx from metadata_manager construct()Joas Schilling2013-05-081-7/+1
* | | | | | Merge remote-tracking branch 'p-push/ticket/11435' into developAndreas Fischer2013-05-061-15/+21
|\ \ \ \ \ \
| * | | | | | [ticket/11435] Fit comment into 80 columns and link to php manual.Oleg Pudeyev2013-05-011-15/+21
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-063-8/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-062-7/+5
| |\ \ \ \ \
| | * | | | | [ticket/11144] Add missing {FORUM_NAME} variableGaƫtan Muller2013-05-062-7/+5