yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-17 21:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,860 Commits 117 Branches 489 Tags
Commit Graph

10860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
64dbd6f891
Merge pull request #4887 from strapi/fix/#4868 
Fix Forgot password error
 2020-01-06 09:55:53 +01:00
Alexandre BODIN
5e358d4549
Merge branch 'master' into fix/#4868 2020-01-06 09:55:45 +01:00
Alexandre BODIN
dfbb0b2ff4
Merge branch 'master' into patch-2 2020-01-06 09:50:31 +01:00
Alexandre BODIN
bb642292e6
Merge branch 'master' into bugfix/entry-deletion 2020-01-06 09:46:25 +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
Alexandre BODIN
473205ab8e
Merge branch 'master' into fix/upload-plugin-config-form 2020-01-06 09:33:52 +01:00
Veit Bjarsch
31e6d08b66 fixed entry deletion if params contains associations 2020-01-06 02:29:47 +01:00
Veit Bjarsch
6f8d3917b0
Merge pull request #1 from strapi/master 
merge
 2020-01-06 02:25:20 +01:00
profispojka
2c9b8283b3
Update cs.json 2020-01-05 16:04:00 +01:00
profispojka
458c8b077c
Update index.js 2020-01-05 16:03:14 +01:00
profispojka
e43f43bef0
Update index.test.js 2020-01-05 16:02:02 +01:00
profispojka
6b75e54d15
Update index.js 2020-01-05 16:01:29 +01:00
profispojka
46492b3428
Update i18n.js 2020-01-05 16:00:49 +01:00
profispojka
379033a91c
Merge branch 'feature/adminTranslationCs' into feature/adminTranslationCsWithPlugins 2020-01-05 15:59:47 +01:00
unknown
6e4fe7141a fix typos, merge 2020-01-05 15:48:51 +01:00
unknown
72e76c97f2 update translations to latest master 2020-01-05 15:40:09 +01:00
unknown
8281ed7a8f merge master changes 2020-01-05 14:36:47 +01:00
jozefcipa
ea23166e3e Fix typos 2020-01-05 14:11:00 +01:00
unknown
d53d7ac5e2 cs translation fixes 2020-01-05 13:05:57 +01:00
Derrick Mehaffy
fadaa64518
Update policies documentation to include link to GraphQL doc 2020-01-04 11:26:14 -07:00
Pouya Miralayi
7456615492
Update migration-guide-beta.17-to-beta.18.md 2020-01-04 20:44:26 +03:30
KULDIP PIPALIYA
0663fbecc3
Update README.md 2020-01-04 17:50:16 +05:30
cyril lopez
025da198dc
Merge branch 'master' into ctb/improve-stepper 2020-01-03 16:55:39 +01:00
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
soupette
7b5da505f6 Fix adding components with nested compos 2020-01-03 15:52:03 +01:00
cyril lopez
51f52b57a3
Merge branch 'master' into ctb/improve-stepper 2020-01-03 14:04:02 +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
Jozef Cipa
3a1626adba
Mention dynamic option in configuration 2020-01-03 13:04:39 +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
cyril lopez
1c23939f43
Merge branch 'master' into fix/enumeration 2020-01-03 10:43:37 +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
Jaroslav Vrána
d65db853ea
Merge branch 'master' into feature/adminTranslationCs 2020-01-02 21:29:51 +01:00
Jaroslav Vrána
3d590e5762 fix: typo 2020-01-02 21:24:51 +01:00
Jaroslav Vrána
49b700f86f
Merge pull request #1 from profispojka/feature/adminTranslationCsWithPlugins 
Feature/admin translation cs with plugins
 2020-01-02 21:07:01 +01:00
Derrick Mehaffy
f909d6c28a Add database timezone config options to documentation 2020-01-02 10:14:31 -07:00
Jozef Cipa
9a91433176
Add Security configuration paragraph 
Mention option to set jwt secret code via `JWT_SECRET` environment variable
 2020-01-02 15:55:07 +01: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