6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wanfung Lee	10abf7a270	Workaround fix for react-select rerender bug ... https://github.com/JedWatson/react-select/issues/2277	2018-07-05 23:30:42 -07:00
Wanfung Lee	feae421606	Bump react-select dependency	2018-07-05 23:28:39 -07:00
cyril lopez	b9b2e55d4b	Merge branch 'master' of github.com:strapi/strapi into settings-ctm	2018-07-05 18:05:28 +02:00
cyril lopez	3bfbd6b5c4	Reset settingsPage props on unmount hook	2018-07-05 18:03:19 +02:00
cyril lopez	23a354092b	PUT new settings	2018-07-05 17:57:30 +02:00
cyril lopez	56152f4462	Update schema in ctm bootstrap file to reflect the updated values	2018-07-05 17:09:34 +02:00
Jim LAURIE	d09b0b1550	API search bookshelf	2018-07-05 11:28:55 +02:00
Kati Frantz	3ea2c2023f	update ctx.request.body to be ctx.request.body.providers, to ensure only permissions are saved to database with no extra keys	2018-07-05 09:57:42 +01:00
Kati Frantz	d3ef2f8e3c	fetch current actions from database ... use results for comparing if new actions have been added to controllers	2018-07-05 09:57:12 +01:00
Jim LAURIE	d44262e94b	API search mongoose	2018-07-05 10:22:43 +02:00
Jim LAURIE	12ee30ae92	Merge pull request #1519 from hectorgrecco/patch-1 ... Update pt-BR.json	2018-07-05 09:11:45 +02:00
Hector Grecco	5182243268	Update pt-BR.json	2018-07-04 16:45:16 -03:00
Jim LAURIE	a09eead625	Add debug option in doc	2018-07-04 18:33:50 +02:00
Jim LAURIE	6203bdc200	Fix json store object	2018-07-04 18:08:42 +02:00
Jim LAURIE	d17def7a12	Add options to disable auto table/column creation	2018-07-04 17:23:04 +02:00
cyril lopez	2ee5558272	Prevent from displaying toggle search and sort on array || json attributes	2018-07-04 17:00:03 +02:00
cyril lopez	bc248b9f54	Design setting page	2018-07-04 16:49:15 +02:00
Jim LAURIE	bc7f210771	Improve SQL table creation/update performance	2018-07-04 16:20:44 +02:00
cyril lopez	4966c78f56	Handle edit label sort and search per attr	2018-07-03 19:36:01 +02:00
cyril lopez	3e42d86460	Merge branch 'master' of github.com:strapi/strapi into settings-ctm	2018-07-03 18:31:41 +02:00
cyril lopez	86824b536a	Handle add attr	2018-07-03 18:30:34 +02:00
Jim LAURIE	5599f5f72c	Merge pull request #1495 from sekmet/language-pt_BR ... Brazilian Portuguese Language Support	2018-07-03 18:05:22 +02:00
Jim LAURIE	ae58979892	Merge branch 'master' into language-pt_BR	2018-07-03 17:52:04 +02:00
Jim LAURIE	76fc0b894d	Merge pull request #1451 from strapi/review-logs ... Review Strapi logs new/start	2018-07-03 17:51:41 +02:00
cyril lopez	c80acd859e	Handle remove attr from list	2018-07-03 17:48:51 +02:00
Jim LAURIE	383538e44b	Merge branch 'master' into review-logs	2018-07-03 17:35:08 +02:00
Jim LAURIE	e08afef426	Merge pull request #1506 from strapi/fix-one-way ... Fix loose oneWay relation on update content type	2018-07-03 17:34:28 +02:00
Jim LAURIE	c047c6f1f0	Merge branch 'master' into fix-one-way	2018-07-03 17:17:31 +02:00
Jim LAURIE	6276f33ed7	Clean comments	2018-07-03 17:15:33 +02:00
Jim LAURIE	f2f06cd966	Merge branch 'yarn-install' of github.com:strapi/strapi into yarn-install	2018-07-03 17:10:40 +02:00
Jim LAURIE	74adea6a40	Merge branch 'master' into yarn-install	2018-07-03 17:10:00 +02:00
Jim LAURIE	13013a40b4	Improve find npm global strapi performance	2018-07-03 16:43:08 +02:00
Johann Pinson	ffaa3fb92a	fix(graphql): add time attribute type to DateTime scalar	2018-07-03 16:31:25 +02:00
Jim LAURIE	7ab5d0ed69	Merge pull request #1500 from brinley/patch-1 ... Fixed incorrect import for utils/request	2018-07-03 14:39:06 +02:00
Johann Pinson	8a5e4c48ad	fix(upload): improve query find for bookshelf	2018-07-03 12:09:49 +02:00
cyril lopez	889c771b5c	Change routing	2018-07-02 17:05:29 +02:00
Jim LAURIE	d383a75154	Handle yarn install in generated project	2018-07-02 17:00:44 +02:00
cyril lopez	6e6657fbe1	Merge master	2018-07-02 16:00:00 +02:00
Jim LAURIE	eff46b5cb1	Not clear oneWay relation on model update fix #1477	2018-07-02 15:41:53 +02:00
cyril lopez	ed89c8404d	Fix install	2018-07-02 14:59:50 +02:00
Brinley Ang	085edd4136	Fixed incorrect import for utils/request	2018-07-02 18:37:00 +10:00
Carlos Guimaraes	07b8521d32	Merge branch 'master' into language-pt_BR	2018-07-01 18:49:20 -03:00
Carlos Guimaraes	dff877eb41	Brazilian Portuguese Language Support	2018-07-01 17:25:43 -03:00
Carlos Guimaraes	46765b442c	Brazilian Portuguese Language Support	2018-07-01 17:24:47 -03:00
Carlos Guimaraes	c64720abb3	Brazilian Portuguese Language Support	2018-07-01 17:23:47 -03:00
Carlos Guimaraes	fe87d4f710	Brazilian Portuguese Language Support	2018-07-01 17:23:02 -03:00
Carlos Guimaraes	57cffecc4a	Brazilian Portuguese Language Support	2018-07-01 17:21:59 -03:00
Carlos Guimaraes	9698c7d036	Brazilian Portuguese Language Support	2018-07-01 17:21:13 -03:00
Carlos Guimaraes	e3f745e53c	Brazilian Portuguese Language Support	2018-07-01 17:20:17 -03:00
Carlos Guimaraes	4fe5721ed8	Brazilian Portuguese Language Support	2018-07-01 17:15:34 -03:00