aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-055-22/+9
|\ | | | | | | | | | | | | | | | | | | * 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-011-2/+2
| | | | | | | | PHPBB3-7707
| * [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-262-12/+1
| | | | | | | | PHPBB3-7707
| * [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-165-21/+17
| | | | | | | | PHPBB3-7707
* | 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-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * 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-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11962
* | | | 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/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 'crizz0/ticket/9758' into develop-ascraeusJoas Schilling2014-03-317-108/+95
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Adding impr. for overall_header display of avatar and usernameCrizzo2014-03-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Fixed bug in mcp_warn.phpCrizzo2014-03-282-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Error because of missing functions_display.php fixedCrizzo2014-03-282-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Removed useless if-conditions to include functions.phpCrizzo2014-03-285-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
| * | | | | | [ticket/9758] Adds global template variable CURRENT_USER_AVATARCrizzo2014-03-287-92/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9758
* | | | | | | [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3Joas Schilling2014-03-301-1/+1
| | | | | | |
* | | | | | | [prep-release-3.1.0-b2] Update version to 3.1.0-b2Joas Schilling2014-03-301-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into ↵Nils Adermann2014-03-292-1233/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11459: (21 commits) [ticket/11459] Make 3.1.0-dev migration depend on migrations_table [ticket/11459] Move $supported_dbms to beginning of create schema file [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index() [ticket/11459] Fix auth provider test [ticket/11459] Correctly set up the database from schema in unit tests [ticket/11459] Install DB schema from json file [ticket/11459] Clean up a little more [ticket/11459] Do not add table schema to database schema files [ticket/11459] Create schema.json from migration files [ticket/11459] Do not take files of extensions into account [ticket/11459] Pass array with migration class names to schema generator [ticket/11459] Refresh schema files [ticket/11459] Remove spaces from the end of lines in MSSQL [ticket/11459] Correctly handle index column length [ticket/11459] Add migration for migrations table [ticket/11459] Update doc blocks [ticket/11459] Remove old schema file [ticket/11459] Update schema files with new script [ticket/11459] Use new migration/schema_generator to create schema files [ticket/11459] Add Schema from 3.0.0 ...
| * | | | | | [ticket/11459] Remove old schema fileJoas Schilling2014-03-292-1233/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11459
* | | | | | | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-0/+32
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prototech/ticket/11959: [ticket/11959] Move phpbb_generate_string_list() to functions_content.php. [ticket/11959] Add unit tests. [ticket/11959] Remove use of plurals and make it possible to use Oxford comma. [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name. [ticket/11959] Simplify how the users are trimmed. [ticket/11959] Add function to create a string list. [ticket/11959] Add samples for the untrimmed strings. [ticket/11959] List the last user with "and" instead of a comma. [ticket/11959] Use the plurals system for the untrimmed language strings. [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text. [ticket/11959] Use plurals for the language strings.
| * | | | | | [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.Cesar G2014-03-292-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
| * | | | | | [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.Cesar G2014-03-191-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
| * | | | | | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
| * | | | | | [ticket/11959] Add function to create a string list.Cesar G2014-03-191-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11959
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12300' into develop-ascraeusJoas Schilling2014-03-291-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12300: [ticket/12300] Make only red topic/forum row icons clickable to unread posts [ticket/12300] Fix broken link to last post in topic subscriptions list [ticket/12300] Fix alignment of clickable icons [ticket/12300] Make all topic row icons clickable [ticket/12300] Rename new class for row icon links [ticket/12300] Make topic icon links clickable to newest unread posts [ticket/12300] Revert topic title links back to default behavior
| * | | | | | [ticket/12300] Make only red topic/forum row icons clickable to unread postsMatt Friedman2014-03-281-0/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-12300
* | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-291-0/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema Conflicts: phpBB/install/schemas/mssql_schema.sql
| * | | | | Merge remote-tracking branch 'noxwizard/ticket/naderman/9725' into ↵Joas Schilling2014-03-292-49/+113
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * noxwizard/ticket/naderman/9725: [ticket/9725] Code sniffer fixes [ticket/9725] Do not use deprecated views to remove default constraints [ticket/9725] Move primary key creation to the correct location [ticket/9725] Remove trailing spaces from MSSQL schema [ticket/9725] Create MSSQL primary keys if none exist [ticket/9725] Remove explicit filegroup designations [ticket/9725] Fetch Azure db stats from proper table [ticket/9725] Add dummy indexes for Azure [ticket/9725] Create an Azure SQL compatible Schema
| | * | | | | [ticket/9725] Code sniffer fixesPatrick Webster2014-03-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Do not use deprecated views to remove default constraintsPatrick Webster2014-03-281-32/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Move primary key creation to the correct locationPatrick Webster2014-03-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Create MSSQL primary keys if none existPatrick Webster2014-03-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Remove explicit filegroup designationsPatrick Webster2014-03-281-17/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
| | * | | | | [ticket/9725] Fetch Azure db stats from proper tablePatrick Webster2014-03-281-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9725
* | | | | | | [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-fileCrizzo2014-03-281-1/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | PHPBB3-11336
* | | | | | Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeusJoas Schilling2014-03-282-6/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * geetakshi/ticket/11360: [ticket/11360] Updating default value of $display_online_list [ticket/11360] Avoiding online list where not required [ticket/11360] Change second parameter in page_header function
| * | | | | [ticket/11360] Updating default value of $display_online_listgeetakshi2014-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11360
| * | | | | [ticket/11360] Change second parameter in page_header functiongeetakshi2014-03-191-5/+5
| | |_|/ / | |/| | | | | | | | | | | | | PHPBB3-11360
* | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * | | | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12035