33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Carlos Guimaraes	6b5f0f3b7a	Brazilian Portuguese Language Support	2018-07-01 16:50:54 -03:00
Jim LAURIE	cd41c663e6	Merge pull request #1475 from abdonrd/patch-1 ... Don't use MongoDB connectOptions when using URI	2018-07-01 21:22:50 +02:00
Abdón Rodríguez Davila	3b0770868c	Check if URI	2018-07-01 19:20:53 +02:00
Abdón Rodríguez Davila	6fca22a339	Refactor URI options	2018-07-01 18:53:21 +02:00
Abdón Rodríguez Davila	f19e9e98c1	Override connectOptions with URI params	2018-07-01 18:47:33 +02:00
Broc Gailit	eb74b7e4e2	Merge branch 'master' into master	2018-07-01 09:41:04 -07:00
Abdón Rodríguez Davila	3efb086aa0	Revert "Don't use MongoDB connectOptions when using URI" ... This reverts commit f261ee480294a4db9fc0b73fea602951458f4e55.	2018-07-01 18:11:11 +02:00
Abdón Rodríguez Davila	62125a08c4	Merge branch 'master' into patch-1	2018-07-01 18:09:59 +02:00
Jim LAURIE	3451fb6b1d	Merge pull request #1464 from maturano/bug/1463_tmpPath ... Change hardcoded "tmp" path to an OS-random one	2018-07-01 13:59:01 +02:00
Jim LAURIE	77b08c5d5d	Merge branch 'master' into bug/1463_tmpPath	2018-07-01 13:42:53 +02:00
Daniel Ruf	5c5ca6818c	chore: trigger new build	2018-06-30 18:15:30 +02:00
Daniel Ruf	5a54d7c2a2	fix: Do not cleanup directories	2018-06-30 18:09:22 +02:00
Daniel Ruf	9fd5bad422	chore: cache dependencies	2018-06-30 17:45:12 +02:00
Jim LAURIE	a675b503d5	Merge pull request #1487 from maturano/bug/documentation ... Fix filename reference	2018-06-30 16:01:27 +02:00
Alberto Maturano	5a25cee384	Fix filename reference	2018-06-29 12:13:59 -05:00
cyril lopez	cea3dee851	Add drag and drop to sort list header. ... Needs design Need to be able to remove or add an attribute	2018-06-29 17:20:36 +02:00
cyril lopez	7a9b3f6d59	Fix lint	2018-06-29 15:40:55 +02:00
cyril lopez	3adaf8cdcc	Apply list settings in listView	2018-06-29 15:33:58 +02:00
cyril lopez	4393511aab	Created SettingPage container and add the form to modify the default settings per content type	2018-06-29 15:07:15 +02:00
cyril lopez	d5259985fd	Desgin settings-page ctm	2018-06-29 12:29:31 +02:00