6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
soupette	e5e2af960c	Fix input toggle true false	2018-08-27 15:47:41 +02:00
DMehaffy	9c704f115f	Merge remote-tracking branch 'upstream/master' into fix1551	2018-08-27 06:28:34 -07:00
DMehaffy	617324abee	Basic global proxy support	2018-08-27 06:27:42 -07:00
sundaycrafts	8598483915	Merge branch 'master' into polish-pluginjs	2018-08-27 22:07:44 +09:00
sundaycrafts	ae7b470688	fix typo in comment	2018-08-27 22:03:05 +09:00
Jim LAURIE	2407b3711c	Merge pull request #1812 from strapi/fix-pluralize ... Add missing pluralize dependency	2018-08-27 15:00:06 +02:00
Jim LAURIE	bcf681d9cc	Fix space	2018-08-27 14:59:41 +02:00
Jim LAURIE	44294d228d	Add missing pluralize dep fix #1690	2018-08-27 14:57:47 +02:00
sundaycrafts	e8e2d134da	Merge branch 'master' into polish-pluginjs	2018-08-27 21:36:31 +09:00
sundaycrafts	fcd5db11fa	beautify plugins.js in strapi core	2018-08-27 21:34:50 +09:00
Jim LAURIE	8983521eb0	Merge pull request #1811 from strapi/fix/srv ... Fix srv	2018-08-27 14:06:06 +02:00
Jim LAURIE	0ac7c132fc	Fix srv	2018-08-27 14:01:56 +02:00
Vladislav Arsenev	ec681a43f0	Merge branch 'master' into fix/multiple-files-cancel	2018-08-27 11:14:11 +03:00
Vladislav Arsenev	2887f6e7be	fix: validation-check-null - add check for length property may not exist	2018-08-27 10:41:00 +03:00
Jim LAURIE	9e63da5edf	Merge pull request #1806 from strapi/fix-test-launch-jsdom ... Fix JSDOM jest tests	2018-08-26 17:15:01 +02:00
Jim LAURIE	2c4c0fd921	Fix JSDOM jest tests	2018-08-26 17:13:58 +02:00
sundaycrafts	29989db029	WIP: support srv uri	2018-08-26 04:18:09 +09:00
sundaycrafts	fc77ef67bd	fix connectivity.js uri form	2018-08-26 04:18:02 +09:00
sundaycrafts	a6dd82e64c	polish plugins.js in strapi core	2018-08-26 04:05:28 +09:00
Sean Wilson	67bd9fd115	changed "You can access to" to "You can access"	2018-08-25 01:28:47 -04:00
Vladislav Arsenev	d266961881	fix(multiple-files-cancel): discard action if canceled select file	2018-08-24 15:05:12 +03:00
Yilin Gan	ae807faacc	add documentation	2018-08-23 11:50:33 -07:00
Yilin Gan	2ede104be5	update s3 delete & upload controller	2018-08-23 11:43:05 -07:00
yummyelin	8fe1878c13	Merge branch 'master' into master	2018-08-23 10:41:13 -07:00
Jim LAURIE	d4c2cb1009	Merge pull request #1733 from strapi/email-validation ... Add confirmation email	2018-08-23 18:46:56 +02:00
Jim LAURIE	cee9fe2811	Merge branch 'master' into email-validation	2018-08-23 18:46:48 +02:00
Jim LAURIE	7fdccc62ee	PR feedback	2018-08-23 18:28:13 +02:00
Jim LAURIE	782ab60609	Merge pull request #1777 from derrickmehaffy/updateReadMe4Alpha ... Update read with Requirements	2018-08-23 17:27:44 +02:00
Jim LAURIE	930d8dac43	Merge branch 'master' into updateReadMe4Alpha	2018-08-23 17:27:33 +02:00
Jim LAURIE	b1660437d2	Merge pull request #1752 from strapi/ux/ctm-list-view ... Custom content manager columns on list view	2018-08-23 17:26:51 +02:00
Jim LAURIE	1051c1cfbb	Merge branch 'master' into ux/ctm-list-view	2018-08-23 17:24:57 +02:00
Jim LAURIE	db75fc8f3a	Merge pull request #1743 from sundaycrafts/new-command-srv-support ... "new" command supports mongo +srv prefix uri	2018-08-23 17:24:46 +02:00
Jim LAURIE	33ad03548f	Merge branch 'master' into new-command-srv-support	2018-08-23 17:20:08 +02:00
Jim LAURIE	3fbf183591	Merge pull request #1684 from strapi/settings-ctm-edit-view ... Configure the content manager's layout from the admin panel	2018-08-23 17:17:47 +02:00
Aurélien GEORGET	f5abc3e002	Update README.md	2018-08-23 12:23:37 +02:00
Aurélien GEORGET	e8b7bd478a	Update bootstrap.js	2018-08-23 12:00:46 +02:00
soupette	81c19fb3bc	Fix conflicts	2018-08-22 14:20:03 +02:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
soupette	0fd23f4c16	Add comments to Manager	2018-08-22 14:10:50 +02:00
soupette	14fc74def4	Add comments to ctm/ bootstrap file and split functions	2018-08-21 17:43:17 +02:00
Jim LAURIE	059b37291a	Merge pull request #1776 from danielehrhardt/master ... File Upload Explorer showing GB instead of MB	2018-08-21 16:48:46 +02:00
Jim LAURIE	07ca225eb0	Merge branch 'master' into master	2018-08-21 16:46:57 +02:00
soupette	d113234a95	Add comments	2018-08-21 16:40:53 +02:00
Jim LAURIE	f7f9c61461	Merge pull request #1764 from jonlov/patch-1 ... Allow global policies to be organised by folders	2018-08-21 16:39:03 +02:00
Jim LAURIE	ee2ccd76a9	Merge branch 'master' into patch-1	2018-08-21 16:27:45 +02:00
Jim LAURIE	66a2c95aaa	Merge pull request #1724 from sdubrez/patch-1 ... Update Concepts/Where are the models defined documentation	2018-08-21 16:17:53 +02:00
Jim LAURIE	e540330031	Merge branch 'master' into patch-1	2018-08-21 16:17:46 +02:00
Jim LAURIE	453d2ae474	Merge pull request #1689 from jskorepa/master ... Use actual hash instead of randomly generated string	2018-08-21 16:16:10 +02:00
Jim LAURIE	dcfc5b8c54	Merge branch 'master' into master	2018-08-21 16:16:03 +02:00
soupette	38c4fd6a47	Fix first part of PR feedback	2018-08-21 14:01:15 +02:00