29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	af11222622	Merge pull request #2859 from dev-drprasad/add-granularity-of-max-size-upload-for-file-upload ... Add granularity of 'max size upload' for file upload (< 1MB)	2019-03-07 14:37:00 +01:00
Jim LAURIE	26ac833855	Merge branch 'master' into add-granularity-of-max-size-upload-for-file-upload	2019-03-07 14:36:32 +01:00
Jim LAURIE	f1f4728d29	Merge pull request #2706 from brinley/patch-2 ... Updated notifications container position to fixed	2019-03-07 14:35:59 +01:00
Ky	359fdede29	merge	2019-03-07 14:30:09 +01:00
Ky	86f9f2fc41	HomePage with model removing	2019-03-07 14:28:50 +01:00
Jim LAURIE	cfd8e4414b	Merge branch 'master' into patch-2	2019-03-07 14:26:36 +01:00
davidkartuzinski	fdce979c31	I made the changes. Changed images, etc.	2019-03-07 14:16:22 +01:00
Jim LAURIE	768ad2ffcd	Merge pull request #2664 from derrickmehaffy/enhancement/bigint ... Add Big Integer to adminUI	2019-03-07 13:53:58 +01:00
Jim LAURIE	8241863444	Merge branch 'master' into enhancement/bigint	2019-03-07 13:42:16 +01:00
soupette	a35d402bde	Created commonPropTypes folder to avoid code duplication	2019-03-07 11:39:55 +01:00
DMehaffy	8a20a151d0	Temporary fix for SQL Mutation Updates	2019-03-07 02:54:19 -07:00
Jim LAURIE	6db92eb17b	Merge pull request #2909 from EpicUsaMan/patch-5 ... Fix for UPPERCASE / camelCase names	2019-03-07 10:20:03 +01:00
Jim LAURIE	2422e3c87b	Merge branch 'master' into patch-5	2019-03-07 10:19:30 +01:00
soupette	38071a8123	Add pluginHeader	2019-03-06 19:20:27 +01:00
soupette	b4b025cd17	Display menu in modelPage	2019-03-06 18:50:52 +01:00
Jim LAURIE	5924ed2f5d	Merge pull request #2918 from strapi/enhancement/file-email-provider-orga ... Manage email and upload providers from an npm organisation	2019-03-06 18:02:04 +01:00
Jim LAURIE	84d50b78c1	Merge branch 'master' into enhancement/file-email-provider-orga	2019-03-06 18:01:42 +01:00
Jim LAURIE	d352948639	Merge pull request #2916 from strapi/fix/confirm-email-token ... Remove token from register route if confirm email is required	2019-03-06 17:58:18 +01:00
Jim LAURIE	8640864b71	Merge branch 'master' into fix/confirm-email-token	2019-03-06 17:57:52 +01:00
Jim LAURIE	eb70b66e01	Merge pull request #2915 from strapi/fix/confirmation-email-bad-token ... Fix bad token for confirmation link	2019-03-06 17:57:35 +01:00
Jim LAURIE	d5da04cfe4	Merge branch 'master' into fix/confirmation-email-bad-token	2019-03-06 17:57:26 +01:00
Ky	9f0f6859ba	merge	2019-03-06 17:07:28 +01:00
Ky	b31017ee77	HomePage in progress	2019-03-06 17:03:30 +01:00
soupette	e2de03a862	Init ModelPage and prepare menu	2019-03-06 16:43:20 +01:00
soupette	561fe2f1a8	Add tests to app container	2019-03-06 16:22:32 +01:00
soupette	916ebff9d4	Init new ctb	2019-03-06 15:17:53 +01:00
soupette	554faaf9c7	Add test config	2019-03-06 09:54:29 +01:00
cupofnestor	28cb54297f	Merge pull request #3 from strapi/master ... updating my fork	2019-03-05 16:09:31 -05:00
EpicUsaMan	38887214ed	Add support for array of methods to plugins	2019-03-05 22:03:52 +02:00
EpicUsaMan	585051b77f	Remove unused code	2019-03-05 21:12:35 +02:00
EpicUsaMan	3acebcffc0	Support array of methods in documentation plugin	2019-03-05 20:55:46 +02:00
REDDY PRASAD	9ef5910569	👽 Add translations for error messages of FileUpload plugin	2019-03-04 10:44:16 +05:30
REDDY PRASAD	5539a3e27c	💅 Show proper error messages for 'File Upload' plugin	2019-03-02 19:53:33 +05:30
Jim LAURIE	f691542184	Merge pull request #2905 from henrych4/fix-mongoose-update-hook ... Trigger beforeUpdate and afterUpdate hooks when update document	2019-03-02 15:13:33 +01:00
Jim LAURIE	b5fe3fd376	Merge branch 'master' into fix-mongoose-update-hook	2019-03-02 15:13:06 +01:00
Jim LAURIE	45f0e08e33	Merge pull request #2855 from ReesesSnickers/patch-1 ... Updated minor grammar defect on Installation documentation	2019-03-02 14:07:54 +01:00
Jim LAURIE	193d2bdc93	Merge branch 'master' into patch-1	2019-03-02 14:07:46 +01:00
Jim LAURIE	28506035cf	Remove logs	2019-03-02 14:02:40 +01:00
Jim LAURIE	4c693388b4	Merge pull request #2842 from JABedford/text-fixes ... Grammar fixes to strapi-new start up console log.	2019-03-02 13:59:12 +01:00
Jim LAURIE	bee2de3de3	Merge branch 'master' into text-fixes	2019-03-02 13:58:24 +01:00
Jim LAURIE	c7b0409613	Merge pull request #2802 from fromjonathan/patch-1 ... Improved educational flow and language.	2019-03-02 13:57:05 +01:00
Jim LAURIE	aa50a35593	Merge branch 'master' into patch-1	2019-03-02 13:56:51 +01:00
Jim LAURIE	8acb7b2c45	Update role name	2019-03-02 13:56:26 +01:00
Jim LAURIE	0d731bf8cb	Merge pull request #2911 from strapi/fix/users-count-role-sql ... Fix user count per role on SQL database	2019-03-02 13:49:01 +01:00
Jim LAURIE	720bb53858	Merge branch 'master' into fix/users-count-role-sql	2019-03-02 13:48:53 +01:00
Jim LAURIE	4286987d90	Merge pull request #2906 from strapi/add/npmLock ... Forcefully disable package-lock generation	2019-03-02 13:48:34 +01:00
Jim LAURIE	898c9c2aca	Merge branch 'master' into add/npmLock	2019-03-02 13:48:26 +01:00
Jim LAURIE	dac168cedb	Manage email and upload providers from an npm organisation	2019-03-01 17:09:19 +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