yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,126 Commits 121 Branches 507 Tags
Commit Graph

7126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
2448bc63fe Fix button delay 2019-02-27 17:51:41 +01:00
soupette
d3a4c2a6f3 Add new state to overlay blocker 2019-02-27 17:48:06 +01:00
Jim LAURIE
c101241611
Merge pull request #2890 from strapi/add/sqlitePRTemplate 
Add SQLite to PR Template
 2019-02-26 11:46:37 +01:00
DMehaffy
b5b9611bf3
Add SQLite to PR Template 2019-02-26 03:31:11 -07:00
Jim LAURIE
849795be9c
Merge pull request #2862 from strapi/improve/ctm 
Allow to create new entry for models that have only relational fields
 2019-02-25 14:56:35 +01:00
Jim LAURIE
9c5850a734
Merge branch 'master' into improve/ctm 2019-02-25 14:56:27 +01:00
Jim LAURIE
b64bd446f1
Merge pull request #2864 from rejifald/bookshelf-template-typo-fix 
Added mising await statement in bookshelf template
 2019-02-25 12:26:56 +01:00
Jim LAURIE
7bbf245af7
Merge branch 'master' into bookshelf-template-typo-fix 2019-02-25 12:26:49 +01:00
Jim LAURIE
c156b1e7e9
Merge pull request #2869 from strapi/fix/displayedAttribute 
Display ID as default displayed attribute
 2019-02-25 12:11:24 +01:00
Jim LAURIE
4242d99c19
Merge branch 'master' into fix/displayedAttribute 2019-02-25 12:11:18 +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
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
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
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
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
Oleksandr Zhuravlov
f0f4b13b8f added mising await statement in bookshelf template 2019-02-20 16:47:41 +02: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
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
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
Jim LAURIE
78e3e2ca26
Merge branch 'master' into fix-sqlite-migration 2019-02-18 19:10:33 +01:00
Jim LAURIE
4e2f976ca0 Fix sqlite migration tmp table 2019-02-18 18:12:34 +01:00
Jim LAURIE
e5f36ee327
Merge pull request #2709 from strapi/enhancement-install-cmd 
Use shelljs for every exec command
 2019-02-18 15:57:37 +01:00
Jim LAURIE
a26ac6c6c3
Merge branch 'master' into enhancement-install-cmd 2019-02-18 15:57:25 +01:00
Jim LAURIE
9c328799f6
Merge pull request #2839 from strapi/fix-findone-graphql 
Fix findOne query for GraphQL
 2019-02-17 17:15:19 +01:00
Jim LAURIE
84097f26bc
Merge branch 'master' into fix-findone-graphql 2019-02-17 17:15:03 +01:00
Jim LAURIE
c53d445d35
Merge pull request #2824 from strapi/fix/bookshelf-upload-query-findone 
Fix bookshelf Upload Plugin findOne giving 500 error
 2019-02-17 17:03:57 +01:00
Jim LAURIE
e5c8afe24e
Merge branch 'master' into fix/bookshelf-upload-query-findone 2019-02-17 17:03:01 +01:00