yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-25 00:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 121 Branches 490 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurélien Georget
4875649bc7 Fix CORS issue 2019-02-22 15:25:11 +01:00
Jim LAURIE
4b2f261604
Merge pull request #2873 from strapi/harmonize/front-end-paths 
Remove relative imports in all the plugins
 2019-02-22 14:05:28 +01:00
Ky
73928e1af5 merge without conflict 2019-02-22 12:48:01 +01:00
Aurélien Georget
ceac222cb6 Fix typo 2019-02-22 12:40:29 +01:00
Ky
5541bc3d77 UI fixes 2019-02-22 12:20:47 +01:00
Ky
1f5732e741 UI fixes 2019-02-22 12:20:16 +01:00
soupette
28bc9f23a8 Change paths in users-permissions 2019-02-22 11:16:42 +01:00
soupette
8907261260 Change paths in doc and settings email 2019-02-22 11:11:25 +01:00
soupette
31b317163d Change paths in ctb 2019-02-22 10:56:38 +01:00
Aurélien Georget
6f61987ad7 Fix conflicts 2019-02-22 10:54:39 +01:00
Aurélien Georget
a80a3bd593 Disable CORS for fetching the videos & remove warnings logs 2019-02-22 10:53:52 +01:00
soupette
d84ed0ec93 Change path in ctm compos 2019-02-22 10:46:42 +01:00
soupette
7437e2d52e Change path in ctm containers 2019-02-22 10:34:59 +01:00
soupette
ab158dddd6 Change to absolute path strapi-helper 2019-02-22 10:22:21 +01:00
Ky
e01dc0eee3 Some UI fixes 2019-02-22 10:09:07 +01:00
soupette
0ce1456d94 Change to absolute path strapi-admin components 2019-02-22 10:08:59 +01:00
soupette
ae7f447746 Add aboslute path in strapi-admin/containers 2019-02-22 10:05:07 +01:00
Aurélien Georget
4f322de0fd Add events on the users & permissions settings part 2019-02-21 16:48:59 +01:00
Aurélien Georget
bccf12e3b1 Fix conflicts 2019-02-21 15:45:20 +01:00
Aurélien Georget
fc5b2ee025 Add events on configure layout/edit fields links 2019-02-21 15:43:30 +01:00
Jim LAURIE
8ade1c223e
Merge pull request #2868 from Jefwillems/patch-2 
Fix typo in admin generation cli.
 2019-02-21 15:40:17 +01:00
Jim LAURIE
ae38251dc2
Fix empty space 2019-02-21 14:29:08 +01:00
Aurélien Georget
f57161df74 Display ID as default displayed attribute 2019-02-21 13:59:10 +01:00
Jef Willems
7f1f288b31
Fix typo 2019-02-21 11:58:34 +01:00
Aurélien Georget
6cb88302ca Add events content manager 2019-02-20 18:23:25 +01:00
Ky
9e1620cab9 Onboarding videos with manual events and Amplitude tracking with timestamp 2019-02-20 16:13:46 +01:00
Oleksandr Zhuravlov
f0f4b13b8f added mising await statement in bookshelf template 2019-02-20 16:47:41 +02:00
Aurélien Georget
cd4313236c Add events in the content-type builder 2019-02-20 15:31:07 +01:00
Sinelle Richard
8b0f504ebc
Merge branch 'master' into master 2019-02-20 14:51:47 +01:00
soupette
b847cee7ac Fix redirect link 2019-02-20 14:39:14 +01:00
soupette
4cb3469bd3 Allow to create new entry for models that have only relational fields 2019-02-20 14:25:49 +01:00
REDDY PRASAD
7c77cb985f ✨ Add granularity of 'max size upload' for file upload 2019-02-20 11:12:23 +05:30
Bobbylee Ingalls
168769c5d1
Updated minor grammar defect 2019-02-19 08:58:36 -06:00
Jim LAURIE
c50a586418
Merge pull request #2852 from strapi/3.0.0-alpha.24.1 
3.0.0 alpha.24.1
 2019-02-19 11:31:11 +01:00
Jim LAURIE
14e3b8fdbb 3.0.0-alpha.24.1 v3.0.0-alpha.24.1 2019-02-19 11:29:51 +01:00
Jim LAURIE
08f5340c42 Update migration guide 2019-02-19 11:29:16 +01:00
Jim LAURIE
ec1c46ba6a
Merge pull request #2851 from strapi/hotfix-ctm-pluginid 
Fix plugin id content manager build
 2019-02-19 11:25:22 +01:00
Jim LAURIE
5d95dfec3d fix plugin id 2019-02-19 11:19:32 +01:00
Sinelle Richard
d87616e716 2827: Return bad request in case of empty files attribut 2019-02-19 10:29:26 +01:00
Jim LAURIE
9a144b5dab
Merge pull request #2849 from strapi/3.0.0-alpha.24 
3.0.0 alpha.24
 2019-02-19 10:18:38 +01:00
Jim LAURIE
a74c38ff65 3.0.0-alpha.24 v3.0.0-alpha.24 2019-02-19 10:16:24 +01:00
Jim LAURIE
4c5e101877 Add migration guide to alpha.24 2019-02-19 10:15:46 +01:00
Jim LAURIE
5adda20150
Merge pull request #2814 from strapi/ctm-edit-links 
Add helper links to the content manager on dev mode
 2019-02-19 09:29:26 +01:00
Jim LAURIE
10d905ed76
Merge branch 'master' into ctm-edit-links 2019-02-19 09:29:07 +01:00
Jim LAURIE
a8d19a64ec
Merge pull request #2847 from strapi/fix-sqlite-migration 
Fix sqlite migration relations
 2019-02-19 09:28:30 +01:00
Jim LAURIE
84fd769913
Merge branch 'master' into fix-sqlite-migration 2019-02-19 09:28:22 +01:00
Jim LAURIE
1a91bd5ea6 Fix sqlite migration 2019-02-19 09:21:07 +01:00
virginieky
cfca438767
Merge branch 'master' into ctm-edit-links 2019-02-18 19:41:35 +01:00
virginieky
6ff17263e9
Merge branch 'master' into ctm-edit-links 2019-02-18 19:41:13 +01:00
Jim LAURIE
dc920a5db9
Merge pull request #2843 from strapi/fix-sqlite-migration 
Fix sqlite migration tmp table
 2019-02-18 19:10:44 +01:00