yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-18 05:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 117 Branches 489 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
1f576239d7 Update after review 2019-05-28 16:31:40 +02:00
davidkartuzinski
9dda869b0a Revisions to Contributing Guide 2019-05-28 15:33:07 +02:00
Alexandre Bodin
5c78723d7a Update digital ocean deployment with beta updates 2019-05-28 11:28:26 +02:00
Alexandre Bodin
2fd2342851 Merge branch 'master' into beta 2019-05-28 11:27:16 +02:00
Alexandre BODIN
6e2aa3f271
Merge pull request #3328 from strapi/deployment-digital-ocean-modification 
Updated deployment guide for Digital Ocean
 2019-05-28 11:26:54 +02:00
davidkartuzinski
82c944e5d7 clarified and provided an alternative command to restart project. 2019-05-28 11:00:31 +02:00
cyril lopez
be202c0b1d
Merge pull request #3330 from strapi/doc/beta-readme 
Update README.md
 2019-05-27 22:48:22 +02:00
Alexandre Bodin
0f7565c036 Update README.md 2019-05-27 22:04:33 +02:00
Alexandre BODIN
91bce1fc58
Merge pull request #3327 from strapi/update-contributing 
Update the CONTRIBUTING GUIDE
 2019-05-27 21:58:03 +02:00
Alexandre BODIN
1b4b687699
UPDATE node js version 2019-05-27 21:57:02 +02:00
soupette
7af981865e Update PR feedback 2019-05-27 20:28:15 +02:00
davidkartuzinski
6be4f4a806 Updated deployment guide for Digital Ocean 2019-05-27 19:28:56 +02:00
soupette
71f03745b6 Update the contributing guide 2019-05-27 18:57:24 +02:00
davidkartuzinski
6f6cc0c41f Add PostgreSQL Db install 2019-05-26 23:16:47 +02:00
Jim LAURIE
b394c4a5c9
Merge pull request #3316 from strapi/tech/clean-split-user-administrators 
Refactor strapi-admin services and controllers
 2019-05-25 18:50:44 +02:00
soupette
5a087173a7 Prevent the users from uninstalling a core plugin. 
Prevent the user from adding/removing a plugin with the UI if the env is not development
 2019-05-24 17:03:01 +02:00
Alexandre Bodin
42e0bf8fed Refactor strapi-admin services and controllers 2019-05-24 17:03:01 +02:00
Alexandre BODIN
7d1700ac02
Merge pull request #3280 from strapi/doc/beta 
Beta documentation
 2019-05-24 17:02:14 +02:00
Alexandre Bodin
82b4f6eafb Apply review 2019-05-24 16:31:20 +02:00
Alexandre Bodin
9ba00e904f Apply review 2019-05-24 16:31:20 +02:00
Alexandre Bodin
7da097cdfd update queries search doc 2019-05-24 16:31:20 +02:00
Alexandre Bodin
6aa3ddc408 Add strapi.query / plugin.queries doc 2019-05-24 16:31:20 +02:00
Alexandre Bodin
1cfeaba98c Update CLI docs 2019-05-24 16:31:20 +02:00
Alexandre Bodin
710650b25a Split local plugins and plugin development 2019-05-24 16:31:20 +02:00
Alexandre Bodin
7d130cad3d Add core service docs 2019-05-24 16:31:20 +02:00
Alexandre Bodin
b9a0344a29 Deployment and file paths 2019-05-24 16:31:20 +02:00
Alexandre Bodin
da7b9ad66d Add controller customization doc 2019-05-24 16:31:20 +02:00
Alexandre Bodin
81be120b7a wip 2019-05-24 16:31:20 +02:00
Alexandre Bodin
5847bf2a9d Add extensions concept doc 2019-05-24 16:31:20 +02:00
Alexandre Bodin
8638bc4411 Init beta docs 2019-05-24 16:31:20 +02:00
Jim LAURIE
69aa70b022 Merge branch 'master' of github.com:strapi/strapi into beta 2019-05-24 15:41:09 +02:00
Jim LAURIE
61a7c3b79e
Merge pull request #3318 from strapi/funding 
Add Open Collective as GH funding
 2019-05-24 15:05:47 +02:00
Jim LAURIE
29325e1f35 Add Open Collective as GH fundind 2019-05-24 14:59:59 +02:00
Alexandre BODIN
f5bbd708e1
Merge pull request #3283 from strapi/update/depends 
Updating package dependencies
 2019-05-24 14:48:44 +02:00
Alexandre BODIN
a3b56e3009
Merge branch 'beta' into update/depends 2019-05-24 14:30:19 +02:00
davidkartuzinski
075d5f92cf WIP: Amazon Docs through EC2 Installation 2019-05-24 14:16:13 +02:00
Jim LAURIE
1c2bbdf35a
Merge pull request #3311 from strapi/fix/beta-fixes 
Fix Add image upload in content type and add image in example app
 2019-05-23 12:00:16 +02:00
Alexandre Bodin
51300f4a4f Fix Add image upload in content type and add image in example app 2019-05-23 10:21:41 +02:00
Alexandre Bodin
87e479173a Merge branch 'beta' into update/depends 2019-05-23 10:21:22 +02:00
Alexandre Bodin
0b4096a045 Add _q param to GET /users 2019-05-23 10:18:44 +02:00
Alexandre Bodin
ea5cdc78d8 Remove not null on sqlite alter as the table is recreated afterwards 2019-05-23 10:17:03 +02:00
Alexandre Bodin
232afd983e Merge branch 'beta' into update/depends 2019-05-23 09:35:21 +02:00
Jim LAURIE
ae4728be8c Merge branch 'master' of github.com:strapi/strapi into beta 2019-05-22 12:03:34 +02:00
Jim LAURIE
08a4f6f514
Merge pull request #3305 from strapi/digital-ocean-docs 
Docs - Install Strapi on a Digital Ocean Droplet/VPS
 2019-05-22 11:38:25 +02:00
David Kartuzinski
d4ea5dc63d
Fixed feedback after review 2019-05-22 11:16:15 +02:00
Hoàng Phúc
2a00de34d2
Fix ip filter middleware 2019-05-22 11:35:03 +07:00
davidkartuzinski
42aa73be7d fully tested docs 2019-05-21 16:36:16 +02:00
Alexandre BODIN
6b07dd3df1
Merge pull request #3300 from strapi/tech/webpack-dev 
Add strapi-admin dev script
 2019-05-21 14:02:13 +02:00
Alexandre Bodin
d0df55d163 Update yarn.lock 2019-05-21 11:59:27 +02:00
Alexandre Bodin
06fed3a5e2 Merge branch 'beta' into update/depends 2019-05-21 11:55:44 +02:00