aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* 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-123-157/+144
|\ \
| * | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| * | [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| * | [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-12128-1866/+3376
| |\ \ \
| * | | | [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-122-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
* | | | 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 remote-tracking branch 'remotes/cyberalien/ticket/10741' into developNathaniel Guse2013-05-113-0/+111
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [ticket/10741] Docblock for phpbb.resizeTextAreaVjacheslav Trushkin2013-04-301-15/+26
| * | | | [ticket/10741] Fix for browser-specific resizing of textareaVjacheslav Trushkin2013-04-121-3/+3
| * | | | [ticket/10741] Do not resize textarea.no-auto-resizeVjacheslav Trushkin2013-04-122-2/+2
| * | | | [ticket/10741] Automatically resize textareas in prosilver and ACPVjacheslav Trushkin2013-04-122-0/+15
| * | | | [ticket/10741] Function to resize textarea elementsVjacheslav Trushkin2013-04-121-0/+85
* | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-092-2/+416
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| * | | | [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
* | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-091-189/+144
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| * | | | [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
* | | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-083-19/+34
|\ \ \ \ \
| * | | | | [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-143-20/+4
| | |_|/ / | |/| | |
* | | | | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-086-0/+38
|\ \ \ \ \
| * | | | | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| * | | | | [ticket/10325] fix acp languageDhruv2013-05-041-1/+1
| * | | | | [ticket/10325] fix language in acp and ucpDhruv2013-04-302-2/+2
| * | | | | [ticket/10325] fix language in acp and ucpDhruv2013-04-252-2/+2
| * | | | | [ticket/10325] improve acp option languageDhruv2013-04-251-1/+1
| * | | | | [ticket/10325] fix language keyDhruv2013-04-252-2/+2
| * | | | | [ticket/10325] fix language variableDhruv2013-04-252-2/+2
| * | | | | [ticket/10325] change language varDhruv2013-04-255-6/+6
| * | | | | [ticket/10325] fix languageDhruv2013-04-252-2/+2
| * | | | | [ticket/10325] add new config value to databaseDhruv2013-04-252-0/+3
| * | | | | [ticket/10325] trigger error if forgot password option disabledDhruv2013-04-252-0/+6
| * | | | | [ticket/10325] add allow forgot password option in acpDhruv2013-04-252-0/+3
* | | | | | Merge PR #1308 branch 'nickvergessen/ticket/11450' into developOleg Pudeyev2013-05-083-14/+47
|\ \ \ \ \ \
| * | | | | | [ticket/11450] Fix all instances of phpbb_extension_metadata_managerJoas Schilling2013-05-082-2/+2