33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Chris Dekker	96d1eeb70b	Fix for issue https://github.com/strapi/strapi/issues/1589	2018-08-16 14:17:54 +02:00
soupette	475e93c9b9	Fix conflicts	2018-08-14 18:34:03 +02:00
soupette	9e191ebc8c	Fix z-index	2018-08-14 18:29:59 +02:00
soupette	97673e77e2	Store displayed fields in localstorage	2018-08-14 18:26:53 +02:00
soupette	97ae4b7659	Display or hide field directy from the list view	2018-08-14 17:10:23 +02:00
soupette	7a0e216b9b	Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view	2018-08-14 10:56:46 +02:00
KuongKnight	6ec3295ace	updated document	2018-08-13 10:09:38 +07:00
sundaycrafts	6d006c4794	"new" command supports mongo +srv prefix uri	2018-08-13 05:43:42 +09:00
Jim LAURIE	de33749ec1	Merge branch 'master' into block-user	2018-08-10 15:50:09 +02:00
Jim LAURIE	17c2fe1d5c	Merge pull request #1700 from strapi/fix-1660 ... Fix z-index input file	2018-08-10 15:49:41 +02:00
Luca	784e330b23	Merge branch 'master' into fix/NODE_ENV	2018-08-10 13:29:04 +02:00
soupette	688defca70	Fix conflict	2018-08-10 12:52:11 +02:00
soupette	edf81024c1	Fix design	2018-08-10 12:45:56 +02:00
Jim LAURIE	9c17701163	Merge branch 'master' into block-user	2018-08-10 10:02:52 +02:00
Jim LAURIE	63bd63bd49	Merge branch 'master' into fix-1660	2018-08-10 09:36:55 +02:00
Jakub Skořepa	4771cc9575	Revert previous changes and save hash to new field sha256	2018-08-09 19:46:23 +02:00
soupette	3feae01952	Fix edit view drag-n-drop design	2018-08-09 18:21:31 +02:00
Jim LAURIE	d30b03fd50	Merge pull request #1667 from maturano/bug/1590 ... Parse environment variables on build configuration	2018-08-09 17:52:40 +02:00
Jim LAURIE	3853e78452	Merge branch 'master' into bug/1590	2018-08-09 17:37:54 +02:00
Jim LAURIE	eada18a619	Merge pull request #1613 from synth3tk/auth-microsoft ... Add Microsoft Graph auth provider	2018-08-09 17:10:08 +02:00
soupette	3d42a91a0c	Remove react-sortable-hoc	2018-08-09 17:02:15 +02:00
Jim LAURIE	86828d731a	Merge branch 'master' into auth-microsoft	2018-08-09 16:59:00 +02:00
soupette	afa4c28378	Remove sortable-hoc and use react-dnd	2018-08-09 14:59:33 +02:00
Jim LAURIE	424ad7fff0	Merge pull request #1737 from strapi/3.0.0-alpha.13.1 ... 3.0.0-alpha.13.1	2018-08-09 14:03:38 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1 v3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
soupette	5a441a69af	Fix conflict	2018-08-09 13:39:21 +02:00
soupette	4068b02091	Move react-dnd into the shared dependencies	2018-08-09 13:36:25 +02:00
Jim LAURIE	eec423a2cd	Add confirmation email	2018-08-08 17:57:02 +02:00
Pierre Burgy	00b4fc0238	Disable eslint for app.js log	2018-08-08 17:27:47 +02:00
Pierre Burgy	2980c200af	Fix download display	2018-08-08 17:25:25 +02:00
Aurelsicoko	f0c331bd91	Send the user to the right section in the Quickstart tutorial	2018-08-08 16:43:50 +02:00
Aurelsicoko	3532b20ecf	Remove pre-checked checkbox	2018-08-08 16:34:17 +02:00
Pierre Burgy	a7f5942a72	Fix multi active left menu links	2018-08-08 16:30:24 +02:00
Pierre Burgy	e404d4cac2	Fix multi active left menu links	2018-08-08 16:30:04 +02:00
Aurelsicoko	298be5edc3	Add configuration to disable autoOpen administration	2018-08-08 15:27:17 +02:00
Aurelsicoko	cf3d0f65e2	Use create-react-app script to open browser	2018-08-08 15:21:18 +02:00
Pierre Burgy	6a7ff7ff6d	Pluralize routes	2018-08-08 14:59:10 +02:00
Jim LAURIE	1f297b6bd4	Merge pull request #1681 from strapi/rate-limit ... Add rate limit on auth routes	2018-08-08 14:50:12 +02:00
Aurélien GEORGET	cc71294de6	Fix typo contributing guide	2018-08-08 14:40:18 +02:00
Aurélien GEORGET	092cf8f763	Update CONTRIBUTING.md	2018-08-08 14:39:21 +02:00
Jim LAURIE	012cb0332b	Merge branch 'master' into rate-limit	2018-08-08 14:36:42 +02:00
Aurelsicoko	fef1b6b476	Merge branch 'enhancement/readme' of github.com:strapi/strapi into enhancement/readme	2018-08-08 14:34:10 +02:00
Aurelsicoko	499dbfd43e	Update the contributing guide	2018-08-08 14:30:40 +02:00
Jim LAURIE	0afe2eceac	Add rate limit configs	2018-08-08 14:29:10 +02:00
Jim LAURIE	f15202b306	Merge pull request #1691 from strapi/fix-hook-load ... Fix load hook	2018-08-08 14:21:12 +02:00
Jim LAURIE	ce0643e4df	Merge branch 'master' into fix-hook-load	2018-08-08 14:02:31 +02:00
DUBREZ Samuel	0377c2be36	Merge branch 'master' into patch-1	2018-08-08 13:13:59 +02:00
Jim LAURIE	c2655b2c42	Merge pull request #1701 from strapi/fix-lodash-version ... Change lodash version	2018-08-08 13:05:53 +02:00
Aurélien GEORGET	c2b97edeb2	Update README.md	2018-08-08 12:48:17 +02:00
Aurélien GEORGET	b39b9c2fc8	Update README.md	2018-08-08 12:47:28 +02:00