aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | | | [ticket/11305] Use phpbb_create_default_container.Oleg Pudeyev2013-01-021-12/+1
| * | | | | | [ticket/11305] Create a normal container during final installation step.Oleg Pudeyev2013-01-022-5/+19
| * | | | | | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-024-9/+10
| * | | | | | [ticket/11305] Extract hook finder from cache service.Oleg Pudeyev2013-01-025-33/+90
|/ / / / / /
* | | | | | Merge PR #1175 branch 'igorw/ticket/11306' into developOleg Pudeyev2013-01-024-36/+60
|\ \ \ \ \ \
| * | | | | | [ticket/11306] Add docblocks to all container related functionsIgor Wiedler2013-01-021-0/+41
| * | | | | | [ticket/11306] Introduce phpbb_create_default_containerIgor Wiedler2013-01-024-36/+19
|/ / / / / /
* | | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-314-46/+77
|\ \ \ \ \ \
| * | | | | | [ticket/11037] Fix unit tests.Oleg Pudeyev2012-12-292-4/+6
| * | | | | | [ticket/11037] Update services.yml.Oleg Pudeyev2012-12-261-0/+4
| * | | | | | [ticket/11037] Add/update docblocks.Oleg Pudeyev2012-12-261-0/+33
| * | | | | | [ticket/11037] Eliminate globals from cache service.Oleg Pudeyev2012-12-241-42/+34
* | | | | | | Merge remote-tracking branch 'p/ticket/11188' into developAndreas Fischer2012-12-311-5/+48
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11188] Reduce waste.Oleg Pudeyev2012-12-301-6/+8
| * | | | | | | [ticket/11188] add result count query for author searchDhruv2012-12-301-1/+33
| * | | | | | | [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'p/ticket/11293' into develop-olympusAndreas Fischer2012-12-311-0/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| | | |_|_|/ / | | |/| | | |