yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,036 Commits 138 Branches 514 Tags
Commit Graph

15036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ELABBASSI Hicham
8d9eee1cb3
Merge pull request #8734 from strapi/rf/bug-fix 
Fix small bugs related to RF migration
 2020-11-25 09:45:33 +01:00
soupette
b99ae893d8 Add notif for PUT actions and fix delete single type 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-25 08:51:26 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
ELABBASSI Hicham
a3e4553191
Merge pull request #8456 from strapi/core/cm-refacto-ediview-container 
CM improvements
 2020-11-20 11:50:30 +01:00
soupette
5718540247 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-20 11:29:36 +01:00
soupette
6e13c3f2a5 Merge branch 'feature/relational-fields' of github.com:strapi/strapi into core/cm-refacto-ediview-container 2020-11-20 10:46:58 +01:00
ELABBASSI Hicham
7d658a148d
Merge pull request #8584 from strapi/relational-fields/split-st-ct-front 
Relational fields/split st ct front
 2020-11-19 19:52:26 +01:00
soupette
8ef260f0dd Fix Pr feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-19 18:29:51 +01:00
soupette
0086165a6a Merge branch 'relational-fields/split-st-ct-front' of github.com:strapi/strapi into relational-fields/split-st-ct-front 2020-11-19 18:06:24 +01:00
soupette
2515ce16fd Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-19 18:04:02 +01:00
ELABBASSI Hicham
f2f01a133c
Merge pull request #8697 from strapi/MeXaaR-feature/duplicate-document 
MeXaaR feature/duplicate document
 2020-11-19 17:15:14 +01:00
soupette
3d19804b86 Add timestamps to fields to remove 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-19 16:59:47 +01:00
soupette
031338bdb8 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-19 15:12:34 +01:00
Akhil Mohan
6b6c1e2f7d
made the contributing.md a bit more clear (#8689) 
Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>
 2020-11-19 10:07:46 +01:00
soupette
3675c19e0c Merge branch 'core/cm-refacto-ediview-container' of github.com:strapi/strapi into MeXaaR-feature/duplicate-document 2020-11-19 09:43:40 +01:00
cyril lopez
3cb5396277
Merge pull request #7987 from lachoseparis/feature/dynamiczone-categories 
Added Categories selector for dynamic zone
 2020-11-18 17:18:05 +01:00
Boudringhin Julien
553a188bd6
Merge branch 'master' into feature/dynamiczone-categories 2020-11-18 17:07:55 +01:00
cyril lopez
a7156c9471
Merge pull request #8679 from akhilmhdh/fix/nonrepeatable-comp-onclick 
Fixed click event on non-repeatable empty component
 2020-11-18 10:58:26 +01:00
akhilmhdh
c1b7ab3231 fixed click event on non-repeatable empty component 
Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>
 2020-11-18 13:12:34 +05:30
ELABBASSI Hicham
7f2fc8370f
Merge pull request #8672 from strapi/relation-fields/fix-permissions-split 
Migrate RBAC views to new API format
 2020-11-17 17:49:34 +01:00
soupette
4eaea5daf1 Fix null or undefined for remove key in object 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-17 14:28:28 +01:00
soupette
63f376e3fd Fix migration split ct & st 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-17 12:19:43 +01:00
soupette
402b5db42b Add missing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-17 12:00:07 +01:00
soupette
4f27b8879c Remove useless reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-16 18:14:34 +01:00
soupette
dd118902f2 Fix nav between create and update and add tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-16 17:42:36 +01:00
soupette
c31900a1c8 Change layout file location and add tests to editsettingsview utils 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-16 16:55:58 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 v3.3.3 2020-11-16 16:47:16 +01:00
Boudringhin Julien
e168f257c5
Merge branch 'master' into feature/dynamiczone-categories 2020-11-16 14:21:40 +01:00
dependabot[bot]
6010c5a8e9
Bump snyk from 1.400.0 to 1.427.0 (#8656) 
Bumps [snyk](https://github.com/snyk/snyk) from 1.400.0 to 1.427.0.
- [Release notes](https://github.com/snyk/snyk/releases)
- [Changelog](https://github.com/snyk/snyk/blob/master/.releaserc)
- [Commits](https://github.com/snyk/snyk/compare/v1.400.0...v1.427.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-16 12:58:31 +01:00
Jean-Sébastien Herbaux
4a33829f11
Sanitize /upload/search/:q route (#8658) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-11-16 12:55:35 +01:00
jbo@lachose.fr
636877c7d0
Remove comment on DynamicZone 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:48 +01:00
jbo@lachose.fr
c4a36471cc
Create ComponentsList 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:32 +01:00
jbo@lachose.fr
6887cc28e9
CategoryItem remove background color 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:06 +01:00
jbo@lachose.fr
e1e4915947
CategoryItem : create handleExited function 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:14:43 +01:00
jbo@lachose.fr
47bf5712b2
BannerWrapper include updates from @HichamELBSI 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:14:24 +01:00
jbo@lachose.fr
a69cc8b818
update logic of collapses 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:13:59 +01:00
jbo@lachose.fr
89613f34a9
ComponentsPicker Add categoriesList padding-bottom 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:13:29 +01:00
jbo@lachose.fr
d6915d3e57
Update componentPickerTitle margin-bottom to 10px 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:12:42 +01:00
dependabot[bot]
d3c249c876
Bump bootstrap from 4.5.2 to 4.5.3 (#8579) 
Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](https://github.com/twbs/bootstrap/compare/v4.5.2...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-12 15:57:21 +01:00
cyril lopez
8e098e0a37
Merge pull request #8617 from strapi/dependabot/npm_and_yarn/formik-2.2.4 
Bump formik from 2.1.5 to 2.2.4
 2020-11-12 15:25:49 +01:00
Alexandre BODIN
aee6ed48ef
Merge pull request #8550 from strapi/relational-fields/split-st-ct 
relational fields/split st ct
 2020-11-12 13:11:03 +01:00
Alexandre Bodin
47d9fb03c1 Change mode to fix body issue in rapidoc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-12 12:40:59 +01:00
Alexandre Bodin
ce110f649d Fix open-api 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-12 12:28:19 +01:00
dependabot[bot]
3bfa2929f3
Bump formik from 2.1.5 to 2.2.4 
Bumps [formik](https://github.com/formium/formik) from 2.1.5 to 2.2.4.
- [Release notes](https://github.com/formium/formik/releases)
- [Commits](https://github.com/formium/formik/compare/v2.1.5...formik@2.2.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-11 06:11:51 +00:00
Alexandre Bodin
b75aa3e9ef Merge branch 'master' into documentation 2020-11-10 19:04:21 +01:00
Alexandre Bodin
17ea510715 v3.3.2 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre BODIN
c4e681e017
Merge pull request #8615 from strapi/fix/update-notif-file-access 
Fix write access error of the update-notifier
 2020-11-10 19:01:09 +01:00
Pierre Noël
1be4237e4c fix write access error of the update-notifier 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-10 18:29:25 +01:00
DMehaffy
092a130da2
Update Heroku guide to set NODE_ENV to production (#8587) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-11-10 09:54:43 -07:00
meganelacheny
b71181d5ab
Documentation: update notifications + "Application" section in admin panel (#8613) 
* Write note about new notifications + Application section

* Improve other note in Update Strapi version

* Fix formatting issue

* Update docs/v3.x/guides/update-version.md

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>

Co-authored-by: Mattias van den Belt <mattiasvandenbelt@gmail.com>
 2020-11-10 09:54:09 -07:00