aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-151-2/+2
| | | | | * develop-olympus: [ticket/12397] Fix sql_unique_index_exists doc block
* Merge pull request #2286 from nickvergessen/ticket/12388Andreas Fischer2014-04-151-0/+4
|\ | | | | | | | | | | | | | | [ticket/12388] Fix translation of log entries without additional log data * nickvergessen/ticket/12388: [ticket/12388] Add tests for lang() use on log actions without data [ticket/12388] Fix translation of log entries without additional log data
| * [ticket/12388] Fix translation of log entries without additional log dataJoas Schilling2014-04-111-0/+4
| | | | | | | | PHPBB3-12388
* | [ticket/12004] Support empty routes to app.php/ in path_helperMarc Alexander2014-04-111-0/+10
|/ | | | | | | | | | The symfony routing component allows us to use the path "/" for routes. Therefore, we should be able to use example.com/app.php/ for controllers. However, this currently does not properly work. The method get_web_root_path incorrectly returns phpbb_root_path. Therefore, paths to images or files are broken. PHPBB3-12004
* Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into ↵Nils Adermann2014-04-101-4/+18
|\ | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12113: [ticket/12113] Fix view_log() tests [ticket/12113] Correctly use plurals when deleting user warnings [ticket/12113] Allow log entries to use plurals
| * [ticket/12113] Allow log entries to use pluralsJoas Schilling2014-04-011-4/+18
| | | | | | | | PHPBB3-12113
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12331' into ↵Nils Adermann2014-04-101-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12331: [ticket/12331] Add functional test for saving custom profile fields [ticket/12331] Fix SQL error when inserting a new entry to profile field data
| * | [ticket/12331] Fix SQL error when inserting a new entry to profile field dataJoas Schilling2014-03-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a "Field 'pf_phpbb_interests' doesn't have a default value" error, because we didn't specify values for the disabled fields. We can not disable the sql_return_on_error() thou, because it otherwise we run into "Duplicate entry '2' for key 'PRIMARY'" errors when the user submits the form again but didn't change any values. PHPBB3-12331
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into ↵Nils Adermann2014-04-1056-390/+572
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12282: [ticket/12282] Update new references [ticket/12282] Update container db mock [ticket/12282] Add new line at EOF of the interface [ticket/12282] Use interface for type hinting [ticket/12282] Use {@inheritDoc} for inherited methods [ticket/12282] Add Interface for DBAL drivers
| * | | [ticket/12282] Update new referencesJoas Schilling2014-04-011-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12282
| * | | [ticket/12282] Add new line at EOF of the interfaceJoas Schilling2014-04-011-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12282
| * | | [ticket/12282] Use interface for type hintingJoas Schilling2014-04-0142-98/+98
| | | | | | | | | | | | | | | | PHPBB3-12282
| * | | [ticket/12282] Use {@inheritDoc} for inherited methodsJoas Schilling2014-04-0112-288/+115
| | | | | | | | | | | | | | | | PHPBB3-12282
| * | | [ticket/12282] Add Interface for DBAL driversJoas Schilling2014-04-012-2/+357
| | |/ | |/| | | | | | | PHPBB3-12282
* | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-091-1/+5
| | | | | | | | | | | | PHPBB3-12356
* | | Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeusDhruv2014-04-0884-84/+84
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/12349: [ticket/12349] Fix Sniffer for @license tag [ticket/12349] Update license header in several new files
| * | | [ticket/12349] Update license header in several new filesJoas Schilling2014-04-0384-84/+84
| |/ / | | | | | | | | | PHPBB3-12349
* | | Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeusJoas Schilling2014-04-071-0/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/12362: [ticket/12362] Do not use database test case as it's not needed [ticket/12362] Add tests for schema generator [ticket/12362] Throw exception in schema generator on unresolvable dependency
| * | | [ticket/12362] Throw exception in schema generator on unresolvable dependencyMarc Alexander2014-04-061-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we throw an exception in the schema generator if we come across an unresolvable dependency. Otherwise we'll get stuck in a infinite loop that needs to be cancelled by the user or the maximum execution time. PHPBB3-12362
* | | | Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-062-0/+237
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-031-4/+4
| | | | | | | | | | | | | | | | 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-291-2/+5
| | | | | | | | | | | | | | | | PHPBB3-12150
| * | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-292-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 missing prune settings variables in acp_forumsMarc Alexander2014-03-291-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12150
| * | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-291-0/+188
| | | | | | | | | | | | | | | | 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-291-0/+44
| | | | | | | | | | | | | | | | PHPBB3-12150
* | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Add get_username_string() once moreOliver Schramm2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-7707
* | | | | [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-311-0/+28
| |_|_|/ |/| | | | | | | | | | | PHPBB3-12337
* | | | [prep-release-3.1.0-b2] Add migration for 3.1.0-b2Joas Schilling2014-03-301-0/+29
| | | |
* | | | [ticket/12330] Fix create index in db tools on mssqlOliver Schramm2014-03-301-2/+2
| |_|/ |/| | | | | | | | PHPBB3-12330
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into ↵Nils Adermann2014-03-291-0/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/11459: [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migration
| * | [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migrationJoas Schilling2014-03-291-0/+5
| | | | | | | | | | | | PHPBB3-11459
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into ↵Nils Adermann2014-03-294-0/+1404
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Make 3.1.0-dev migration depend on migrations_tableJoas Schilling2014-03-291-0/+1
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Pass array with migration class names to schema generatorJoas Schilling2014-03-291-5/+5
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Add migration for migrations tableJoas Schilling2014-03-291-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | This migration will always be skipped on updates, because database_update.php creates the table. But the create schema script requires the migration, so the table is created for new installs. PHPBB3-11459
| * | [ticket/11459] Update doc blocksJoas Schilling2014-03-292-3/+3
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Add Schema from 3.0.0Joas Schilling2014-03-291-0/+1177
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Add a migration/schema_generatorJoas Schilling2014-03-291-0/+179
| | | | | | | | | | | | | | | | | | It loops over the migrations and creates the schema from it. PHPBB3-11459
* | | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-291-5/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-291-5/+0
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-191-3/+3
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Simplify how the users are trimmed.Cesar G2014-03-191-15/+7
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] List the last user with "and" instead of a comma.Cesar G2014-03-191-0/+7
| | | | | | | | | | | | PHPBB3-11959
| * | [ticket/11959] Use the plurals system for the untrimmed language strings.Cesar G2014-03-191-1/+6
| | | | | | | | | | | | PHPBB3-11959