aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-0611-0/+515
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12150: [ticket/12150] Use correct license URL in prune shadow migrations file [ticket/12150] Remove 'after' for columns from migrations file [ticket/12150] Update schema files for prune shadow topics [ticket/12150] Use log service instead of add_log() function [ticket/12150] Use shorter column names for prune settings [ticket/12150] Add functional tests for pruning shadow topics [ticket/12150] Add missing space to query for shadow topics [ticket/12150] Add missing prune settings variables in acp_forums [ticket/12150] Add file and caller for pruning shadow topics [ticket/12150] Add prune columns to schema files and migration file [ticket/12150] Add options to acp
| * [ticket/12150] Use correct license URL in prune shadow migrations fileMarc Alexander2014-04-051-1/+1
| | | | | | | | PHPBB3-12150
| * [ticket/12150] Remove 'after' for columns from migrations fileMarc Alexander2014-04-032-24/+20
| | | | | | | | PHPBB3-12150
| * [ticket/12150] Update schema files for prune shadow topicsMarc Alexander2014-03-301-0/+20
| | | | | | | | PHPBB3-12150
| * Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ↵Marc Alexander2014-03-301-0/+5
| |\ | | | | | | | | | ticket/12150
| * | [ticket/12150] Use log service instead of add_log() functionMarc Alexander2014-03-292-2/+6
| | | | | | | | | | | | PHPBB3-12150
| * | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-297-35/+36
| | | | | | | | | | | | | | | | | | | | | | | | All columns were renamed from having prune_shadow_topics as namebase to just prune_shadow. A missing column was also added to the migration file's remove_schema() method. PHPBB3-12150
| * | [ticket/12150] Add functional tests for pruning shadow topicsMarc Alexander2014-03-291-0/+207
| | | | | | | | | | | | PHPBB3-12150
| * | [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| | | | | | | | | | | | PHPBB3-12150
| * | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-293-3/+9
| | | | | | | | | | | | PHPBB3-12150
| * | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-295-0/+218
| | | | | | | | | | | | PHPBB3-12150
| * | [ticket/12150] Add prune columns to schema files and migration fileMarc Alexander2014-03-291-0/+1
| | | | | | | | | | | | PHPBB3-12150
| * | [ticket/12150] Add options to acpMarc Alexander2014-03-294-0/+62
| | | | | | | | | | | | PHPBB3-12150
* | | Merge remote-tracking branch 'Marc/ticket/12354' into develop-ascraeusJoas Schilling2014-04-062-4/+4
|\ \ \ | | | | | | | | | | | | | | | | * Marc/ticket/12354: [ticket/12354] Assert same instead of equal where necessary in passwords tests
| * | | [ticket/12354] Assert same instead of equal where necessary in passwords testsMarc Alexander2014-04-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some tests we try to make sure that we do not get the same output in a limited timeframe. These tests should use assertSame/NotSame instead of assertEqual/NotEqual. PHPBB3-12354
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-061-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12359] Remove inline width styling on UCP birthday fields Conflicts: phpBB/styles/prosilver/template/ucp_profile_profile_info.html
| * | | Merge remote-tracking branch 'VSEphpbb/ticket/12359' into develop-olympusAndreas Fischer2014-04-061-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12359: [ticket/12359] Remove inline width styling on UCP birthday fields
| | * | | [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
| |/ / / | | | | | | | | | | | | PHPBB3-12359
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 08:01:35 +0000