aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12353
* | | | | | 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 remote-tracking branch 'vsephpbb/ticket/12043' into develop-ascraeusJoas Schilling2014-04-031-28/+55
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12043: [ticket/12043] Fix order of disabled extensions in unit tests [ticket/12043] Correct try/catch exceptions for invalid extensions [ticket/12043] Sort Extensions by Display Name in ACP Extension mananger
| * | | | | | [ticket/12043] Correct try/catch exceptions for invalid extensionsMatt Friedman2014-03-291-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12043
| * | | | | | [ticket/12043] Sort Extensions by Display Name in ACP Extension manangerMatt Friedman2014-03-291-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12043
* | | | | | | Merge remote-tracking branch 'paybas/ticket/12329' into develop-ascraeusJoas Schilling2014-04-016-18/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12329: [ticket/12329] changed all CSS classes to ".stat-block" [ticket/12329] Add <div> container to index blocks (stats, etc.)
| * | | | | | | [ticket/12329] changed all CSS classes to ".stat-block"PayBas2014-04-016-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12329
| * | | | | | | [ticket/12329] Add <div> container to index blocks (stats, etc.)PayBas2014-03-306-18/+30
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-12329
* | | | | | | Merge remote-tracking branch 'paybas/ticket/12328' into develop-ascraeusJoas Schilling2014-04-013-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12328: [ticket/12328] Change "since" to B3 [ticket/12328] Add Template Event index_body_stat_blocks_after
| * | | | | | | [ticket/12328] Change "since" to B3PayBas2014-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12328
| * | | | | | | [ticket/12328] Add Template Event index_body_stat_blocks_afterPayBas2014-03-303-0/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-12328
* | | | | | | Merge remote-tracking branch 'paybas/ticket/12322' into develop-ascraeusJoas Schilling2014-04-012-8/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * paybas/ticket/12322: [ticket/12322] Added profile-custom-field class [ticket/12322] CSS classes for postprofile-profile <dd> items
| * | | | | | [ticket/12322] Added profile-custom-field classPayBas2014-04-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12322
| * | | | | | [ticket/12322] CSS classes for postprofile-profile <dd> itemsPayBas2014-03-292-8/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no subsilver2 equivalent for this commit PHPBB3-12322
* | | | | | Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeusJoas Schilling2014-03-319-108/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/9758: [ticket/9758] Clickable avatar in header and renamed class for avatar-img [ticket/9758] Remove unnessary if-question for include functions_display [ticket/9758] Slims the line 4775 in includes/functions.php [ticket/9758] Adds id and changes filter to fix travis CI test [ticket/9758] Removed the needless space after first ENDIF [ticket/9758] Adding impr. for overall_header display of avatar and username [ticket/9758] Fixed bug in mcp_warn.php [ticket/9758] Optimises the html code of avatar image in header [ticket/9758] Error because of missing functions_display.php fixed [ticket/9758] Removed useless if-conditions to include functions.php [ticket/9758] Changes class name of new "span" in overall_header.html [ticket/9758] Adds global template variable CURRENT_USER_AVATAR
| * | | | | | [ticket/9758] Clickable avatar in header and renamed class for avatar-imgCrizzo2014-03-303-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Remove unnessary if-question for include functions_displayCrizzo2014-03-281-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Slims the line 4775 in includes/functions.phpCrizzo2014-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Adds id and changes filter to fix travis CI testCrizzo2014-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Removed the needless space after first ENDIFCrizzo2014-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758