3454 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Abdón Rodríguez Davila	cc20511838	Avoid username capitalize	2018-02-27 10:00:59 +01:00
Jim LAURIE	822e513e5d	Merge pull request #704 from moersoy/patch-1 ... new texts translated	2018-02-27 09:56:28 +01:00
Jørgensen	4e404b149e	Update logger.js ... Added environment variables to configure strapi logger.	2018-02-27 09:08:31 +01:00
Özgür ERSOY	f8605e5037	new texts translated	2018-02-26 21:47:16 +03:00
Jim LAURIE	f0706d474c	Merge branch 'master' into alpha.10.3 v3.0.0-alpha.10.3	2018-02-26 18:15:49 +01:00
Jim Laurie	99559e20ea	3.0.0-alpha.10.3	2018-02-26 17:57:23 +01:00
Jim Laurie	15544528dc	Remove node_modules folder for alpha.10.3	2018-02-26 17:11:31 +01:00
Jim Laurie	7af7922f2b	Backend content type builder media type ... Co-authored-by: soupette <cyril.lpz@gmail.com>	2018-02-26 16:33:27 +01:00
Jim Laurie	0d7a66b19f	Merge branch 'feature/upload' of github.com:strapi/strapi into add-media-ctb	2018-02-26 14:53:19 +01:00
Aurelsicoko	fb549945a1	Fix oneToMany relationship	2018-02-26 14:39:06 +01:00
cyril lopez	77800ced88	Create ConfigPage container	2018-02-26 12:16:15 +01:00
Jim Laurie	c5fbedece3	Merge branch 'master' of github.com:strapi/strapi into add-media-ctb	2018-02-26 11:42:13 +01:00
Jim LAURIE	1e55e1e350	Merge pull request #700 from strapi/hotfix-upload ... Fix upload plugin build	2018-02-26 11:41:45 +01:00
cyril lopez	2f84afc0c7	Fix upload plugin build ... The issue was due to the ref I was using	2018-02-26 11:39:50 +01:00
Jim Laurie	d7279f4584	Merge branch 'master' of github.com:strapi/strapi into add-media-ctb	2018-02-26 11:22:46 +01:00
Aurelsicoko	7e6b762c58	Merge branch 'master' of github.com:strapi/strapi into feature/upload	2018-02-26 11:14:24 +01:00
Aurelsicoko	e63a1f19fc	Handle empty relationships on morph side	2018-02-26 11:12:49 +01:00
Jim LAURIE	dc55cfb879	Merge pull request #692 from strapi/file-upload-front ... File upload front	2018-02-26 11:12:13 +01:00
cyril lopez	56466a4bc0	Fix typos	2018-02-26 10:55:41 +01:00
cyril lopez	b2b5ff5fb0	Merge branch 'master' of github.com:strapi/strapi into file-upload-front	2018-02-26 10:55:11 +01:00
Jim LAURIE	d94c7e80af	Merge pull request #697 from strapi/fix-role-update ... Fix remove user on role update fix #688	2018-02-26 10:30:30 +01:00
Jim LAURIE	d1c85cf2ca	Merge pull request #696 from strapi/fix-icons ... Add t-shirt icon in marketplace	2018-02-26 10:30:15 +01:00
Jim Laurie	443d6b81fb	Fix remove user on role update	2018-02-24 17:42:33 +01:00
Jim Laurie	03696df06a	Add t-shirt icon in marketplace	2018-02-24 16:22:59 +01:00
Jim Laurie	6c4e837c7c	Hotfix users models relations	2018-02-24 14:35:12 +01:00
Jim Laurie	60f1fc3b94	Change node version needed	2018-02-23 23:10:27 +01:00
cyril lopez	e2bc04b66f	Merge branch 'master' of github.com:strapi/strapi into file-upload-front	2018-02-23 17:01:49 +01:00
cyril lopez	5972cf2d10	Remove test relations	2018-02-23 16:58:00 +01:00
cyril lopez	b5192d9b61	Add media type to ctb ... Prevent error if enumeration type is displayed Add tab navigation to popup choose attr	2018-02-23 16:49:50 +01:00
Jim LAURIE	967fa32985	Merge pull request #684 from strapi/file-upload-s3 ... File upload s3	2018-02-23 16:23:48 +01:00
Jim LAURIE	57acb6f9bf	Merge branch 'master' into file-upload-s3	2018-02-23 16:00:01 +01:00
Jim LAURIE	e6aa29fa70	Merge pull request #687 from strapi/relations/polymorphic ... Relations/polymorphic	2018-02-23 15:54:42 +01:00
cyril lopez	23f4dc27cd	Fix turkish translation conflict	2018-02-23 15:47:46 +01:00
Jim Laurie	b96fa8c850	Merge branch 'file-upload-s3' of github.com:strapi/strapi into file-upload-s3	2018-02-23 15:36:45 +01:00
Jim Laurie	d1cffa7cb0	Fix test symlink 2	2018-02-23 15:35:46 +01:00
Jim LAURIE	acfbd8bcaf	Merge branch 'master' into relations/polymorphic	2018-02-23 15:29:29 +01:00
cyril lopez	a8e5da69ba	Add search file	2018-02-23 15:28:01 +01:00
Jim LAURIE	ae9880a374	Merge branch 'master' into file-upload-s3	2018-02-23 15:16:04 +01:00
Jim Laurie	e3b78019c8	Fix test symlink	2018-02-23 15:14:21 +01:00
cyril lopez	552fb48c79	Add search	2018-02-23 15:11:04 +01:00
cyril lopez	68bb91f1e6	Fix conflict	2018-02-23 15:00:38 +01:00
Jim Laurie	543f21cdb1	Fix PR feedback	2018-02-23 14:57:58 +01:00
cyril lopez	c3231b9f5e	Add sorting options and created extensions.json files ... The extensions.json file is used to associate the correct icon with the extension of a file	2018-02-23 14:57:15 +01:00
cyril lopez	c621209605	Add filters in list view	2018-02-23 12:21:57 +01:00
cyril lopez	c95d413716	Delete useless components in ctm and remove redux from app container in upload	2018-02-23 11:06:30 +01:00
cyril lopez	91f9482480	Fix css GlobalPagination	2018-02-22 18:54:24 +01:00
Aurelsicoko	c1487c08d5	Write polymorphic documentation	2018-02-22 18:28:10 +01:00
cyril lopez	9b2472e6de	Add turkish translations file	2018-02-22 18:27:33 +01:00
cyril lopez	961df0d32f	Handle file upload from list view	2018-02-22 18:24:17 +01:00
Jim LAURIE	fd7a28a236	Merge pull request #686 from moersoy/master ... Turkish language | strapi-plugin-upload	2018-02-22 17:39:20 +01:00