aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-074-6/+8
| | | | PHPBB3-12254
* [ticket/12254] Stop using deprecated request_var in user classMatt Friedman2014-04-071-3/+3
| | | | PHPBB3-12254
* [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-062-3/+16
| | | | PHPBB3-12254
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-050-0/+0
|\ | | | | | | * develop-olympus:
| * Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
| |\ | | | | | | | | | | | | * Marc/ticket/10851: [ticket/10851] Set disallowed content to empty array if checking is disabled
* | \ Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeusJoas Schilling2014-04-054-0/+38
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/10851-ascraeus: [ticket/10851] Request index instead of logging in and out in tests [ticket/10851] Add unit and functional tests for checking attachments [ticket/10851] Set disallowed content to empty array if checking is disabled
| * | | [ticket/10851] Request index instead of logging in and out in testsMarc Alexander2014-04-041-3/+2
| | | | | | | | | | | | | | | | PHPBB3-10851
| * | | [ticket/10851] Add unit and functional tests for checking attachmentsMarc Alexander2014-04-043-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests will make sure that fileuploads now work as expected regarding the check for disallowed content. PHPBB3-10851
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The disallowed content defaults to a standard set of mimetype triggers by default. If one doesn't want to check the attachments mimetype triggers then we need to set the disallowed content to an empty array. PHPBB3-10851
* | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-058-28/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/7707: [ticket/7707] Fix undefined variable: perm_from [ticket/7707] Add comma to last entry of arrays [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() once more [ticket/7707] Remove unnecessary variables [ticket/7707] Add get_username_string() where possible
| * | | | [ticket/7707] Fix undefined variable: perm_fromOliver Schramm2014-04-041-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-012-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-291-3/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | [ticket/7707] Add get_username_string() once moreOliver Schramm2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-262-12/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
| * | | | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-167-23/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
* | | | | Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeusJoas Schilling2014-04-043-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12338: [ticket/12338] Add Template Event overall_footer_page_body_after Conflicts: phpBB/docs/events.md
| * | | | | [ticket/12338] Add Template Event overall_footer_page_body_afterPayBas2014-04-043-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement PHPBB3-12338
* | | | | | Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeusJoas Schilling2014-04-043-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12333: [ticket/12333] Change event name [ticket/12333] Add Template Event overall_header_body_after
| * | | | | | [ticket/12333] Change event namePayBas2014-04-013-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12333
| * | | | | | [ticket/12333] Add Template Event overall_header_body_afterPayBas2014-03-313-0/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12333
* | | | | | Merge remote-tracking branch 'paybas/ticket/12327' into develop-ascraeusJoas Schilling2014-04-043-12/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12327: [ticket/12327] Ajax fix [ticket/12327] Coding style fixes [ticket/12327] Changing poll result-bars width from absolute to relative
| * | | | | | [ticket/12327] Ajax fixPayBas2014-04-041-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12327
| * | | | | | [ticket/12327] Coding style fixesPayBas2014-04-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12327
| * | | | | | [ticket/12327] Changing poll result-bars width from absolute to relativePayBas2014-04-042-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12327
* | | | | | | Merge remote-tracking branch 'paybas/ticket/12339' into develop-ascraeusJoas Schilling2014-04-041-0/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12339: [ticket/12339] removed return var [ticket/12339] more complete params and updated _since version [ticket/12339] Add Event core.page_header_after
| * | | | | | [ticket/12339] removed return varPayBas2014-04-041-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to learn more about events... evidently PHPBB3-12339
| * | | | | | [ticket/12339] more complete params and updated _since versionPayBas2014-04-041-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12339
| * | | | | | [ticket/12339] Add Event core.page_header_afterPayBas2014-04-011-0/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-12339
* | | | | | Merge remote-tracking branch 'vsephpbb/ticket/11962' into develop-ascraeusJoas Schilling2014-04-047-7/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/11962: [ticket/11962] Resize posted images to fit and give them a class
| * | | | | | [ticket/11962] Resize posted images to fit and give them a classMatt Friedman2014-03-307-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11962
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12342' into develop-ascraeusJoas Schilling2014-04-045-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12342: [ticket/12342] Remove spinner and fix useage of ajax on memberlist [ticket/12342] Fix the Custom Dates function in UCP Prefs Global [ticket/12342] Fix Find a member show / hide script [ticket/12342] Use prop() instead of attr() for boolean properties
| * | | | | | | [ticket/12342] Remove spinner and fix useage of ajax on memberlistMatt Friedman2014-04-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12342
| * | | | | | | [ticket/12342] Fix the Custom Dates function in UCP Prefs GlobalMatt Friedman2014-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function was being called before dE() function exists, causing it to fail. Should be called when the page/window is ready. PHPBB3-12342
| * | | | | | | [ticket/12342] Fix Find a member show / hide scriptMatt Friedman2014-04-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12342
| * | | | | | | [ticket/12342] Use prop() instead of attr() for boolean propertiesMatt Friedman2014-04-014-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12342
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-041-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12353] Fix displayed attachments in ACP
| * | | | | | | Merge remote-tracking branch 'Elsensee/ticket/12353' into develop-olympusJoas Schilling2014-04-041-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/12353: [ticket/12353] Fix displayed attachments in ACP
| | * | | | | | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12353
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-031-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
| * | | | | | | Merge remote-tracking branch 'bantu/ticket/12318' into develop-olympusJoas Schilling2014-04-031-2/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12318: [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
| | * | | | | | [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."Andreas Fischer2014-04-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f6614f2078740675ca0228b348500991888c2140 as the install command started failing with "Version '3.0.0~precise' for 'hhvm' was not found" in the meantime. PHPBB3-12318
* | | | | | | | Merge pull request #2239 from k-fish/ticket/12350Andreas Fischer2014-04-031-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12350] Instantiate Mock Dispatcher for modules_test * k-fish/ticket/12350: [ticket/12350] Instantiate Mock Dispatcher for modules_test
| * | | | | | | [ticket/12350] Instantiate Mock Dispatcher for modules_testK Fisher2014-04-031-1/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12350
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12337' into develop-ascraeusJoas Schilling2014-04-033-3/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12337: [ticket/12337] Fix jQuery update migration file [ticket/12337] Update jQuery to version 1.11.0
| * | | | | | | [ticket/12337] Fix jQuery update migration fileMatt Friedman2014-04-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12337
| * | | | | | | [ticket/12337] Update jQuery to version 1.11.0Matt Friedman2014-03-313-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12337
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | * develop-olympus:
| * | | | | | | Merge remote-tracking branch 'Elsensee/ticket/12341' into develop-olympusJoas Schilling2014-04-031-0/+125
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/12341: [ticket/12341] Add tests for get_username_string()