10698 Commits

Author SHA1 Message Date
Alexandre BODIN
5e358d4549
Merge branch 'master' into fix/#4868 2020-01-06 09:55:45 +01:00
Alexandre BODIN
9608b06d83
Merge pull request #4894 from kuldipem/patch-1
Update strapi-provider-upload-cloudinary installation instructions
2020-01-06 09:45:56 +01:00
Alexandre BODIN
199bf428b2
Merge branch 'master' into patch-1 2020-01-06 09:45:46 +01:00
Alexandre BODIN
6e34ae4b57
Merge pull request #4896 from strapi/docs/policyGraphQL
Update policies documentation to include link to GraphQL doc
2020-01-06 09:45:03 +01:00
Derrick Mehaffy
fadaa64518
Update policies documentation to include link to GraphQL doc 2020-01-04 11:26:14 -07:00
KULDIP PIPALIYA
0663fbecc3
Update README.md 2020-01-04 17:50:16 +05:30
Jim LAURIE
4f39e56152
Merge pull request #4889 from strapi/ctb/add-reserved-names
Add map and series to RESERVED_NAMES in CTB
2020-01-03 16:46:51 +01:00
Jim LAURIE
8064668ae0
Merge branch 'master' into ctb/add-reserved-names 2020-01-03 16:45:50 +01:00
cyril lopez
aec438b19c
Merge pull request #4888 from strapi/fix/ctb-injected-compo-production
Remove content builder links from content manager in non development environments
2020-01-03 14:03:33 +01:00
soupette
b0b1175540 Add map and series to RESERVED_NAMES 2020-01-03 12:16:29 +01:00
soupette
c335f946b8 Remove ctb links from the ctm in non dev envs 2020-01-03 12:03:55 +01:00
soupette
856d05f768 Fixes #4868 2020-01-03 11:40:44 +01:00
Jim LAURIE
7a0fdb53a2
Merge pull request #4883 from strapi/docs/dbTimezone
Add database timezone config options to documentation
2020-01-03 10:19:20 +01:00
Derrick Mehaffy
f909d6c28a Add database timezone config options to documentation 2020-01-02 10:14:31 -07:00
Jim LAURIE
169145b051
Merge pull request #4869 from ejez/patch-1
Fix typo
2020-01-02 15:28:28 +01:00
Jim LAURIE
43d1a1d707
Merge branch 'master' into patch-1 2020-01-02 15:27:37 +01:00
Jim LAURIE
943c56d478
Merge pull request #4852 from realabbas/patch-2
Typography Error
2020-01-02 14:50:03 +01:00
Jim LAURIE
67751dd260
Merge branch 'master' into patch-2 2020-01-02 14:47:44 +01:00
Jim LAURIE
9bbda739bb
Merge pull request #4839 from realabbas/patch-1
Fixed Typography Error
2020-01-02 14:46:50 +01:00
Jim LAURIE
fcb300f0f7
Merge branch 'master' into patch-1 2020-01-02 14:46:30 +01:00
Jim LAURIE
b1d7ca1862
Merge pull request #4835 from joaoeudes7/patch-links
Update reference of links documentation
2020-01-02 14:42:39 +01:00
Jim LAURIE
0c0f179638
Merge branch 'master' into patch-links 2020-01-02 14:41:51 +01:00
Jim LAURIE
8563524d36
Merge pull request #4823 from abrahamcuenca/fix/profile-button-redirect-to-incorrect-url-format
Fix Profile button throwing a 500 Internal Server Error when refreshing page from the admin screen.
2020-01-02 14:40:29 +01:00
Jim LAURIE
0bb89aee25
Merge branch 'master' into fix/profile-button-redirect-to-incorrect-url-format 2020-01-02 14:38:53 +01:00
Jim LAURIE
6a4262d619
Merge pull request #4822 from strapi/fix/upload-url-relative
Leave file url as realtive
2020-01-02 14:34:07 +01:00
Jim LAURIE
1ac92c28d3
Merge branch 'master' into fix/upload-url-relative 2020-01-02 14:28:11 +01:00
Jim LAURIE
a9c236736d
Merge pull request #4815 from EugeneFox78/patch-1
Update ru.json
2020-01-02 14:23:08 +01:00
Jim LAURIE
2fc7966cb8
Merge branch 'master' into patch-1 2020-01-02 14:22:03 +01:00
Jim LAURIE
4e87eaef0d
Merge pull request #4797 from uinz/patch-1
Update zh-Hans.json
2020-01-02 14:08:44 +01:00
Jim LAURIE
daf2dd4ac2
Merge branch 'master' into patch-1 2020-01-02 14:08:35 +01:00
Jim LAURIE
5a8f7510d7
Merge pull request #4723 from jesusprubio/master
Fix plugin upload UI description
2020-01-02 14:04:11 +01:00
Jim LAURIE
91c15a8e5c Merge branch 'master' of github.com:strapi/strapi into pr/4723 2020-01-02 14:00:44 +01:00
Jim LAURIE
27fa30eb60
Merge pull request #4643 from fouber/patch-1
Adjust the LeftMenuLinkContainer height
2020-01-02 13:56:08 +01:00
Jim LAURIE
2ebef4cbef
Merge branch 'master' into patch-1 2020-01-02 13:55:36 +01:00
Jim LAURIE
33415b9f0b
Merge pull request #4538 from mdacosta/fix/4537
Add support for Mailgun templates and variables
2020-01-02 13:51:03 +01:00
Jim LAURIE
2557f34963
Merge branch 'master' into fix/4537 2020-01-02 13:50:45 +01:00
Jim LAURIE
ec23462ecd
Merge pull request #4877 from strapi/fix-4866
Fix compo file path
2020-01-02 12:16:02 +01:00
Jim LAURIE
cb7e24da2a Fix compo file path
Update the path of component file for the database collection update.

fix #4866
2020-01-02 12:06:58 +01:00
Abraham Cuenca
a6388671fa
Merge branch 'master' into fix/profile-button-redirect-to-incorrect-url-format 2020-01-02 00:36:29 -08:00
ejez
cf93f739df
correct typo 2020-01-01 13:32:43 +03:00
virginieky
79e7153adb
Merge pull request #4862 from strapi/fix-4843
Fix scroll content type fields
2019-12-31 15:19:27 +01:00
Jim LAURIE
d17344211c fix: fix scroll content type fields
On the page to customize the fileds displayed in the entry list.
The dopdown to display available fields doesn't scroll.

fix #4843
2019-12-31 15:02:00 +01:00
Ali Abbas
f997f146c9
Update deployment.md 2019-12-30 02:17:09 +05:30
yinz
8a1449b087
Merge branch 'master' into patch-1 2019-12-27 20:22:14 +08:00
Ali Abbas
754bf59b97
Update api-endpoints.md 2019-12-27 16:15:22 +05:30
João Eudes Lima
317f4a1a02 Update reference of links documentation 2019-12-27 00:52:09 -03:00
Abraham Cuenca
8d69c8db38
Merge branch 'master' into fix/profile-button-redirect-to-incorrect-url-format 2019-12-26 13:54:34 -08:00
Jim LAURIE
ee0beca5ef
Merge pull request #4824 from strapi/fix/beta.18_migration
Beta.18.x migration guide add mongoose tabs
2019-12-26 14:51:23 +01:00
Jim LAURIE
505cbb7674
Merge branch 'master' into fix/beta.18_migration 2019-12-26 14:51:14 +01:00
Jim LAURIE
05cf3c4ddc
Merge pull request #4816 from strapi/docs-trouble-shooting-email
Add email trouble shooting
2019-12-26 14:50:46 +01:00