aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11103] Including the set call in the declaration throws errorsNathan Guse2013-01-152-35/+8
* [ticket/11103] Fix some various issues, better commentsNathan Guse2013-01-158-48/+190
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-15125-2558/+3510
|\
| * Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-1411-51/+80
| |\
| | * [ticket/11171] Moved the DB schema changes to its placeBruno Ais2012-12-071-19/+6
| | * [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| | * [ticket/11171] Adapted the code in report.phpBruno Ais2012-12-071-19/+27
| | * [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
| | * [ticket/11171] DB changes for the updateBruno Ais2012-12-071-0/+17
| | * [ticket/11171] DB additions for these changesBruno Ais2012-12-058-19/+43
| * | Merge PR #1194 branch 'develop-olympus' into developOleg Pudeyev2013-01-133-1/+25
| |\ \
| | * \ Merge PR #1194 branch 'marc1706/ticket/11323' into develop-olympusOleg Pudeyev2013-01-133-1/+22
| | |\ \
| | | * | [ticket/11323] Add tests for inclusion of defined variablesMarc Alexander2013-01-143-1/+22
| * | | | Merge PR #1191 branch 'develop-olympus' into developOleg Pudeyev2013-01-131-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympusOleg Pudeyev2013-01-131-0/+5
| | |\ \ \
| | | * | | [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.Andreas Fischer2013-01-131-0/+5
| | |/ / /
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11320' into developAndreas Fischer2013-01-131-0/+5
| |\ \ \ \
| | * | | | [ticket/11320] Include functions file as we need phpbb_convert_30_dbms_to_31Nathan Guse2013-01-101-0/+5
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11321' into developAndreas Fischer2013-01-117-10/+10
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/11321] Recreate schema files with develop/create_schema_files.phpJoas Schilling2013-01-117-10/+10
| |/ / / /
| * | | | Merge PR #1181 branch 'marc1706/ticket/11313' into developOleg Pudeyev2013-01-091-1/+1
| |\ \ \ \
| | * | | | [ticket/11313] Use correct object el instead of eel in alt_text callbackMarc Alexander2013-01-081-1/+1
| * | | | | Merge PR #1182 branch 'develop-olympus' into developOleg Pudeyev2013-01-091-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympusOleg Pudeyev2013-01-091-1/+1
| | |\ \ \
| | | * | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | * | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| | |/ / /
| * | | | Merge PR #1178 branch 'marc1706/ticket/10949' into developOleg Pudeyev2013-01-086-226/+174
| |\ \ \ \
| | * | | | [ticket/10949] Remove not needed commaMarc Alexander2013-01-051-1/+1
| | * | | | [ticket/10949] Converted missing code to new JS coding guidelinesMarc Alexander2013-01-046-97/+89
| | * | | | Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949Marc Alexander2013-01-042-129/+85
| | |\ \ \ \
| | | * | | | [ticket/10949] Converted AJAX coding standards to new guidelines.Callum Macrae2012-06-212-132/+87
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
| | |\ \ \ \ \
| | | * | | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| * | | | | | | Merge remote-tracking branch 'marc1706/ticket/11311' into developAndreas Fischer2013-01-061-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11311] Include asset core.js in subsilver2 overall_footer.htmlMarc Alexander2013-01-051-0/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge PR #1177 branch 'erikfrerejean/ticket/11309' into developOleg Pudeyev2013-01-041-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/11309] phpbb_extension_interface::disable_step correct docblock.Erik Frèrejean2013-01-041-1/+3
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'erikfrerejean/ticket/11283' into developAndreas Fischer2013-01-031-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/11283] Extension manager follow symlinks.Erik Frèrejean2012-12-231-1/+1
| * | | | | | | Merge PR #1153 branch 'marc1706/ticket/10805' into developOleg Pudeyev2013-01-021-1/+15
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10805] Compare phpbbAlertTimer against nullMarc Alexander2013-01-021-3/+3
| | * | | | | | | [ticket/10805] Clear loading alert timeout after ajax request finishedMarc Alexander2013-01-011-1/+15
| * | | | | | | | Merge PR #1176 branch 'marc1706/ticket/11302' into developOleg Pudeyev2013-01-022-4/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/11302] Correctly select first timezone or selected timezoneMarc Alexander2013-01-022-4/+4
| |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'p/ticket/11305' into developIgor Wiedler2013-01-0220-87/+163
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/11305] Mock container for cache driver in functional create_user()Igor Wiedler2013-01-021-1/+9
| | * | | | | | | | [ticket/11305] Check for $cache being null before using it in db drivers.Oleg Pudeyev2013-01-0210-41/+41
| | * | | | | | | | [ticket/11305] Define hook finder as a service on the container.Oleg Pudeyev2013-01-024-3/+10
| | * | | | | | | | [ticket/11305] Adjust comment.Oleg Pudeyev2013-01-021-1/+1