aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11962] Resize posted images to fit and give them a classMatt Friedman2014-03-307-7/+15
| | | | PHPBB3-11962
* Merge remote-tracking branch 'nickvergessen/ticket/12326' into develop-ascraeusDavid King2014-03-301-17/+11
|\ | | | | | | | | | | * nickvergessen/ticket/12326: [ticket/12326] Correctly format update/index.php and remove php closing tag [ticket/12326] Do not add deleted files to the list of changed files
| * [ticket/12326] Correctly format update/index.php and remove php closing tagJoas Schilling2014-03-301-11/+5
| | | | | | | | PHPBB3-12326
| * [ticket/12326] Do not add deleted files to the list of changed filesJoas Schilling2014-03-301-6/+6
| | | | | | | | PHPBB3-12326
* | Merge remote-tracking branch 'Elsensee/ticket/12330' into develop-ascraeusJoas Schilling2014-03-301-2/+2
|\ \ | | | | | | | | | | | | * Elsensee/ticket/12330: [ticket/12330] Fix create index in db tools on mssql
| * | [ticket/12330] Fix create index in db tools on mssqlOliver Schramm2014-03-301-2/+2
| |/ | | | | | | PHPBB3-12330
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-03-301-3/+5
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
| * \ Merge remote-tracking branch 'VSEphpbb/ticket/12316' into develop-olympusAndreas Fischer2014-03-301-3/+5
| |\ \ | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12316: [ticket/12316] Add Build Status Icon for develop-ascraeus to README.md
| | * | [ticket/12316] Add Build Status Icon for develop-ascraeus to README.mdMatt Friedman2014-03-301-3/+5
| |/ / | | | | | | | | | PHPBB3-12316
* | | Merge pull request #2198 from n-aleha/ticket/12321Andreas Fischer2014-03-302-0/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png * n-aleha/ticket/12321: [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.png
| * | [ticket/12321] Remove execute bit from ucp_main_subscribed.html and buttons.pngn-aleha2014-03-302-0/+0
|/ / | | | | | | PHPBB3-12321
* | Merge remote-tracking branch 'Elsensee/ticket/12324' into develop-ascraeusJoas Schilling2014-03-301-1/+8
|\ \ | | | | | | | | | | | | * Elsensee/ticket/12324: [ticket/12324] Correctly create di container if config/ is missing from update/
| * | [ticket/12324] Correctly create di container if config/ is missing from update/Oliver Schramm2014-03-291-1/+8
|/ / | | | | | | PHPBB3-12324
* | 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-2919-11557/+4800
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Move $supported_dbms to beginning of create schema fileJoas Schilling2014-03-292-2/+9
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Fix missing constant CONFIG_TABLE for sql_create_index()Joas Schilling2014-03-291-0/+8
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Fix auth provider testJoas Schilling2014-03-291-1/+1
| | | | | | | | | | | | | | | | | | user_timezone has no default value anymore PHPBB3-11459
| * | [ticket/11459] Correctly set up the database from schema in unit testsJoas Schilling2014-03-292-4/+21
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Install DB schema from json fileJoas Schilling2014-03-291-4/+13
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Clean up a little moreJoas Schilling2014-03-291-4/+0
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Do not add table schema to database schema filesJoas Schilling2014-03-299-10315/+3329
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Create schema.json from migration filesJoas Schilling2014-03-291-0/+4
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Do not take files of extensions into accountJoas Schilling2014-03-291-1/+2
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Pass array with migration class names to schema generatorJoas Schilling2014-03-292-10/+9
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Refresh schema filesJoas Schilling2014-03-297-139/+244
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Remove spaces from the end of lines in MSSQLJoas Schilling2014-03-291-2/+2
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Correctly handle index column lengthJoas Schilling2014-03-291-4/+21
| | | | | | | | | | | | | | | | | | Code is copied from db\tools::sql_create_index() 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] Remove old schema fileJoas Schilling2014-03-292-1233/+0
| | | | | | | | | | | | PHPBB3-11459
| * | [ticket/11459] Update schema files with new scriptJoas Schilling2014-03-298-907/+792
| | | | | | | | | | | | | | | | | | The order of some tables and columns was changed PHPBB3-11459
| * | [ticket/11459] Use new migration/schema_generator to create schema filesJoas Schilling2014-03-291-3/+13
| | | | | | | | | | | | 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-297-11/+345
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-294-38/+33
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Add unit tests.Cesar G2014-03-194-0/+286
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Remove use of plurals and make it possible to use Oxford comma.Cesar G2014-03-192-10/+17
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.Cesar G2014-03-192-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Simplify how the users are trimmed.Cesar G2014-03-192-39/+27
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Add function to create a string list.Cesar G2014-03-191-0/+22
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Add samples for the untrimmed strings.Cesar G2014-03-191-0/+3
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] List the last user with "and" instead of a comma.Cesar G2014-03-192-6/+22
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Use the plurals system for the untrimmed language strings.Cesar G2014-03-192-4/+15
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Fix the NOTIFICATION_QUOTE_TRIMMED text.Cesar G2014-03-191-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11959
| * | | [ticket/11959] Use plurals for the language strings.Cesar G2014-03-191-3/+9
| | | | | | | | | | | | | | | | PHPBB3-11959
* | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-290-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/12319] Backport Travis CI HHVM environment to develop-olympus.