yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 03:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 118 Branches 494 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
bdf708d6eb Fix conflicts 2019-12-04 18:31:55 +01:00
soupette
dd5fd750cb Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview 2019-12-04 18:27:50 +01:00
soupette
29e6cc5315 Fix conflicts 2019-12-04 18:26:38 +01:00
soupette
2c2e012b8a Fix design relations 2019-12-04 18:23:07 +01:00
Virginie Ky
8a9f8007a8 Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview 2019-12-04 18:05:14 +01:00
cyril lopez
e8f70ccc7b
Merge pull request #4642 from strapi/cm-ui-fixes 
Dynamic Zone Content manager ui fixes
 2019-12-04 18:04:39 +01:00
Virginie Ky
582e94b8d9 ListView with DZ tabs 2019-12-04 17:53:10 +01:00
Alexandre Bodin
fe5ff4bc83 Handle and parse datetime & timestamps 2019-12-04 17:49:14 +01:00
Alexandre Bodin
06b0cc22c8 parse date types 2019-12-04 17:49:13 +01:00
Alexandre Bodin
4c784318d8 Handle time type 2019-12-04 17:49:13 +01:00
Alexandre Bodin
95c7a515d7 Split parser and formatter in specific files 2019-12-04 17:49:13 +01:00
Alexandre Bodin
2dbad3fcde Init date type splitting 2019-12-04 17:49:12 +01:00
Alexandre BODIN
4c72a53536
Merge pull request #4638 from Cow258/@4625 
Fix no response when get user permission role with internal network
 2019-12-04 17:43:11 +01:00
Alexandre BODIN
88c530e133
Merge branch 'master' into @4625 2019-12-04 17:42:58 +01:00
Alexandre BODIN
e24a048e9b
Merge pull request #4652 from strapi/swagger/packUpdate 
Update Swagger-UI for Documentation plugin
 2019-12-04 17:39:02 +01:00
soupette
7358d7eaf2 Fix prompt on initial render 2019-12-04 17:14:53 +01:00
Alexandre Bodin
932c97d216 Fix dz can use new components 2019-12-04 17:12:21 +01:00
soupette
410073dc05 Add condition to close modal when trying to set fields in a component or a DZ that is not created 2019-12-04 17:11:42 +01:00
soupette
04e5e8db34 Add prompt to know when the user can navifate between types 2019-12-04 16:35:02 +01:00
soupette
384288e562 Fix conflicts 2019-12-04 15:29:08 +01:00
soupette
f4e9b3540c Handle edit component 2019-12-04 15:27:45 +01:00
Virginie Ky
0a6020cb19 Retrieve nested components 2019-12-04 15:14:26 +01:00
soupette
466ac4c806 Remove option to add self compo in a compo 2019-12-04 14:20:58 +01:00
Derrick Mehaffy
140f0f4064
Update Swagger Dist to 3.24.3 2019-12-04 05:37:08 -07:00
Derrick Mehaffy
3a76652245
Update some depends 
A few of which haven't been updated in 2 years x_x
 2019-12-04 05:32:43 -07:00
Jørgensen
7fd2dd348d
Merge branch 'master' into patch-7 2019-12-04 12:19:42 +01:00
soupette
36a9c65845 Merge branch 'front/dynamic-zones-ctb-listview' of github.com:strapi/strapi into front/dz-post-data 2019-12-04 11:52:54 +01:00
Virginie Ky
c425adb74f Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview 2019-12-04 11:50:29 +01:00
Virginie Ky
8a95ff344d ListView Tab ip 2019-12-04 11:50:04 +01:00
soupette
c1c8591317 Handle delete temporary type 2019-12-04 11:40:09 +01:00
Alexandre Bodin
3bfb13070e Do not unset polymorphic target relations 2019-12-04 11:04:50 +01:00
soupette
da065210b5 Update app menu 2019-12-04 10:54:57 +01:00
soupette
7a0b3348c1 Fix blocker icons 2019-12-04 10:34:18 +01:00
soupette
db136c47dd Fix left menu edit icon baseline 2019-12-04 10:16:48 +01:00
Alexandre Bodin
e8078c1ee9 Fix component category edition and allow icon with hyphen in the name 2019-12-04 09:56:07 +01:00
soupette
71d8de535b Add PUT|DELETE category 2019-12-04 09:40:15 +01:00
harimkims
5f62dbc9a5 Update KO translation 2019-12-04 17:08:08 +09:00
soupette
0a8cf862b5 Add getTrad util to strapi-generate-plugin 2019-12-04 09:04:04 +01:00
soupette
e7e59a891d Add editable option to left menu component 2019-12-04 08:47:17 +01:00
soupette
61781708a7 Handle delete content type and components 2019-12-03 23:27:51 +01:00
soupette
70124241a7 Handle PUT|POST components 2019-12-03 23:18:52 +01:00
soupette
0cf9795733 Update tests and method to PUT a content type 2019-12-03 23:02:14 +01:00
soupette
8a039162ce Fix POST for relations and clean attributes dy removing null keys 2019-12-03 22:24:18 +01:00
Alexandre Bodin
0ab7ffd3c3 Allow some null values in ctb 2019-12-03 21:43:45 +01:00
soupette
03db899611 Reset plugin after posting data so the cycle is new again 2019-12-03 20:48:54 +01:00
soupette
2de33c6103 Remove imports that are not found until parent branch is ok 2019-12-03 20:35:42 +01:00
soupette
b7b2f0e469 Merge branch 'front/dynamic-zones-ctb-listview' of github.com:strapi/strapi into front/dz-post-data 2019-12-03 20:28:42 +01:00
soupette
adb4330811 Handle submit content type 2019-12-03 20:28:15 +01:00
Sulakin Vadim
d77a8c03f3
Merge pull request #2 from strapi/master 
Update from the wizard
 2019-12-03 22:22:39 +03:00
soupette
7fb450ebfd Add helper to format content type data 2019-12-03 20:07:07 +01:00