Zotov Dmitry d6edc142fd Merge branch 'next' into schema-builder-refactoring ...

Conflicts:
	CHANGELOG.md
	docs/entities.md
	gulpfile.ts
	package-lock.json
	src/connection/Connection.ts
	src/driver/oracle/OracleDriver.ts
	src/driver/postgres/PostgresDriver.ts
	src/metadata-args/MetadataArgsStorage.ts
	src/metadata/EntityMetadata.ts
	src/persistence/SubjectExecutor.ts
	src/query-builder/UpdateQueryBuilder.ts
	test/functional/sqljs/auto-save.ts

2018-02-08 17:53:06 +05:00

..

active-record-data-mapper.md

Update active-record-data-mapper.md

2018-01-29 18:02:32 -05:00

caching.md

Update caching.md

2018-01-29 14:20:18 -05:00

connection-api.md

refactoring persistence

2017-10-31 10:51:33 +05:00

connection-options.md

loose -> lose

2018-01-31 23:13:58 +00:00

connection.md

refactoring persistence

2017-10-31 10:51:33 +05:00

custom-repository.md

Update custom-repository.md

2018-01-29 11:12:47 -05:00

decorator-reference.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

delete-query-builder.md

docs: spelling and general improvements (part 2)

2017-10-03 19:59:17 +02:00

eager-and-lazy-relations.md

refactoring persistence

2017-10-31 10:51:33 +05:00

embedded-entities.md

th -> the

2017-10-21 19:59:06 -07:00

entities.md

Merge branch 'next' into schema-builder-refactoring

2018-02-08 17:53:06 +05:00

entity-inheritance.md

added logic to update non virtual relational columns when entity relations are updated

2017-12-08 13:53:23 +05:00

entity-manager-api.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

entity-metadata.md

improved docs

2017-09-26 21:15:46 +05:00

example-with-express.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

faq.md

Update faq.md

2018-01-29 18:24:07 -05:00

find-options.md

improved docs on webpack change and new find option

2017-12-01 23:46:07 +01:00

index.md

updated docs, getting ready for 0.1.0 release

2017-10-03 15:35:09 +05:00

indices.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

insert-query-builder.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

internals.md

improved docs

2017-09-26 21:15:46 +05:00

listeners-and-subscribers.md

Update documentation for select, NULL, and subscribers

2018-01-25 19:02:26 -08:00

logging.md

Update logging.md

2018-01-29 15:50:02 -05:00

many-to-many-relations.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

many-to-one-one-to-many-relations.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

migrations.md

Update migrations.md

2018-01-29 14:28:55 -05:00

mongodb.md

Fixed typo in mongodb.md

2018-01-31 11:35:32 +02:00

multiple-connections.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

naming-strategy.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

one-to-one-relations.md

docs: spelling and general improvements (part 4)

2017-10-03 23:25:30 +02:00

query-runner.md

updated docs, getting ready for 0.1.0 release

2017-10-03 15:35:09 +05:00

relational-query-builder.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

relations-faq.md

Fix minor typo in relations-faq.md

2017-11-05 13:48:51 +01:00

relations.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

repository-api.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

roadmap.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

schema-in-files.md

spelling and general improvements (part 5)

2017-10-04 13:08:40 +02:00

select-query-builder.md

Updated the hidden column to reflect the query

2018-01-31 08:03:28 -05:00

sequelize-migration.md

Update sequelize-migration.md

2018-01-29 18:09:35 -05:00

support.md

Update support.md

2018-01-29 18:42:02 -05:00

supported-platforms.md

improved docs on webpack change and new find option

2017-12-01 23:46:07 +01:00

transactions.md

Update transactions.md

2018-01-29 14:51:16 -05:00

tree-entities.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00

update-query-builder.md

spelling and general improvements (part 5)

2017-10-04 13:08:40 +02:00

usage-with-javascript.md

changed how cascades should be defined via relation options

2017-11-20 13:48:14 +05:00

using-cli.md

Update using-cli.md

2018-01-29 17:36:49 -05:00

using-ormconfig.md

fixes #1011

2017-10-13 17:49:26 +05:00

validation.md

spelling and general improvements (part 5)

2017-10-04 13:08:40 +02:00

working-with-entity-manager.md

Docs: Make variable User obvious

2017-12-24 15:51:52 +07:00

working-with-repository.md

Merge branch 'master' into next

2018-02-06 12:17:33 +05:00