9273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
uyouthe	2f2ad51804	Font-family declarations fixed	2018-09-10 20:59:33 +03:00
Jim LAURIE	34a4f3139b	Merge pull request #1926 from abhirathore2006/ContentTypeBuilder-plugin-bug-fix ... Fix content type generation with bookshelf.	2018-09-10 18:40:45 +02:00
Jim LAURIE	090d9f4116	Merge branch 'master' into ContentTypeBuilder-plugin-bug-fix	2018-09-10 18:40:21 +02:00
Jim LAURIE	f926f16e23	Merge pull request #1570 from anshulk/master ... Lowercase email on local auth register	2018-09-10 17:38:27 +02:00
Jim LAURIE	d2eb881ca8	Merge branch 'master' into master	2018-09-10 17:38:12 +02:00
Jim LAURIE	7835d0e8c0	Merge pull request #1854 from strapi/fix-file-reload ... Fix auto-reload on file change	2018-09-10 15:13:13 +02:00
Jim LAURIE	c68fdb1120	Merge branch 'master' into fix-file-reload	2018-09-10 15:12:52 +02:00
Abhimanyu	6bba0c8db6	content-type-builder bugfix - Cannot read property 'toJS' of undefined	2018-09-10 17:04:21 +05:30
Jason Lei	4be3154e98	GraphQL Mutations and Aggregations Documentation.	2018-09-10 16:10:09 +08:00
Jason Lei	3378403954	GraphQL Mutations, Aggregations, Decimals ... Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).	2018-09-10 16:05:00 +08:00
Jim LAURIE	b4dedc12f1	Merge pull request #1872 from hansemannn/patch-1 ... Add reference about production databases	2018-09-09 14:53:11 +02:00
Jim LAURIE	048d36173d	Merge branch 'master' into patch-1	2018-09-09 14:53:01 +02:00
Jim LAURIE	c97f352b19	Merge pull request #1893 from nobodywithbody/fix/remove-old-file ... Fix remove all files in item and add one	2018-09-09 14:50:36 +02:00
Jim LAURIE	d9e3fde726	Merge branch 'master' into fix/remove-old-file	2018-09-09 14:32:33 +02:00
Jim LAURIE	d1ae79271d	Merge pull request #1921 from bardaq/patch-1 ... Update RU translations	2018-09-09 14:04:11 +02:00
Jim LAURIE	f729bb39cb	Merge branch 'master' into patch-1	2018-09-09 14:03:53 +02:00
Jim LAURIE	c23c323d69	Merge branch 'master' into fix-file-reload	2018-09-09 13:53:23 +02:00
Jim LAURIE	f1a7895a6c	Merge pull request #1916 from strapi/fix-1903 ... Clean layout on content type delete	2018-09-09 13:32:58 +02:00
Jim LAURIE	28580a7ee5	Merge branch 'master' into fix-1903	2018-09-09 13:32:34 +02:00
DmitryKlymenko	fdddab4ca8	Update ru.json	2018-09-09 12:43:19 +03:00
Salem	80d40db66c	Merge branch 'master' into master	2018-09-07 21:42:51 +03:00
soupette	b8e42c55d6	Fix conflict	2018-09-07 17:47:04 +02:00
Jim LAURIE	c9cdab31d5	Merge pull request #1917 from strapi/fix-build ... Fix build	2018-09-07 17:44:31 +02:00
Jim LAURIE	aef1af3140	Merge branch 'master' into fix-build	2018-09-07 17:44:01 +02:00
soupette	c865109337	Fixes #1914	2018-09-07 17:29:33 +02:00
Jim LAURIE	923226dc29	Merge pull request #1727 from strapi/enhancement/front-start ... Open admin on strapi start	2018-09-07 17:06:20 +02:00
Jim LAURIE	145f22ee1e	Update random	2018-09-07 17:02:32 +02:00
soupette	270064e0cf	Add error to LoadingIndicatorPage	2018-09-07 16:46:16 +02:00
Jim LAURIE	6fcaf96806	Clean layout on content tyep delete fix #1903	2018-09-07 15:59:59 +02:00
Jim LAURIE	31391ec711	Merge branch 'master' into enhancement/front-start	2018-09-07 15:14:55 +02:00
soupette	1e0b45f32a	Remove loadable	2018-09-07 13:09:35 +02:00
soupette	b2d55b13a3	Fix pinput file	2018-09-07 12:47:45 +02:00
Jim LAURIE	674e323d88	Merge pull request #1855 from strapi/fix-date ... Fix saved date format content manager	2018-09-07 12:33:22 +02:00
Jim LAURIE	1eb944b7f1	Merge branch 'master' into fix-date	2018-09-07 12:32:40 +02:00
soupette	4709b7996e	Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes	2018-09-07 12:24:41 +02:00
soupette	e46567db42	Add description to missing routes	2018-09-07 12:23:13 +02:00
soupette	f572780930	Update users-perm routes actionTypes	2018-09-07 10:33:40 +02:00
Salem Yaslem	51d64acb1e	update strapi-plugin-content-manager arabic translate	2018-09-07 02:34:57 +03:00
Salem Yaslem	8bde839f86	update strapi-plugin-content-type-builder arabic translate	2018-09-07 02:15:00 +03:00
Salem Yaslem	3debbddaeb	update strapi-admin arabic translate	2018-09-07 02:07:06 +03:00
soupette	aa22123917	Add default doc in users-permissions plugin	2018-09-06 19:06:19 +02:00
Jim LAURIE	9dbe885836	Merge pull request #1830 from andfk/master ... Ability to emit errors to Koa	2018-09-06 18:17:22 +02:00
Jim LAURIE	f79f444d99	Merge branch 'master' into master	2018-09-06 18:17:16 +02:00
Jim LAURIE	09451dd94b	Merge pull request #1881 from nobodywithbody/fix/reset-image-preview ... Reset image preview - clear label and icon preview	2018-09-06 18:16:01 +02:00
Jim LAURIE	3fe7f0cf2a	Merge branch 'master' into fix/reset-image-preview	2018-09-06 18:15:29 +02:00
Jim LAURIE	751a1e75ff	Merge pull request #1889 from nobodywithbody/fix/success-delete-notification ... Add notification for delete all types	2018-09-06 18:12:54 +02:00
Jim LAURIE	6942d0ce39	Merge branch 'master' into fix/success-delete-notification	2018-09-06 18:12:31 +02:00
Vladislav Arsenev	5f9e57c221	Merge branch 'master' into fix/remove-old-file	2018-09-06 14:03:59 +03:00
soupette	fc2dcfb420	Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes	2018-09-06 10:12:04 +02:00
soupette	9daf8c4403	Add descriptions to email routes	2018-09-06 10:11:38 +02:00