aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12150] Update schema files for prune shadow topicsMarc Alexander2014-03-301-0/+20
* Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket...Marc Alexander2014-03-301-0/+5
|\
| * Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into develop...Nils Adermann2014-03-291-0/+5
| |\
| | * [ticket/11459] 3.0.1-RC1 should depend on 3.0.0 migrationJoas Schilling2014-03-291-0/+5
* | | [ticket/12150] Use log service instead of add_log() functionMarc Alexander2014-03-292-2/+6
* | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-297-35/+36
* | | [ticket/12150] Add functional tests for pruning shadow topicsMarc Alexander2014-03-291-0/+207
* | | [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
* | | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-293-3/+9
* | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-295-0/+218
* | | [ticket/12150] Add prune columns to schema files and migration fileMarc Alexander2014-03-291-0/+1
* | | [ticket/12150] Add options to acpMarc Alexander2014-03-294-0/+62
|/ /
* | Merge remote-tracking branch 'github-nickvergessen/ticket/11459' into develop...Nils Adermann2014-03-2919-11557/+4800
|\ \ | |/
| * [ticket/11459] Make 3.1.0-dev migration depend on migrations_tableJoas Schilling2014-03-291-0/+1
| * [ticket/11459] Move $supported_dbms to beginning of create schema fileJoas Schilling2014-03-292-2/+9
| * [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()Joas Schilling2014-03-291-0/+8
| * [ticket/11459] Fix auth provider testJoas Schilling2014-03-291-1/+1
| * [ticket/11459] Correctly set up the database from schema in unit testsJoas Schilling2014-03-292-4/+21
| * [ticket/11459] Install DB schema from json fileJoas Schilling2014-03-291-4/+13
| * [ticket/11459] Clean up a little moreJoas Schilling2014-03-291-4/+0
| * [ticket/11459] Do not add table schema to database schema filesJoas Schilling2014-03-299-10315/+3329
| * [ticket/11459] Create schema.json from migration filesJoas Schilling2014-03-291-0/+4
| * [ticket/11459] Do not take files of extensions into accountJoas Schilling2014-03-291-1/+2
| * [ticket/11459] Pass array with migration class names to schema generatorJoas Schilling2014-03-292-10/+9
| * [ticket/11459] Refresh schema filesJoas Schilling2014-03-297-139/+244
| * [ticket/11459] Remove spaces from the end of lines in MSSQLJoas Schilling2014-03-291-2/+2
| * [ticket/11459] Correctly handle index column lengthJoas Schilling2014-03-291-4/+21
| * [ticket/11459] Add migration for migrations tableJoas Schilling2014-03-291-0/+47
| * [ticket/11459] Update doc blocksJoas Schilling2014-03-292-3/+3
| * [ticket/11459] Remove old schema fileJoas Schilling2014-03-292-1233/+0
| * [ticket/11459] Update schema files with new scriptJoas Schilling2014-03-298-907/+792
| * [ticket/11459] Use new migration/schema_generator to create schema filesJoas Schilling2014-03-291-3/+13
| * [ticket/11459] Add Schema from 3.0.0Joas Schilling2014-03-291-0/+1177
| * [ticket/11459] Add a migration/schema_generatorJoas Schilling2014-03-291-0/+179
* | Merge remote-tracking branch 'prototech/ticket/11959' into develop-ascraeusJoas Schilling2014-03-297-11/+345
|\ \
| * | [ticket/11959] Move phpbb_generate_string_list() to functions_content.php.Cesar G2014-03-294-38/+33
| * | [ticket/11959] Add unit tests.Cesar G2014-03-194-0/+286
| * | [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.Cesar G2014-03-192-10/+17
| * | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-192-4/+4
| * | [ticket/11959] Simplify how the users are trimmed.Cesar G2014-03-192-39/+27
| * | [ticket/11959] Add function to create a string list.Cesar G2014-03-191-0/+22
| * | [ticket/11959] Add samples for the untrimmed strings.Cesar G2014-03-191-0/+3
| * | [ticket/11959] List the last user with "and" instead of a comma.Cesar G2014-03-192-6/+22
| * | [ticket/11959] Use the plurals system for the untrimmed language strings.Cesar G2014-03-192-4/+15
| * | [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.Cesar G2014-03-191-1/+1
| * | [ticket/11959] Use plurals for the language strings.Cesar G2014-03-191-3/+9
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-290-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'bantu/ticket/12319' into develop-olympusJoas Schilling2014-03-291-0/+3
| |\ \ \
| | * | | [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.Andreas Fischer2014-03-291-0/+3
| |/ / /
* | | | Merge remote-tracking branch 'prosk8er/ticket/12298' into develop-ascraeusJoas Schilling2014-03-293-0/+20
|\ \ \ \