yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 15:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 112 Branches 487 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Laurie
3fc7c7f83b Merge branch 'plugin/settings-manager-dev' of github.com:strapi/strapi into plugin/settings-manager-dev 2017-08-03 10:30:46 +02:00
Jim Laurie
842ef4c64e Handle client to connector 2017-08-02 17:17:54 +02:00
cyril lopez
e4ee6bf3be Update branch 
Merge branch 'plugin/settings-manager-dev' of https://github.com/strapi/strapi into plugin/settings-manager-dev
 2017-08-02 15:59:16 +02:00
cyril lopez
a178426392 Fix styling due to bootstrap upgrade 2017-08-02 15:52:44 +02:00
Jim LAURIE
003dc4589f Merge pull request #225 from strapi/plugin/settings-manager-dev 
Plugin settings manager dev pull alpha5
 2017-08-02 15:40:43 +02:00
Jim Laurie
3aa9683e80 Changes for PR validation 2017-08-02 15:36:42 +02:00
Pierre Burgy
cd8ed4db30 Merge branch 'alpha.5' of https://github.com/strapi/strapi into plugin/content-manager 2017-08-02 14:02:51 +02:00
Jim Laurie
b36ce9449b Update get items with nester enabled boolean orbject 2017-08-02 13:56:03 +02:00
Jim Laurie
16a3984e63 Update config models 2017-08-02 13:17:40 +02:00
Jim Laurie
d0a9d3ab2f Fix silent fail log files 2017-08-02 12:12:28 +02:00
Jim Laurie
996decce0a Fix load settings manager 2017-08-02 11:26:47 +02:00
Jim Laurie
c3f561fded Fix conflict alpha5 2017-08-02 11:25:18 +02:00
Jim LAURIE
02a12572ac Merge pull request #223 from strapi/plugin/settings-manager-dev 
Plugin settings manager dev
 2017-08-02 10:17:29 +02:00
Jim Laurie
d73947ba69 Fix API PR 2017-08-01 18:23:19 +02:00
cyril lopez
971e33e4b6 Remove _deprecated folder and add test to components/Button 2017-08-01 17:48:43 +02:00
cyril lopez
14933b38b9 Remove styles const from EditFormSection 2017-08-01 17:00:37 +02:00
cyril lopez
d8d7670ace Remove const styles 2017-08-01 16:47:05 +02:00
cyril lopez
d0908022b9 Fix typo 2017-08-01 16:21:36 +02:00
cyril lopez
94ae130f03 Created _deprecated folder to store old components before removing them completely 2017-08-01 15:56:09 +02:00
cyril lopez
e8a0b1e686 Use this for inputs const in WithformSection 2017-08-01 15:45:09 +02:00
cyril lopez
34e8532977 Remove hard coded placeholders for inputs 2017-08-01 15:36:49 +02:00
cyril lopez
3d40b9d541 Display databases list 2017-08-01 15:10:15 +02:00
cyril lopez
ae7ca2e761 Merge branch 'plugin/settings-manager-dev' of https://github.com/strapi/strapi into plugin/settings-manager-dev 2017-08-01 12:02:06 +02:00
cyril lopez
2e83559b58 handle nested forms 2017-08-01 11:26:38 +02:00
Pierre Burgy
08d68eacc9 Base store name on container name 2017-08-01 00:16:00 +02:00
Pierre Burgy
6e755d41ba Use plugin name in constants generator 2017-07-31 23:53:20 +02:00
Pierre BURGY
12706b6fbc Merge pull request #222 from strapi/improvement/update-bootstrap 
Use Bootstrap alpha.6
 2017-07-31 19:02:54 +02:00
Pierre Burgy
0be5c4d02c Merge branch 'alpha.5' of https://github.com/strapi/strapi into plugin/content-manager 2017-07-31 17:45:04 +02:00
Pierre Burgy
25119b0c12 Merge branch 'alpha.5' of https://github.com/strapi/strapi into improvement/update-bootstrap 2017-07-31 17:44:34 +02:00
Aurélien GEORGET
e25afcc4fe Merge pull request #221 from strapi/rewrite/strapi 
Rewrite/strapi
 2017-07-31 17:42:48 +02:00
aurelsicoko
4e0ef33305 Comment 404 custom response return 2017-07-31 17:22:40 +02:00
aurelsicoko
2d7d893e9c Fix custom responses 2017-07-31 17:18:32 +02:00
cyril lopez
0a4d5fd021 set nested data 2017-07-31 16:51:21 +02:00
aurelsicoko
0ffd6203ff Display warning message when a dependency is missing 2017-07-31 16:49:15 +02:00
aurelsicoko
5dc0a06f96 Lint and fix typo on database configurations 2017-07-31 15:05:44 +02:00
Pierre Burgy
f9e686c994 Use Bootstrap alpha.6 2017-07-31 14:33:21 +02:00
Jim Laurie
09fe1bcb50 Fix require server on reload 2017-07-31 13:01:41 +02:00
aurelsicoko
14d76c835f Be able to generate files through the CLI and fix Mongoose connect 2017-07-31 12:52:08 +02:00
aurelsicoko
937a4839bd Fix path to retrieve defaults settings and remove useless files 2017-07-31 12:12:51 +02:00
aurelsicoko
8e55bd14a2 Move dictionary and update dependencies 2017-07-31 12:08:02 +02:00
Jim Laurie
ce897b30a6 Fix conflict 2017-07-31 12:04:40 +02:00
aurelsicoko
0157ca1c39 Clean middlewares 2017-07-31 11:51:30 +02:00
aurelsicoko
8d4bd40d18 Remove useless files 2017-07-31 11:42:14 +02:00
aurelsicoko
f853ae1de1 Remove hook/middleware listeners 2017-07-31 11:37:57 +02:00
aurelsicoko
316b7d897e Freeze AST 2017-07-31 11:35:57 +02:00
aurelsicoko
4576b85dde Resolve conflicts in bookshelf connector 2017-07-29 13:53:28 +02:00
aurelsicoko
202cf6f5a8 Resolve conflicts 2017-07-28 18:56:28 +02:00
aurelsicoko
48949d9f48 Update default configuration, and fix router for admin & plugins 2017-07-28 18:34:13 +02:00
Jim Laurie
51a2cfa232 Install strapi connector on create/update database 2017-07-28 16:56:17 +02:00
Jim Laurie
686c9aeb47 Change model config json format - enabled key 2017-07-28 16:39:34 +02:00