33691 Commits

Author SHA1 Message Date
Jim LAURIE
bd628be155 Replace group by compo 2019-12-09 16:36:35 +01:00
Alexandre Bodin
63edb61336 Fix component name 2019-12-09 16:18:58 +01:00
Alexandre Bodin
de3c9e440d Update documentation of api endpoints and queries 2019-12-09 14:54:16 +01:00
Alexandre Bodin
fc36055ff6 Add configurable as a valid api option 2019-12-09 14:53:30 +01:00
Alexandre BODIN
cf54c91fc1
Merge pull request #4687 from strapi/docs-typo
Fix typo draft guide
2019-12-09 14:40:35 +01:00
Jim LAURIE
c0d6b304b0 Fix typo draft guide 2019-12-09 14:33:43 +01:00
soupette
aa6d83669f Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-09 14:06:29 +01:00
soupette
87869a18b4 Fix ui bugs 2019-12-09 14:06:18 +01:00
Alexandre Bodin
2fa574b061 Fix isComponent on null attributes 2019-12-09 14:01:11 +01:00
cyril lopez
be8d74bc89
Merge pull request #4686 from strapi/ctm-ui
DZ CTM ui fixes
2019-12-09 11:55:01 +01:00
Alexandre Bodin
c5d57b32fe Merge branch 'develop' into features/dynamic-zones 2019-12-09 11:48:46 +01:00
Virginie Ky
268a487039 Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctm-ui 2019-12-09 11:33:02 +01:00
soupette
2769f01a93 Fix tests 2019-12-09 11:31:47 +01:00
Virginie Ky
43f77b2d9c Merge branch 'ctm-ui' of github.com:strapi/strapi into ctm-ui 2019-12-09 11:15:38 +01:00
Virginie Ky
bdff39020c Merge branch 'front/dz-post-data' of github.com:strapi/strapi into ctm-ui 2019-12-09 11:14:42 +01:00
Alexandre BODIN
5124718263
Merge pull request #4682 from RodEsp/patch-1
Alphabetize concepts/file-structure.md docs
2019-12-09 11:03:53 +01:00
Alexandre BODIN
4c0ae22fad
Merge branch 'master' into patch-1 2019-12-09 11:03:25 +01:00
virginieky
81a5c8eafe
Merge branch 'front/dz-post-data' into ctm-ui 2019-12-09 10:56:27 +01:00
Alexandre BODIN
39771f66df
Merge pull request #4668 from strapi/docs-security
Add sqreen guide
2019-12-09 10:49:22 +01:00
Virginie Ky
b3845f4ea0 CTB leftmenu customlink plus button 2019-12-09 10:49:20 +01:00
Alexandre BODIN
8b032ab254
Merge branch 'master' into docs-security 2019-12-09 10:49:15 +01:00
Jim LAURIE
332ca2f5e0 Apply fix typo 2019-12-09 10:48:15 +01:00
Alexandre Bodin
fb5b770ce5 Merge branch 'master' into develop 2019-12-09 10:39:30 +01:00
Alexandre BODIN
b2b22d9380
Merge pull request #4623 from strapi/lauriejim-patch-1
Remove search engine for index.html page
2019-12-09 10:35:41 +01:00
Alexandre BODIN
f511ba99fd
Merge pull request #4351 from chriswinch/file-size-type-integer
Fix uploaded file order by size
2019-12-09 10:35:31 +01:00
Jim LAURIE
c8d455d4e2 Add no index on production page 2019-12-09 10:27:59 +01:00
Jim LAURIE
1dfe036f87
Merge branch 'develop' into lauriejim-patch-1 2019-12-09 10:26:44 +01:00
soupette
16831c29f9 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-09 10:12:28 +01:00
Alexandre BODIN
8c8dc98112
Merge branch 'master' into file-size-type-integer 2019-12-09 10:12:24 +01:00
Alexandre BODIN
5872514bbc
Merge pull request #4440 from AHgPuK/master
Fix empty date wrong display
2019-12-09 10:11:33 +01:00
Alexandre BODIN
6bf4cfd65b
Merge branch 'master' into master 2019-12-09 10:11:05 +01:00
Alexandre BODIN
6a9df0fcde
Merge pull request #4645 from Froelund/patch-7
Use the id of entry to update relations
2019-12-09 10:07:11 +01:00
Alexandre BODIN
309be28183
Merge branch 'master' into patch-7 2019-12-09 10:06:52 +01:00
Alexandre BODIN
ca751294e0
Merge pull request #4654 from AnandChowdhary/patch-1
Change "Mac O/S" to "macOS"
2019-12-09 10:06:17 +01:00
Alexandre BODIN
3af9905f4c
Merge branch 'master' into patch-1 2019-12-09 10:06:10 +01:00
Alexandre BODIN
4602318eae
Merge pull request #4656 from shuson/patch-1
Update model.template
2019-12-09 10:05:26 +01:00
Alexandre BODIN
d6f93bb755
Merge branch 'master' into patch-1 2019-12-09 10:04:30 +01:00
Alexandre BODIN
c10a985600
Merge pull request #4659 from pouyamiralayi/patch-1
Update upload.md documentation
2019-12-09 10:04:09 +01:00
Alexandre BODIN
232363beec
Merge branch 'master' into patch-1 2019-12-09 10:03:47 +01:00
Alexandre BODIN
c27cb3a0fb
Merge pull request #4671 from strapi/docs-draft
Add guide to create a draft system
2019-12-09 10:02:17 +01:00
Alexandre BODIN
ec6906c96c
Merge branch 'master' into docs-draft 2019-12-09 10:02:09 +01:00
Alexandre BODIN
f2571b0b2d
Merge pull request #4540 from victorlambert/improve-authorization-performance
Populate only role relation to authorize user
2019-12-09 09:58:08 +01:00
Alexandre BODIN
3acd646701
Merge branch 'master' into improve-authorization-performance 2019-12-09 09:57:58 +01:00
Alexandre BODIN
874df1846e
Merge pull request #4674 from mnelemans/fix/bookshelf-relations-search
Wrap tsvector attributes with coalesce before join
2019-12-09 09:56:30 +01:00
Jørgensen
8087a4ada5
Merge branch 'master' into patch-7 2019-12-09 09:24:03 +01:00
Rodrigo Espinosa
4348038d36
Alphabetize concepts/file-structure.md docs 2019-12-09 00:08:51 -05:00
Mathijs Nelemans
fcdbc4fbe3 Wrap tsvector attributes with coalesce before join
Fixed a bug where joining multiple tsvector attributes results in NULL
because one of the columns contains NULL. The expected behaviour is to
ignore that column instead, which is achieved by setting it to an empty
string
2019-12-07 12:40:05 +01:00
Jim LAURIE
344f825778 Fix typo 2019-12-06 19:05:15 +01:00
Jim LAURIE
959472231f Add guide to create a draft system 2019-12-06 19:00:00 +01:00
Virginie Ky
d80cc1c898 CM UI fixes 2019-12-06 18:27:07 +01:00