yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 10:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 114 Branches 488 Tags
Commit Graph

9892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
e0b96b9738
Revert "Revert docs update" 2019-11-28 10:43:33 +01:00
Alexandre BODIN
a6115daab5
Merge pull request #4600 from strapi/docs-website-link 
Fix docs website link in the top menu
 2019-11-28 09:00:19 +01:00
Alexandre BODIN
0cc737145e
Merge branch 'master' into docs-website-link 2019-11-28 09:00:11 +01:00
Sulakin Vadim
c516051b3f
Merge branch 'master' into admin-russian-translation 2019-11-28 09:27:14 +03:00
Jim LAURIE
b2e99a3e20
Merge pull request #4614 from strapi/docs-warning-alpha 
Revert docs update
 2019-11-27 18:14:07 +01:00
Jim LAURIE
fd66ffb337
Merge branch 'master' into docs-warning-alpha 2019-11-27 18:14:00 +01:00
Jim LAURIE
11addd3485 Revert docs update 2019-11-27 18:13:18 +01:00
Jim LAURIE
f0766e5b7f
Merge pull request #4613 from strapi/docs-warning-alpha 
Fix docs build
 2019-11-27 18:06:22 +01:00
Jim LAURIE
d0563e8d38
Merge branch 'master' into docs-warning-alpha 2019-11-27 18:06:15 +01:00
Jim LAURIE
885f7c63f9 Fix docs build 2019-11-27 18:05:21 +01:00
Alexandre BODIN
56d359fd97
Merge pull request #4612 from strapi/docs-warning-alpha 
Display a deprecated message docs alpha
 2019-11-27 17:30:09 +01:00
Alexandre BODIN
2f3cd26acc
Merge branch 'master' into docs-warning-alpha 2019-11-27 17:30:00 +01:00
Jim LAURIE
6a2b667b74 Fix ; 2019-11-27 17:28:08 +01:00
Jim LAURIE
93130a1676 Display a deprecated message docs alpha 2019-11-27 17:26:30 +01:00
Alexandre BODIN
ad3cd2ee94
Merge pull request #4611 from strapi/docs-deploy-docker 
Add a docker ref in the docs
 2019-11-27 16:36:43 +01:00
Alexandre BODIN
1f7688cb77
Merge branch 'master' into docs-deploy-docker 2019-11-27 16:36:34 +01:00
Jim LAURIE
bb2a54525d Add a docker ref in the docs 2019-11-27 16:25:36 +01:00
Alexandre BODIN
17c47bafc1
Merge pull request #4599 from strapi/fix-4559 
Fix lowercase email in forgot password function
 2019-11-27 15:25:42 +01:00
Alexandre BODIN
8376793a9a
Merge branch 'master' into fix-4559 2019-11-27 15:25:26 +01:00
Sulakin Vadim
9899480562
Merge branch 'master' into admin-russian-translation 2019-11-27 16:42:01 +03:00
Sulakin Vadim
c5d91ed514
Update ru.json 2019-11-27 16:41:39 +03:00
Jim LAURIE
d3746702ff
Merge pull request #4585 from dearprakash/patch-1 
Update link to pm2 guide
 2019-11-27 11:48:56 +01:00
Jim LAURIE
ad6f613631
Merge branch 'master' into patch-1 2019-11-27 11:48:25 +01:00
Jim LAURIE
9eb1490a7a Fix #4576 docs website link 2019-11-26 16:58:35 +01:00
Jim LAURIE
3fe87ffcc7 Fix #4559 lowercase the email in the forgot password function 2019-11-26 16:03:06 +01:00
Jim LAURIE
ee76396920
Merge pull request #4571 from strapi/docs-custom-data-guide 
Add data response customization
 2019-11-26 11:58:44 +01:00
Jim LAURIE
07fb1e5337
Merge branch 'master' into docs-custom-data-guide 2019-11-26 11:58:35 +01:00
Jim LAURIE
64aa3690d4
Merge pull request #4575 from strapi/docs-fixes 
Some documentation update
 2019-11-26 11:58:01 +01:00
Jim LAURIE
39ff488f95
Merge branch 'master' into docs-fixes 2019-11-26 11:57:54 +01:00
Jim LAURIE
5ec938ad93 Remove unnessecary comment 2019-11-26 11:50:39 +01:00
Jim LAURIE
6ab7d7528c
Fix typo feedback from Derrick 2019-11-26 11:24:29 +01:00
Jim LAURIE
bb3eef9eaf Merge branch 'docs-custom-data-guide' of github.com:strapi/strapi into docs-custom-data-guide 2019-11-26 11:21:35 +01:00
Jim LAURIE
8c3e71b479 Typo 2019-11-26 11:21:19 +01:00
Jim LAURIE
813cd835cb
Merge branch 'master' into docs-custom-data-guide 2019-11-26 11:19:48 +01:00
Jim LAURIE
f884e39fbf Fix typo 2019-11-26 11:18:39 +01:00
Jim LAURIE
93e411f162
Merge pull request #4579 from strapi/docs-custom-admin-guide 
Add guide to customize admin and plugin
 2019-11-26 11:07:49 +01:00
Jim LAURIE
ebe1a30271
Merge branch 'master' into docs-custom-admin-guide 2019-11-26 11:07:42 +01:00
Prakash Rajendran
9db2a25a77
Merge branch 'master' into patch-1 2019-11-25 22:33:01 +01:00
Jim LAURIE
3bc55a9e34 Fix typo 2019-11-25 19:47:30 +01:00
Jim LAURIE
5a37390d44 Fix typo 2019-11-25 19:16:42 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Jacob Sarnowski
92028780fe Fix misleading database configuration documentation (#4568) 
Resolves #4567
 2019-11-25 18:51:58 +01:00
yinz
f3d8c7ffaf docs: update doc (#4588) 2019-11-25 18:50:07 +01:00
Jim LAURIE
004407ed46
Merge pull request #4566 from strapi/docs-guide-process-manager 
Add process manager guide
 2019-11-25 16:46:06 +01:00
Jim LAURIE
631ec9022e
Merge branch 'master' into docs-guide-process-manager 2019-11-25 16:45:57 +01:00
Prakash Rajendran
708f713ab8
update link to pm2 guide 2019-11-23 23:58:11 +01:00
Sulakin Vadim
590bc5a78a
Merge branch 'master' into admin-russian-translation 2019-11-23 23:43:14 +03:00
Sulakin Vadim
378f842640 Update Russian translation for admin panel 2019-11-23 23:38:41 +03:00
Jim LAURIE
7eea3860e5 Fix typo 2019-11-23 16:44:54 +01:00
cyril lopez
52e3d1c391
Merge pull request #4578 from strapi/event-admin 
Send UUID when the admin is loaded
 2019-11-22 19:04:17 +01:00