yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 16:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 115 Branches 488 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cyril lopez
bc77f06acd Fix content-manager content-type navigation 2017-10-17 12:19:41 +02:00
cyril lopez
be5f28260b Fix content-type creation bug in content-manager 2017-10-17 11:37:34 +02:00
cyril lopez
3c9434c024 Add ErrorBoundary component to handle plugins errors 2017-10-17 10:02:41 +02:00
cyril lopez
33720effd5 Run setup 2017-10-17 09:08:33 +02:00
Aurélien GEORGET
a2f48e4433 Merge pull request #277 from strapi/migrate/react-bootstrap 
Migrate/react bootstrap
 2017-10-16 18:03:27 +02:00
cyril lopez
fb3e78245e Fix Edit database modal 2017-10-16 17:19:41 +02:00
Aurélien GEORGET
dd1565366c Merge branch 'master' into alpha.6 v3.0.0-alpha.6.3 2017-10-16 16:38:30 +02:00
cyril lopez
e6817d369c Refacto lib input 2017-10-16 16:35:20 +02:00
cyril lopez
9b1d658fa5 Fix settings-manager input styles 2017-10-16 16:24:48 +02:00
cyril lopez
faae05bd34 Fix input styles in strapi-helper-plugin 2017-10-16 16:05:42 +02:00
Aurelsicoko
9586a8cabc 3.0.0-alpha.6.3 2017-10-16 15:13:28 +02:00
Aurelsicoko
81763a3281 Fix issues for release 2017-10-16 15:09:43 +02:00
cyril lopez
203f7de94f Fix styles due to bootstrap upgrade 2017-10-16 14:30:26 +02:00
cyril lopez
8c26406654 Upgrade bootstrap 2017-10-16 13:37:27 +02:00
Aurelsicoko
b5955739da 3.0.0-alpha.6.2 2017-10-16 12:29:47 +02:00
Aurelsicoko
ff6b62ac7e Update scripts path 2017-10-16 12:28:48 +02:00
cyril lopez
d4b7a5842a Fix component pagination warning 2017-10-16 12:04:29 +02:00
Aurelsicoko
5d06875a20 3.0.0-alpha.6.1 2017-10-16 11:44:29 +02:00
cyril lopez
61f6dc2eb6 Fix input proptype 2017-10-16 11:43:13 +02:00
Aurelsicoko
e324e8b66d Update dependencies 2017-10-16 11:34:06 +02:00
Aurelsicoko
287b5e17f9 3.0.0-alpha.6 2017-10-16 11:07:41 +02:00
Aurelsicoko
02793eab18 Reload app on content-type creation 2017-10-16 10:55:48 +02:00
Aurelsicoko
cacb484efe Fix back button on 404 2017-10-16 10:33:23 +02:00
cyril lopez
7828248150 Upgrade react and fix warnings 2017-10-16 09:52:47 +02:00