aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12363] changed _winner_ to _most-votes_PayBas2014-04-064-6/+6
* [ticket/12363] Mark winning (most votes) results barPayBas2014-04-064-2/+6
* Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-061-3/+3
|\
| * Merge remote-tracking branch 'VSEphpbb/ticket/12359' into develop-olympusAndreas Fischer2014-04-061-3/+3
| |\
| | * [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
| |/
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-050-0/+0
|\ \ | |/
| * 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-054-0/+38
|\ \ \
| * | | [ticket/10851] Request index instead of logging in and out in testsMarc Alexander2014-04-041-3/+2
| * | | [ticket/10851] Add unit and functional tests for checking attachmentsMarc Alexander2014-04-043-0/+35
| * | | 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
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'Elsensee/ticket/12353' into develop-olympusJoas Schilling2014-04-041-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-031-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/12318' into develop-olympusJoas Schilling2014-04-031-2/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."Andreas Fischer2014-04-031-2/+1
* | | | | | | | Merge pull request #2239 from k-fish/ticket/12350Andreas Fischer2014-04-031-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | [ticket/12350] Instantiate Mock Dispatcher for modules_testK Fisher2014-04-031-1/+3
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12337' into develop-ascraeusJoas Schilling2014-04-033-3/+38
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12337] Fix jQuery update migration fileMatt Friedman2014-04-011-1/+6
| * | | | | | | [ticket/12337] Update jQuery to version 1.11.0Matt Friedman2014-03-313-3/+33