yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-17 20:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 122 Branches 495 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
f55e1f704b Do not parse date types 2019-12-05 12:29:24 +01:00
soupette
fb2b28efc7 Fix conflicts 2019-12-05 12:07:30 +01:00
Virginie Ky
95f2edf72c Merge branch 'front/dynamic-zones-ctb-listview' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview 2019-12-05 12:03:40 +01:00
Virginie Ky
fafeb97485 Modal close button UI 2019-12-05 12:03:16 +01:00
soupette
94bd80b59a Add production mode to ctb 2019-12-05 11:59:23 +01:00
Alexandre Bodin
dd072c40c3 Refactor column creation to use plain knex schema builder 2019-12-05 11:37:07 +01:00
Nevermoi
87f8f91b52
Update model.template 
Wrong description of beforeSave and afterSave for model, since updating will not trigger these two hooks
 2019-12-05 10:48:30 +08:00
Virginie Ky
8b0d32178c Edit main & add attr & edit attr & add compo in DZ Nav 2019-12-05 00:01:17 +01:00
cyril lopez
36cad7e3d3
Merge branch 'master' into master 2019-12-04 23:08:28 +01:00
soupette
2153368bc5 Fix modal baseline 2019-12-04 23:06:26 +01:00
soupette
f3398146f3 Fix Modal header button 2019-12-04 22:47:19 +01:00
Mickael D
359fd2bb21
Merge branch 'master' into fix/4537 2019-12-04 21:55:35 +01:00
soupette
7b19bfd7cb Sort compos in select and add backheader 2019-12-04 20:55:05 +01:00
Anand Chowdhary
aa69553246
Change "Mac O/S" to "macOS" 2019-12-04 11:53:44 -08:00
soupette
eb330daf7a Update trads 2019-12-04 19:07:35 +01:00
soupette
c8d09821c7 Add trad for single value 2019-12-04 18:57:06 +01:00
Alexandre Bodin
909266232f Add tests on datetime 2019-12-04 18:49:47 +01:00
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