yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-03 22:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 109 Branches 487 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
be82043f57 Design contentHeader 2017-07-26 17:00:00 +02:00
cyril lopez
469559a2c8 Design PluginLeftMenu 2017-07-26 16:36:05 +02:00
Jim Laurie
7d30921c48 Create new database 2017-07-26 16:15:31 +02:00
Jim Laurie
8bd5fa43c5 Merge branch 'plugin/settings-manager-dev' of github.com:strapi/strapi into plugin/settings-manager-dev 2017-07-26 15:37:27 +02:00
Jim Laurie
d0ac2602e2 Prepare new configs enabled option 2017-07-26 15:33:41 +02:00
cyril lopez
de28a5e0a6 Solve infinite loop bug on WithFormSection and add shownestedform dynamic 2017-07-26 15:22:54 +02:00
Jim Laurie
177db30f1e Update database connection 2017-07-26 12:43:46 +02:00
cyril lopez
654a7cf5aa Display input on the entire line if the input hads a nested input 2017-07-26 11:48:05 +02:00
cyril lopez
701c4ac9ca Update branch 
Merge branch 'plugin/settings-manager-dev' of https://github.com/strapi/strapi into plugin/settings-manager-dev
 2017-07-26 11:35:13 +02:00
Jim Laurie
5baa622d40 Fix conflict 2017-07-26 11:31:46 +02:00
Jim Laurie
380f0ba6ef Change security model data 2017-07-26 11:28:12 +02:00
cyril lopez
5bff8ed977 Created WithInput HOC and delete styles file in InputNumber and InputText 2017-07-25 17:52:30 +02:00
aurelsicoko
225eee077a Resolve startup issue 2017-07-25 17:12:18 +02:00
cyril lopez
cbdca75274 Handle language delete 2017-07-25 17:03:47 +02:00
Pierre Burgy
623ccf87a5 Update ROADMAP 2017-07-25 17:00:01 +02:00
Jim Laurie
671aa0ce30 Update database and fix 500 unknow config 2017-07-25 16:37:50 +02:00
cyril lopez
a36ad79001 EditFormSection styles from HOC and custom rendering for PopUpForm component 2017-07-25 15:34:43 +02:00
Jim Laurie
1ce08c22e7 Get database list 2017-07-25 15:11:11 +02:00
cyril lopez
1b53a4691d Created WithFormSection HOC and implemented it in EditFormSection and PopUpForm 2017-07-25 12:42:03 +02:00
cyril lopez
cb3ff240ab Link strapi mongoose 2017-07-25 11:50:25 +02:00
Pierre Burgy
8c5431d5ed Add settings manager in tests 2017-07-24 22:45:12 +02:00
Pierre Burgy
dee5cfe80a Rename settings manager folder 2017-07-24 22:40:47 +02:00
Pierre Burgy
2fa44662ff Update settings-manager scripts 2017-07-24 22:35:30 +02:00
Pierre Burgy
3acbc88747 Merge branch 'plugin/content-manager' of https://github.com/strapi/strapi into plugin/settings-manager 2017-07-24 21:17:56 +02:00
Pierre Burgy
d48d2ddccf Add postinstall script 2017-07-24 21:14:07 +02:00
aurelsicoko
60026f86c1 Remove after 2017-07-24 20:05:47 +02:00
aurelsicoko
4f7efef381 Update core architecture 2017-07-24 19:58:03 +02:00
Jim LAURIE
7585edffce Merge pull request #3 from soupette/plugin/settings-manager-dev 
Plugin/settings manager dev
 2017-07-24 19:23:58 +02:00
Jim LAURIE
ca4feb55d5 Merge pull request #2 from soupette/plugin/settings-manager-dev 
Plugin settings manager dev
 2017-07-24 19:19:26 +02:00
Jim Laurie
be8a7fc111 Merge branch 'plugin/settings-manager-dev' of github.com:soupette/strapi into plugin/settings-manager-dev 2017-07-24 19:18:31 +02:00
cyril lopez
20d30ec611 add styles in renderrow 2017-07-24 19:09:56 +02:00
cyril lopez
6ca1a333e8 change button name in list component 2017-07-24 18:25:40 +02:00
Jim Laurie
5e5ee6b2c9 Merge branch 'plugin/settings-manager-dev' of github.com:soupette/strapi into plugin/settings-manager-dev 2017-07-24 17:55:36 +02:00
cyril lopez
58fa8b9573 update branch 
Merge branch 'plugin/settings-manager-dev' of github.com:soupette/strapi into plugin/settings-manager-dev
 2017-07-24 17:30:11 +02:00
cyril lopez
2ef94154be added change default language and update eslint to support setstate in component did mount 2017-07-24 17:28:10 +02:00
Jim Laurie
219e96a4d9 Fix conflicts 4.8 2017-07-24 16:24:38 +02:00
Jim Laurie
c7a22fd83f Fix conflicts 4.8 2017-07-24 16:22:44 +02:00
Jim Laurie
46ea35630f Fix conflict 2017-07-24 16:04:53 +02:00
Jim Laurie
51fb73c7a2 Fix conflict 2017-07-24 16:02:14 +02:00
Jim Laurie
c2108575b4 Fix no string is empty on update 2017-07-24 11:41:44 +02:00
Jim Laurie
c94f7ba2f9 Merge branch 'plugin/settings-manager-dev' of github.com:soupette/strapi into plugin/settings-manager-dev 2017-07-24 11:13:06 +02:00
cyril lopez
297afef800 added put sagas 2017-07-24 11:11:28 +02:00
Jim Laurie
9480dad21c Fix conflicts 2017-07-24 10:52:55 +02:00
Pierre Burgy
77a8bcfd78 Change strapi-helper-version in plugin generator 2017-07-21 18:23:37 +02:00
Pierre Burgy
097920d941 Admin improvements 2017-07-21 18:15:43 +02:00
Pierre Burgy
81ada393b8 Merge branch 'master' of https://github.com/strapi/strapi into plugin/content-manager 2017-07-21 17:25:08 +02:00
cyril lopez
cd85aca094 render popupform 2017-07-21 17:22:51 +02:00
Pierre Burgy
f7bc52559a Format packages 2017-07-21 17:22:29 +02:00
Pierre Burgy
e860a1d172 Fix plugins setup 2017-07-21 17:18:47 +02:00
cyril lopez
4138d741f1 generated popup form 2017-07-21 16:43:54 +02:00