6955 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	26e7b39faa	Merge pull request #2759 from strapi/fix-where-array ... Fix ternary condition	2019-02-05 12:26:09 +01:00
Jim LAURIE	f015d7bb2a	Fix condition with int instead of string	2019-02-05 12:17:27 +01:00
Jim LAURIE	cd729ec0da	Fix ternary condition	2019-02-05 11:59:06 +01:00
Jim LAURIE	a4df0ac217	Merge pull request #2749 from strapi/lauriejim-patch-1 ... Fix type form if command line config for tests	2019-02-04 15:52:23 +01:00
Jim LAURIE	9cd1e0fb5a	Fix type form if command line config for tests	2019-02-04 15:51:18 +01:00
Jim LAURIE	0741a7f474	Merge pull request #2748 from strapi/lauriejim-patch-1 ... Fix mysql and pg test connection	2019-02-04 15:41:12 +01:00
Jim LAURIE	8334ca6088	Fix mysql and pg test connection	2019-02-04 15:39:47 +01:00
Jim LAURIE	5ed07cb27a	Merge pull request #2732 from strapi/quickstart ... Add quickstart mode	2019-02-01 17:26:16 +01:00
Jim LAURIE	56979f692a	Fix typo	2019-02-01 17:25:04 +01:00
Jim LAURIE	4e9ba1280b	Add documentation	2019-02-01 15:19:22 +01:00
Jim LAURIE	1fab158880	Add quickstart mode	2019-02-01 14:56:46 +01:00
Jim LAURIE	c0cb8b5012	Merge pull request #2716 from tpiros/patch-1 ... Update quick-start.md	2019-01-31 18:21:12 +01:00
Jim LAURIE	afc9263b38	Merge branch 'master' into patch-1	2019-01-31 18:18:13 +01:00
Jim LAURIE	7c74202076	Merge pull request #2719 from strapi/ui/minor-updates ... Fix links HomePage	2019-01-31 18:08:23 +01:00
Jim LAURIE	f7e25c34e8	Merge branch 'master' into ui/minor-updates	2019-01-31 18:08:15 +01:00
Jim LAURIE	6c5596675b	Merge pull request #2722 from strapi/fix/tradfr ... Update FR translation	2019-01-31 15:28:16 +01:00
Jim LAURIE	205a1007b2	Merge branch 'master' into fix/tradfr	2019-01-31 15:28:08 +01:00
Jim LAURIE	7d8507573f	Merge pull request #2562 from strapi/sqlite-support ... Add SQLite support	2019-01-31 15:16:00 +01:00
Jim LAURIE	9c40831c1a	Merge branch 'sqlite-support' of github.com:strapi/strapi into sqlite-support	2019-01-31 15:15:36 +01:00
Jim LAURIE	b1a47ff075	Disable warn log	2019-01-31 15:14:50 +01:00
Jim LAURIE	03597170f6	Merge branch 'master' into sqlite-support	2019-01-31 14:52:06 +01:00
Jim LAURIE	872e0c9fe7	Fix restart update db and remove logs	2019-01-31 14:50:43 +01:00
Jim LAURIE	f461cd2121	Merge pull request #2725 from strapi/lauriejim-patch-1 ... Hotfix database name variable	2019-01-31 14:41:41 +01:00
Jim LAURIE	6af2444309	Hotfix database name variable	2019-01-31 14:40:55 +01:00
Jim LAURIE	6cbddab6c8	Fix PR feedback	2019-01-31 14:17:52 +01:00
Jim LAURIE	fdcecff2e6	Add test and fix model update	2019-01-31 14:05:59 +01:00
Jim LAURIE	3db3b93fdb	Merge branch 'master' into sqlite-support	2019-01-31 11:15:19 +01:00
Ky	1cf546536f	HomePage fr trad fix	2019-01-30 19:19:37 +01:00
Jim LAURIE	079685aa2b	Merge pull request #2658 from strapi/split-ctm-settings-view ... Split content-manager setting view into tabs.	2019-01-30 18:26:48 +01:00
Jim LAURIE	0684628985	Merge branch 'master' into split-ctm-settings-view	2019-01-30 18:24:47 +01:00
Jim LAURIE	52c559985f	Merge pull request #2692 from NeOMakinG/fix/2688 ... Fixing GraphQL timestamps	2019-01-30 17:52:30 +01:00
Jim LAURIE	818fda97de	Merge branch 'master' into fix/2688	2019-01-30 17:52:18 +01:00
Jim LAURIE	493e7a069f	Don't need this mapping since it's the same key	2019-01-30 17:51:23 +01:00
Jim LAURIE	ea3a7da846	Merge pull request #2659 from strapi/fix/#1960 ... Fix InputDate not working	2019-01-30 17:39:46 +01:00
Jim LAURIE	2199fa3943	Merge branch 'master' into fix/#1960	2019-01-30 17:39:35 +01:00
Jim LAURIE	02a0a3dba3	Fix date format	2019-01-30 17:38:54 +01:00
soupette	8b602c6273	Fix links HomePage and remove letter-spacing in ctm table	2019-01-30 15:21:31 +01:00
Jim LAURIE	c72d5698d8	Merge pull request #2690 from strapi/design/marketplace ... Redesign marketplace and add new blocker component	2019-01-30 14:35:55 +01:00
Jim LAURIE	12e673a9d6	Merge branch 'master' into design/marketplace	2019-01-30 14:35:38 +01:00
Jim LAURIE	1823c1ae61	Merge pull request #2718 from derrickmehaffy/enhancement/bigint_backend ... Fix Bookshelf big integer - backend only	2019-01-30 13:59:38 +01:00
DMehaffy	590012a8f1	Temp fix for bookshelf bigint	2019-01-30 05:53:10 -07:00
Jim LAURIE	c201401239	Merge pull request #2717 from strapi/event/install ... Add new installation event	2019-01-30 13:44:28 +01:00
soupette	5a70c66f21	Remove documentation files	2019-01-30 13:44:27 +01:00
Jim LAURIE	66ce6f5298	Merge branch 'master' into event/install	2019-01-30 13:44:22 +01:00
soupette	fc73f90d75	Force overlayBlocker to be displayed when installing a plugin	2019-01-30 13:40:12 +01:00
soupette	3366825452	Remove cache on fetch oplugins	2019-01-30 13:25:08 +01:00
soupette	eb7daf9a73	Created new container for marketplace	2019-01-30 12:01:17 +01:00
Tamas Piros	95698a59b4	Update quick-start.md ... Changed incorrect "npm setup" command to "npm run setup"	2019-01-30 10:51:44 +01:00
Aurélien Georget	a2d8d622b0	Add success event during installation	2019-01-30 10:40:51 +01:00
Jim LAURIE	81918a55e7	Merge pull request #2711 from furedal/patch-1 ... Added missing region eu-north-1 (Stockholm) to AWS S3 upload	2019-01-30 09:04:18 +01:00