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
29,765 Commits 114 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
7ea9fdf6f4
Merge pull request #428 from strapi/fix/language-api 
Authorize config files name as API fix #417
 2018-01-10 13:55:15 +01:00
Jim LAURIE
502b101598
Fix PR feedback 2018-01-10 13:39:42 +01:00
cyril lopez
6d71241275 Update branch 
Merge branch 'improve/doc-plugin' of https://github.com/strapi/strapi into improve/doc-plugin
 2018-01-10 13:36:38 +01:00
cyril lopez
7a1249f890 Fix typo 2018-01-10 13:36:24 +01:00
Aurélien GEORGET
1d8bd57006
Merge branch 'master' into fix/language-api 2018-01-10 13:34:33 +01:00
Aurélien GEORGET
7c2ab6eea5
Merge branch 'master' into fix/ctb-no-model-api 2018-01-10 13:29:26 +01:00
Aurélien GEORGET
f1d755c7fc
Update quick-start.md 2018-01-10 13:14:45 +01:00
Aurélien GEORGET
f5512c8e4b
Merge branch 'master' into improve/doc-plugin 2018-01-10 13:10:04 +01:00
Aurélien GEORGET
88e4c25b75
Merge branch 'master' into user-schema-logs 2018-01-10 12:02:07 +01:00
Aurélien GEORGET
61e497ba25
Merge pull request #408 from dakuenjery/master 
Use Decimal for mongo and mongoose
 2018-01-10 12:00:58 +01:00
Aurélien GEORGET
f4b5c77822
Merge branch 'master' into enhancement/middlewares 2018-01-10 11:58:01 +01:00
cyril lopez
ed198423d6 Delete plugins doc folder 2018-01-10 11:46:53 +01:00
cyril lopez
95cb588750 Fix doc links 2018-01-10 11:45:01 +01:00
cyril lopez
47cec0ea84 Created new plugin development doc 2018-01-10 11:32:24 +01:00
Aurelsicoko
143bfd3a7c Merge branch 'master' of github.com:strapi/strapi into fix/deploy 2018-01-09 19:36:41 +01:00
Aurelsicoko
3b54802ae9 Remove logs 2018-01-09 19:36:35 +01:00
Aurelsicoko
440b44ed27 Update documentation and improve plugins.json generation logic 2018-01-09 18:39:50 +01:00
Aurelsicoko
ce61844427 Use relative URL instead of absolute to load plugin and set administration origin 2018-01-09 17:09:54 +01:00
Jim Laurie
f5a5fac5f1 Fix CTB get model to plugins 2018-01-09 14:25:47 +01:00
Jim Laurie
ff46faf306 Execute controller action out of authorization try 2018-01-09 13:53:52 +01:00
Jim Laurie
6a59946f71 Fix CTB if one API has no model file 2018-01-09 13:42:19 +01:00
Николай
d120161831
Merge branch 'master' into master 2018-01-09 14:58:01 +03:00
Aurelsicoko
0b3e8f7ae5 Use relative paths 2018-01-09 12:02:00 +01:00
Jim LAURIE
281048b7aa
Merge pull request #422 from strapi/fix/yarn 
Fix/yarn
 2018-01-09 11:28:16 +01:00
Jim LAURIE
a6c0db7ce2
Merge branch 'master' into fix/yarn 2018-01-09 11:15:23 +01:00
Jim LAURIE
cffbc61dba
Merge pull request #426 from strapi/enhancement/one-way 
Fix #379 - Support one-way relationship
 2018-01-09 11:15:10 +01:00
Jim LAURIE
3a4ca8ea49
Merge branch 'master' into enhancement/one-way 2018-01-09 11:00:34 +01:00
Jim LAURIE
6a4eeec561
Merge pull request #385 from strapi/improve/list-plugins 
Improve/list plugins
 2018-01-09 11:00:09 +01:00
Jim LAURIE
54d0c7d275
Merge branch 'master' into improve/list-plugins 2018-01-09 10:46:32 +01:00
Николай
d1605a1923
Merge branch 'master' into master 2018-01-09 00:24:51 +03:00
cyril lopez
0ca0e6cb7e
Merge pull request #427 from strapi/fix/auth-bound-routes 
Fix EditRole page InputSearch label number display
 2018-01-08 20:18:40 +01:00
Aurélien GEORGET
77e28eacb2
Merge branch 'master' into improve/list-plugins 2018-01-08 18:14:10 +01:00
Jim Laurie
62ee8defce Authorize config files name as API fix #417 2018-01-08 16:41:32 +01:00
Aurelsicoko
6916134ee1 Update setup script to deploy and index.html rewrite 2018-01-08 16:34:41 +01:00
Nikolay
d2fae1dfdc Mongoose updated to 5.0.0-rc1 2018-01-08 17:50:57 +03:00
cyril lopez
b012d95acd
Merge branch 'master' into fix/auth-bound-routes 2018-01-08 15:15:39 +01:00
Николай
d9af887dc9
Merge branch 'master' into master 2018-01-08 16:27:26 +03:00
Jim Laurie
fbd17f4205 Handle redis error connection 2018-01-08 14:23:20 +01:00
Aurelsicoko
ff25575cfd Remove devFrontURL on production & use build configurations instead 2018-01-08 14:17:10 +01:00
cyril lopez
fd41a77e11 Fix EditRole page InputSearch label 2018-01-08 14:15:27 +01:00
Jim Laurie
fc4e9d89fa Handle mongoose error connection 2018-01-08 13:51:17 +01:00
Aurélien GEORGET
d27c6d3481
Update README.md 2018-01-08 13:39:31 +01:00
Jim Laurie
5ace081557 Set default option on failed database connection 2018-01-08 12:24:51 +01:00
Aurélien GEORGET
8a1b95f2b5
Merge branch 'master' into enhancement/one-way 2018-01-08 12:12:01 +01:00
Aurelsicoko
10db375825 Fix #379 - Support one-way relationship 2018-01-08 12:10:48 +01:00
Jim Laurie
4b5cf41b83 Handle bookshekf error connection 2018-01-08 12:00:56 +01:00
Aurélien GEORGET
41c8adccdc
Merge pull request #424 from ArkhipovK/ssl-strapi-knex-option 
SSL option for strapi-knex connections.
 2018-01-08 11:11:44 +01:00
alex
ee5a72af89 SSL option for strapi-knex connections was appended. This is necessary for ssl-only remote DB services e.g. heroku-postgres 2018-01-07 05:25:00 +06:00
Aurelsicoko
c4763d173f Add exception for Yarn to copy/paste the .gitignore file in each plugin 2018-01-05 18:09:18 +01:00
Jim Laurie
23ee0b25bf Install db dependencies on app creation 2018-01-05 17:40:56 +01:00