33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	e98589e130	Merge branch 'master' into master	2018-09-29 14:29:25 +02:00
Jim LAURIE	aea7e1f486	Merge pull request #2043 from BraydenGirard/patch-1 ... Updated docs for MLab example configuration	2018-09-28 19:47:26 +02:00
Jim LAURIE	025eba1bb8	Merge branch 'master' into patch-1	2018-09-28 19:47:09 +02:00
Jim LAURIE	377a63d590	Merge pull request #2040 from strapi/fix/1785 ... Fix the same password requirements when registering a user	2018-09-28 19:44:29 +02:00
Jim LAURIE	bff434f3ad	Merge branch 'master' into fix/1785	2018-09-28 19:43:19 +02:00
Jim LAURIE	455077b786	Delete log	2018-09-28 19:43:03 +02:00
Jim LAURIE	c333963b7a	Merge pull request #2041 from strapi/fix/1823 ... Allow any valid JSON in the content manager	2018-09-28 19:40:08 +02:00
Jim LAURIE	8e85e104cc	Merge branch 'master' into fix/1823	2018-09-28 19:40:00 +02:00
Jim LAURIE	71dbb7bc55	Merge pull request #2039 from derrickmehaffy/updateIssueTemp ... Update the Templates to ensure users are on the latest release	2018-09-28 17:35:09 +02:00
Jim LAURIE	c804978d65	Merge branch 'master' into updateIssueTemp	2018-09-28 17:35:01 +02:00
Jim LAURIE	adfade414e	Merge pull request #2036 from maturanomx/fix/serverPermission ... Add execute bit to `server.js` file	2018-09-28 16:25:12 +02:00
Brayden Girard	6949720de9	Updated for MLab example configuration	2018-09-28 10:00:59 -04:00
cyril lopez	3acec21d68	Add en trad	2018-09-28 12:53:14 +02:00
cyril lopez	d992fd7464	Fixes 1785	2018-09-28 12:52:27 +02:00
cyril lopez	f593a441e6	Fixes 1823	2018-09-28 12:24:11 +02:00
DMehaffy	46b477c0b3	Update the templates	2018-09-28 03:05:55 -07:00
Martin Muzatko	f52ab10de0	fixed double entry for request in sidebar	2018-09-28 12:05:09 +02:00
Martin Muzatko	03fc2e1f0e	added docs package lifecycle hooks	2018-09-28 11:26:00 +02:00
Martin Muzatko	a9951fbe84	added redirect to latest version on docs homepage	2018-09-28 11:05:35 +02:00
Martin Muzatko	7376e49827	fixed some broken docs in v1	2018-09-28 11:04:40 +02:00
Martin Muzatko	ab310dd1db	added version selector	2018-09-28 11:04:07 +02:00
Martin Muzatko	add86f2597	added sidebar config and custom markdown directives	2018-09-28 10:20:08 +02:00
Martin Muzatko	77e73cbc19	ejected theme for custom modifications	2018-09-28 10:19:11 +02:00
Özgür ERSOY	0994b05142	Update TR translations - 2 #1634	2018-09-27 22:53:39 +03:00
Özgür ERSOY	e6aea6022e	Merge pull request #3 from strapi/master ... sync	2018-09-27 22:26:52 +03:00
Alberto Maturano	6f35b53d3c	Add execute bit to server.js file ... Without this, #1967 makes no sense.	2018-09-27 12:54:49 -05:00
Jim LAURIE	63b44b173e	Merge pull request #2027 from strapi/order-translation-key ... Reorder translation keys	2018-09-27 18:39:42 +02:00
Jim LAURIE	1f56c823e9	Merge branch 'master' into order-translation-key	2018-09-27 18:39:22 +02:00
Jim LAURIE	aa70eb2bd9	Merge pull request #1928 from uyouthe/master ... Font-family declarations fixed	2018-09-27 18:32:15 +02:00
Jim LAURIE	29409f9531	Merge branch 'master' into master	2018-09-27 18:32:03 +02:00
hhh	4fc6cb84b2	Merge branch 'master' into update-doc-requirement	2018-09-27 23:54:50 +08:00
henrych4	6f9130179d	fix typo and add requirements for other databases	2018-09-27 23:54:55 +08:00
Jim LAURIE	f969853c60	Merge pull request #1982 from Tonours/bf/1847-drag-drop-image-save ... Fix drag drop image not saved in WYSIWYG.	2018-09-27 17:20:50 +02:00
Jim LAURIE	8ea46642dc	Merge branch 'master' into bf/1847-drag-drop-image-save	2018-09-27 17:20:40 +02:00
cyril lopez	a4d511a124	Update front-end dependencies ... Move to react, redux, immutable @latest. Note: prepare for upgrading webpack.	2018-09-27 15:19:09 +02:00
cyril lopez	199139ada2	Update mongoose	2018-09-27 14:40:24 +02:00
cyril lopez	3dca9151d2	Remove gitbook-cli	2018-09-27 13:59:11 +02:00
cyril lopez	bcf1b99c9b	Delete useless test.sh file and remove mocha.	2018-09-27 13:57:44 +02:00
cyril lopez	9156865f6a	Remove useless dependencies in strapi helper plugin	2018-09-26 18:24:42 +02:00
cyril lopez	57ef0ce36f	Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth	2018-09-26 15:42:28 +02:00
henrych4	9ae159e093	update node and npm requirement on both github issue template and doc	2018-09-26 21:37:14 +08:00
Jim LAURIE	070f398044	Reorder translation keys	2018-09-26 15:15:48 +02:00
cyril lopez	77d9677c03	Fix proptypes	2018-09-26 15:07:53 +02:00
cyril lopez	c49cc5f97b	Check auth on aws	2018-09-26 14:43:10 +02:00
Jim LAURIE	bf355c8911	Merge pull request #2021 from strapi/3.0.0-alpha.14.2 ... 3.0.0-alpha.14.2	2018-09-26 12:19:16 +02:00
Jim LAURIE	46c9b0f966	3.0.0-alpha.14.2 v3.0.0-alpha.14.2	2018-09-26 11:08:10 +02:00
cyril lopez	01f88c43dc	Change register condition	2018-09-25 17:38:38 +02:00
cyril lopez	d96b888cc6	Improve login	2018-09-25 17:11:14 +02:00
cyril lopez	98d89475d4	Merge branch 'master' of github.com:strapi/strapi into split-admin-dev	2018-09-25 15:48:40 +02:00
cyril lopez	989b867714	Split admin entry point between dev and prod	2018-09-25 15:01:06 +02:00