1130 Commits

Author	SHA1	Message	Date
invader	fe7cef549d	admin: update ru locale for home page welcome block	2019-01-06 22:20:14 +03:00
invader	71cac31e57	admin: fix typos and punctuation in ru locale	2019-01-06 21:44:52 +03:00
Aurélien Georget	b501e8bb1b	Resolve conflicts	2019-01-05 20:33:47 +01:00
Jim LAURIE	09530e9cd9	3.0.0-alpha.18	2019-01-04 11:23:15 +01:00
Jim LAURIE	45bcaf770b	Update to 2019	2019-01-02 09:41:53 +01:00
Jim LAURIE	fd3ae96498	3.0.0-alpha.17	2018-12-18 14:37:15 +01:00
Jim LAURIE	596d4dd791	Merge branch 'master' into add-cypress	2018-12-12 20:18:57 +01:00
Jim LAURIE	29624bfa7e	Merge branch 'master' into add-snyk	2018-12-12 12:05:02 +01:00
soupette	a401739405	Fix lang issue	2018-12-12 11:55:17 +01:00
soupette	27df580edb	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-11 12:12:53 +01:00
Jim LAURIE	ecfe9d820b	Merge pull request #2440 from strapi/revert-fa ... Revert FA language	2018-12-10 16:55:41 +01:00
Jim LAURIE	62e42fb6f6	Merge branch 'master' into fix-path-of-contentTypes	2018-12-07 17:24:08 +01:00
Aurélien Georget	e1ce257d2f	Revert codebase and apply limit, skip, start and sort parameters	2018-12-06 18:11:53 +01:00
Jim LAURIE	a90e206579	Revert FA language	2018-12-06 12:20:32 +01:00
soupette	636cb54c29	Add snyk	2018-12-05 15:42:58 +01:00
Jim LAURIE	a75e0c5485	3.0.0-alpha.16	2018-12-04 18:31:19 +01:00
Jim LAURIE	03c1e04d87	Revert filter PR	2018-12-04 17:05:03 +01:00
soupette	43e02ffb3d	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-12-03 11:24:03 +01:00
Jim LAURIE	f2ec28907e	Merge branch 'master' into master	2018-11-29 11:45:42 +01:00
Jim LAURIE	c126b94325	Merge branch 'master' into fixNodeVersions	2018-11-29 11:21:55 +01:00
Jim LAURIE	fb03d4f18c	3.0.0-alpha.15	2018-11-28 14:55:41 +01:00
DMehaffy	ecb6baaea5	Update all the packages and generated json	2018-11-28 00:14:12 -07:00
soupette	80adfdfde8	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-22 19:45:31 +01:00
henrych4	446a4d0cf7	fix path of contentTypesToShow	2018-11-21 21:33:43 +08:00
Jim LAURIE	ef0f40701f	Merge branch 'master' into fix/css-container-fluid	2018-11-21 11:56:19 +01:00
soupette	bba6f9d85f	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-20 18:46:31 +01:00
Aurelsicoko	4ad6417e62	Add an easy way to disable tracking by removing the uuid	2018-11-20 16:20:52 +01:00
Aurelsicoko	283ed29f47	Move component	2018-11-20 16:04:59 +01:00
Aurelsicoko	6308c71d6e	Add FullStory component	2018-11-20 15:02:48 +01:00
Amir Reza Dalir	9e4d5abbff	Merge pull request #1 from dalirnet/develop ... Develop	2018-11-17 16:18:02 +03:30
soupette	fc7ef829a0	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-16 17:13:14 +01:00
Amir Reza Dalir	5489dd6338	JSON format fix	2018-11-16 01:39:55 +03:30
Amir Reza Dalir	b15e54a0b0	Added flag of Iran	2018-11-16 01:24:15 +03:30
Amir Reza Dalir	599f525f13	Add fa language	2018-11-16 00:56:59 +03:30
Amir Reza Dalir	e9301725f1	Add FA translations ... add Persian(fa) translations	2018-11-16 00:51:31 +03:30
soupette	d9ee893c8f	Merge branch 'master' of github.com:strapi/strapi into add-cypress	2018-11-14 18:20:40 +01:00
soupette	3cb1291eed	Fix bugs and add ids	2018-11-14 18:19:35 +01:00
Alberto Maturano	90fba032d4	style: Improves spanish translation ... issue #1621	2018-11-13 16:02:25 -06:00
Dimitri Nicolas	e18bf9198b	Change containerFluid child margin for better grid alignement	2018-11-13 17:21:31 +01:00
soupette	779f575b47	Access reducer from cypress	2018-11-13 16:53:50 +01:00
Jim LAURIE	8fcf2ed8ae	3.0.0-alpha.14.5	2018-11-13 14:50:07 +01:00
Jim LAURIE	41e217674b	Merge branch 'master' into fix/depreaction-warnings-admin	2018-11-09 14:24:22 +01:00
Jim LAURIE	66a1e0c291	Merge branch 'master' into feature/2108_handle_redirect_after_password_reset	2018-11-08 11:28:44 +01:00
cyril lopez	de89b3156f	Fix redux-sagas deprecation warnings	2018-11-06 09:56:27 +01:00
Jim LAURIE	b8d8f7a297	Merge branch 'master' into fix/2213	2018-11-05 17:28:56 +01:00
aDeve	d07edb0c5b	fix error : add _.get to prevent it	2018-11-05 13:34:45 +01:00
cyril lopez	377da271e4	Fix lint from master	2018-11-05 11:31:36 +01:00
cyril lopez	a20e827b38	Merge branch 'master' of github.com:strapi/strapi into fix/2213	2018-11-05 11:09:50 +01:00
dimitrinicolas	f168da8acc	Fix responsive admin headers	2018-11-04 12:47:55 +01:00
dimitrinicolas	3d4d4c0525	Update FR translations	2018-11-04 12:28:04 +01:00