aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12372] Move dE() function core.jsMarc Alexander2014-04-077-112/+23
* [ticket/12372] Unify definition of function dE() across all filesMarc Alexander2014-04-074-38/+51
* [ticket/12372] Use jQuery in javascript dE() functionMarc Alexander2014-04-071-7/+11
* Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-0610-0/+308
|\
| * [ticket/12150] Use correct license URL in prune shadow migrations fileMarc Alexander2014-04-051-1/+1
| * [ticket/12150] Remove 'after' for columns from migrations fileMarc Alexander2014-04-032-24/+20
| * [ticket/12150] Update schema files for prune shadow topicsMarc Alexander2014-03-301-0/+20
| * Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket...Marc Alexander2014-03-301-0/+5
| |\
| * | [ticket/12150] Use log service instead of add_log() functionMarc Alexander2014-03-292-2/+6
| * | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-296-32/+33
| * | [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| * | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-293-3/+9
| * | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-295-0/+218
| * | [ticket/12150] Add prune columns to schema files and migration fileMarc Alexander2014-03-291-0/+1
| * | [ticket/12150] Add options to acpMarc Alexander2014-03-294-0/+62
* | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-061-3/+3
|\ \ \
| * | | [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
| * | | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
| |\ \ \
* | \ \ \ Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeusJoas Schilling2014-04-051-0/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'ticket/10851' into ticket/10851-ascraeusMarc Alexander2014-04-041-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | [ticket/10851] Set disallowed content to empty array if checking is disabledMarc Alexander2014-04-031-0/+4
* | | | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-058-28/+12
|\ \ \ \ \ \
| * | | | | | [ticket/7707] Fix undefined variable: perm_fromOliver Schramm2014-04-041-1/+3
| * | | | | | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-012-4/+4
| * | | | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-291-3/+0
| * | | | | | [ticket/7707] Add get_username_string() once moreOliver Schramm2014-03-291-1/+1
| * | | | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-262-12/+1
| * | | | | | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-167-23/+19
* | | | | | | Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeusJoas Schilling2014-04-043-0/+12
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12338] Add Template Event overall_footer_page_body_afterPayBas2014-04-043-0/+12
* | | | | | | | Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeusJoas Schilling2014-04-043-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12333] Change event namePayBas2014-04-013-10/+10
| * | | | | | | | [ticket/12333] Add Template Event overall_header_body_afterPayBas2014-03-313-0/+12
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'paybas/ticket/12327' into develop-ascraeusJoas Schilling2014-04-043-12/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12327] Ajax fixPayBas2014-04-041-1/+10
| * | | | | | | | [ticket/12327] Coding style fixesPayBas2014-04-041-4/+4
| * | | | | | | | [ticket/12327] Changing poll result-bars width from absolute to relativePayBas2014-04-042-8/+13
* | | | | | | | | Merge remote-tracking branch 'paybas/ticket/12339' into develop-ascraeusJoas Schilling2014-04-041-0/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | [ticket/12339] removed return varPayBas2014-04-041-3/+2
| * | | | | | | | [ticket/12339] more complete params and updated _since versionPayBas2014-04-041-3/+9
| * | | | | | | | [ticket/12339] Add Event core.page_header_afterPayBas2014-04-011-0/+11
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeusJoas Schilling2014-04-047-7/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11962] Resize posted images to fit and give them a classMatt Friedman2014-03-307-7/+15
* | | | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12342' into develop-ascraeusJoas Schilling2014-04-045-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/12342] Remove spinner and fix useage of ajax on memberlistMatt Friedman2014-04-032-2/+2
| * | | | | | | | | [ticket/12342] Fix the Custom Dates function in UCP Prefs GlobalMatt Friedman2014-04-011-1/+1
| * | | | | | | | | [ticket/12342] Fix Find a member show / hide scriptMatt Friedman2014-04-012-2/+2
| * | | | | | | | | [ticket/12342] Use prop() instead of attr() for boolean propertiesMatt Friedman2014-04-014-5/+5
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
| | |_|_|_|/ / / | |/| | | | | |