1052 Commits

Author	SHA1	Message	Date
Jim LAURIE	84f951e2a5	Fix connection name	2019-04-17 17:05:25 +02:00
Jim LAURIE	99477c4b80	Fix #3147 join multi database	2019-04-17 15:13:05 +02:00
Jim LAURIE	fd87e6353e	3.0.0-alpha.26	2019-04-16 11:13:14 +02:00
soupette	7027606a1d	Merge branch 'master' of github.com:strapi/strapi into improve/ctb	2019-04-08 17:16:06 +02:00
Alexandre Bodin	b93b4e105d	Cleanup tests	2019-03-28 15:10:32 +01:00
Alexandre Bodin	3c70b18451	Update filtering documentation	2019-03-28 14:55:27 +01:00
Alexandre Bodin	3098309369	Use mongoose.find on simple queries for a perf boost	2019-03-26 14:57:02 +01:00
soupette	d2f50f7bae	Fix relations	2019-03-25 19:08:17 +01:00
Alexandre Bodin	0c5b255e75	Fix graphql loaders and add some e2e graphql tests	2019-03-25 16:37:46 +01:00
Alexandre Bodin	f8e8928d8a	Handle orWhere in mongo and format value / cast	2019-03-22 18:08:11 +01:00
Alexandre Bodin	d2db6b633f	Mongo + graphql v1	2019-03-21 09:07:36 +01:00
Jim LAURIE	c5f3eb67ce	Fix loose permissions with Mongo	2019-03-21 09:07:02 +01:00
Kamal Bennani	5c7dd886aa	No longer use convertParams	2019-03-21 09:07:02 +01:00
Kamal Bennani	17d8eb36c0	Adapt User plugin to the new API	2019-03-21 09:06:06 +01:00
Kamal Bennani	e8c92fc3d7	Adapt Services to the new Mongoose API	2019-03-21 09:06:06 +01:00
Kamal Bennani	c93311557e	Adapt Services to the new Bookshelf API	2019-03-21 09:05:42 +01:00
Jim LAURIE	2b678f2f0a	3.0.0-alpha.25.2	2019-03-15 23:32:36 +01:00
Jim LAURIE	54457aadd0	3.0.0-alpha.25.1	2019-03-15 18:02:32 +01:00
Jim LAURIE	a63afc888f	3.0.0-alpha.25	2019-03-14 12:08:21 +01:00
Alexandre Bodin	a0b45e2741	Add cypress run	2019-03-13 00:10:20 +01:00
Jim LAURIE	73b31d4e27	Merge branch 'master' into events	2019-03-08 15:56:50 +01:00
Jim LAURIE	be36c280f3	Fix lint	2019-03-08 15:53:58 +01:00
soupette	b6907e6f10	Fix PR feedback	2019-03-07 16:06:02 +01:00
Jim LAURIE	8640864b71	Merge branch 'master' into fix/confirm-email-token	2019-03-06 17:57:52 +01:00
Jim LAURIE	d5da04cfe4	Merge branch 'master' into fix/confirmation-email-bad-token	2019-03-06 17:57:26 +01:00
Jim LAURIE	720bb53858	Merge branch 'master' into fix/users-count-role-sql	2019-03-02 13:48:53 +01:00
Jim LAURIE	d110a942eb	Remove token from register route if confirm email is required	2019-03-01 16:28:44 +01:00
Jim LAURIE	53e82cde6a	Fix bad token for confirmation link	2019-03-01 15:01:09 +01:00
Aurélien Georget	9090c8effd	Fix conflicts	2019-03-01 12:55:43 +01:00
Jim LAURIE	cca2ea98dc	Fix user count per role on SQL database	2019-03-01 10:52:52 +01:00
EpicUsaMan	ae50cace6e	Fix for SQLite	2019-02-28 19:27:36 +02:00
EpicUsaMan	32361e2949	Fix for SQLite	2019-02-28 19:22:01 +02:00
Aurélien Georget	03d212d10f	Fix conflicts	2019-02-28 14:44:01 +01:00
soupette	28bc9f23a8	Change paths in users-permissions	2019-02-22 11:16:42 +01:00
Aurélien Georget	4f322de0fd	Add events on the users & permissions settings part	2019-02-21 16:48:59 +01:00
Jim LAURIE	14e3b8fdbb	3.0.0-alpha.24.1	2019-02-19 11:29:51 +01:00
Jim LAURIE	a74c38ff65	3.0.0-alpha.24	2019-02-19 10:16:24 +01:00
virginieky	cfca438767	Merge branch 'master' into ctm-edit-links	2019-02-18 19:41:35 +01:00
virginieky	6ff17263e9	Merge branch 'master' into ctm-edit-links	2019-02-18 19:41:13 +01:00
Jim LAURIE	a26ac6c6c3	Merge branch 'master' into enhancement-install-cmd	2019-02-18 15:57:25 +01:00
soupette	928971b1e3	Fix PR feedback and change stores name with <pluginId>_<containerName>	2019-02-14 09:48:39 +01:00
Aurélien Georget	8170d061c3	Fix conflicts	2019-02-12 17:01:36 +01:00
Aurelsicoko	39c4f558ec	Using cross-env and rimraf as direct devDependencies	2019-02-12 14:40:55 +01:00
soupette	9e1084ed04	Harmonize pluginId between plugins	2019-02-11 18:56:17 +01:00
soupette	39934fd360	Remove single store for upload	2019-02-11 14:05:06 +01:00
soupette	72cc7d0837	Remove separate store for users-permissions	2019-02-11 13:55:49 +01:00
Jim LAURIE	92abd536cb	Merge branch 'master' into master	2019-02-10 17:26:18 +01:00
Ky	c1ffbbfb57	Content manager Links with injected components (UI in progress)	2019-02-08 19:23:02 +01:00
Jim LAURIE	42b4a56c0a	3.0.0-alpha.23.1	2019-02-07 13:08:41 +01:00
Jim LAURIE	ff84a82466	3.0.0-alpha.23	2019-02-07 10:40:33 +01:00