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

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Laurie
e1f6af4911 Fix plugin install node modules dependencies 2017-10-23 17:32:18 +02:00
Aurelsicoko
90e2993e0d Fix Content-Manager relations management 2017-10-23 17:07:57 +02:00
cyril lopez
d77456e78c Update strapi-generate-plugin 2017-10-23 16:12:37 +02:00
cyril lopez
e109984181 Setup 2017-10-23 15:58:01 +02:00
Aurélien GEORGET
345d73f578 Merge pull request #299 from strapi/alpha.6.4 
Alpha.6.4
 2017-10-23 14:39:14 +02:00
Aurelsicoko
c5daff6d4e Fix setup script 2017-10-23 14:16:30 +02:00
Aurélien GEORGET
52bab38a29 Merge pull request #292 from strapi/shared-components 
Shared components
 2017-10-23 14:16:11 +02:00
Aurelsicoko
b0d2a3c838 3.0.0-alpha.6.4 2017-10-23 12:24:44 +02:00
cyril lopez
2bf8f8f0bd Fix admin messages typos and optimize logos 2017-10-23 11:44:21 +02:00
Aurelsicoko
f51bfee8f0 Merge branch 'alpha.6.4' of github.com:strapi/strapi into alpha.6.4 2017-10-23 11:35:28 +02:00
Aurelsicoko
17f1425b6b Use dynamic separator instead of '/' 2017-10-23 11:30:36 +02:00
Aurélien GEORGET
4aa90f43de Merge pull request #298 from strapi/fix/lifeCycle 
Fix life cycle
 2017-10-23 11:23:48 +02:00
Aurélien GEORGET
25efca600e Merge pull request #297 from strapi/fix/links-doc 
Fix edit link
 2017-10-23 11:23:35 +02:00
Aurélien GEORGET
c294713537 Merge pull request #296 from strapi/fix/relations-nature 
Fix get nature
 2017-10-23 11:23:26 +02:00
Aurélien GEORGET
26e6961517 Merge pull request #295 from strapi/fix/mysql-schema 
Don't set schema on MySQL connection
 2017-10-23 11:23:13 +02:00
Aurélien GEORGET
51572d7fa8 Merge pull request #294 from strapi/enhancement/router 
Use koa-router-joi instead of koa-joi-router
 2017-10-23 11:23:03 +02:00
Jim Laurie
2c06c48400 Lyfe cycle fix #287 2017-10-23 11:01:58 +02:00
Aurelsicoko
eb4f52ab20 Fix edit link 2017-10-23 10:56:06 +02:00
Aurelsicoko
b670050e59 Don't set schema on MySQL connection 2017-10-23 10:51:32 +02:00
Jim Laurie
6abfea789e Fix get nature 2017-10-23 10:51:11 +02:00
Aurelsicoko
de162b3201 Use koa-router-joi instead of koa-joi-router 2017-10-23 10:48:19 +02:00
Aurélien GEORGET
e6a1cef7b1 Merge pull request #284 from spruce/pr/fix-contributing 
fix: Contributing.md
 2017-10-23 10:25:15 +02:00
cyril lopez
07ac01324c Created ListRow component 2017-10-21 17:02:25 +02:00
cyril lopez
fe56274217 Fix content-manager CANCEL_CHANGES action bug 2017-10-21 15:49:32 +02:00
cyril lopez
b156a9fc73 Display id in content-manager SelectOne and SelectMany if no label iss provided 2017-10-21 15:41:36 +02:00
cyril lopez
9f8d5ffb79 Fix SelectMany duplicate data 2017-10-21 15:25:00 +02:00
cyril lopez
dc5d8b8e90 Update branch 2017-10-20 11:21:09 +02:00
cyril lopez
56025bcc0f Fix conflict 2017-10-20 11:11:37 +02:00
Jim Laurie
7cdedb7d20 Fix ejs 2017-10-19 18:30:37 +02:00
Felix Fichte
6cd6ef2709 fix: Contributing.md 2017-10-18 23:16:54 +02:00
Aurelsicoko
2ef73c5b42 Use dynamic separator instead of '/' 2017-10-18 18:40:32 +02:00
Aurelsicoko
3bb952d58f Update dependencies 2017-10-18 18:39:32 +02:00
cyril lopez
f683193d97 Fix SelectMany styles 2017-10-18 18:37:36 +02:00
cyril lopez
2274637b00 Remove params dominant when relation change from manyToMany to something else 2017-10-18 17:16:28 +02:00
cyril lopez
5c7345167f Integrate welcome page 2017-10-18 16:51:50 +02:00
Aurélien GEORGET
acb2b57d59 Merge pull request #276 from strapi/alpha.6 
Release - 3.0.0-alpha.6
 2017-10-18 15:16:58 +02:00
cyril lopez
f8196fdd08 Strapi setup 2017-10-18 14:56:23 +02:00
cyril lopez
30af991003 Update branch 
Merge branch 'alpha.7' of github.com:strapi/strapi into alpha.7
 2017-10-18 14:45:10 +02:00
cyril lopez
b3f20efb34 Merge pull request #281 from strapi/fiber/error-handling 
Fiber/error handling
 2017-10-18 14:44:49 +02:00
cyril lopez
996efdd427 Update documentation, force trash icon in content builder tableRow and update app content manager reducer 2017-10-18 14:29:25 +02:00
cyril lopez
ae1cead24d Remove empty select option in content type form create 2017-10-17 17:42:18 +02:00
cyril lopez
8903a6bf57 Fix pop up relation style 2017-10-17 17:33:32 +02:00
cyril lopez
69c99a8700 Add IcoContainer component to content-manager 2017-10-17 16:41:57 +02:00
cyril lopez
3504624c84 Create documentation for Ico and IcoContainer components 2017-10-17 16:11:30 +02:00
cyril lopez
8f35c9186c Create documentation for Ico and IcoContainer components 2017-10-17 16:09:15 +02:00
cyril lopez
bd9622ce8f Created Ico and IcoContainer components 2017-10-17 15:53:50 +02:00
cyril lopez
0f6737b416 Use shared PopUpWarning in settings-manager update strapi-helper-plugin PopUpWarning (so it can display only one button) rewrite the component with function instead of class, update the associated documentation 2017-10-17 14:45:43 +02:00
cyril lopez
a1911bbb08 Refacto component PopUpWarning 2017-10-17 14:23:28 +02:00
cyril lopez
cc87727536 Fix content manager decimal attribute 2017-10-17 13:57:59 +02:00
cyril lopez
f29d6d0ec1 Add link in content type builder model popup, update Input props, Update PopUpWarning and Input doc 2017-10-17 13:53:36 +02:00