aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [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 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
| * | | | [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
* | | | | [ticket/11442] Use button name as indicator instead of css classesJoas Schilling2013-05-081-3/+3
* | | | | [ticket/11442] Do not suggest an option on ajax confirm boxJoas Schilling2013-05-083-3/+3
|/ / / /
* | | | Merge PR #1375 branch 'marc1706/ticket/11442' into developOleg Pudeyev2013-05-071-1/+1
|\ \ \ \
| * | | | [ticket/11442] Use correct button class for ajaxified confirm_boxmarc17062013-04-281-1/+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-067-28/+42
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-067-28/+42
| |\ \ \ \
| | * | | | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-1/+1
| | * | | | [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-067-28/+42
* | | | | | Merge PR #1388 branch 'dhruvgoel92/ticket/11288' into developOleg Pudeyev2013-05-061-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/11288] fix regex in postgresDhruv2013-05-041-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1348 from nickvergessen/ticket/11495Nils Adermann2013-05-025-0/+1040
|\ \ \ \ \ \
| * | | | | | [ticket/11495] Throw exception when item that should be deleted does not existJoas Schilling2013-04-301-0/+11
| * | | | | | [ticket/11495] Some more doc changesJoas Schilling2013-04-302-4/+4
| * | | | | | [ticket/11495] Fix more grammar issues in doc blocksJoas Schilling2013-04-301-8/+8
| * | | | | | [ticket/11495] Fix "as well" typo and remove bracketsJoas Schilling2013-04-302-4/+4