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,053 Commits 138 Branches 514 Tags
Commit Graph

15053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 v3.3.4 2020-11-25 16:22:45 +01:00
Yanuar Aditia
62231043ed
Add indonesian translations (#8384) 
* Add indonesian lang for strapi-admin & strapi-plugin-users-permission

* Add indonesian language for strapi-generate-plugin, strapi-plugin-content-manager, strapi-plugin-content-type, strapi-plugin-documentation, strapi-plugin-email

* Update Platform.sh button image URL (#8300)

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian lang for strapi-admin & strapi-plugin-users-permission

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian language for strapi-generate-plugin, strapi-plugin-content-manager, strapi-plugin-content-type, strapi-plugin-documentation, strapi-plugin-email

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

* Add indonesian translations

Signed-off-by: Yanuar Aditia <yanuaraditia@outlook.com>

Co-authored-by: yvesdo <yves@strapi.io>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-11-25 13:56:51 +01:00
dependabot[bot]
44b312a325
Bump nodemailer from 6.3.0 to 6.4.16 (#8704) 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.3.0 to 6.4.16.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.3.0...v6.4.16)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-25 13:55:36 +01:00
DMehaffy
bac867c816
Add support for columnType in Mongoose (#8723) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-11-25 13:54:44 +01:00
Valerian Pereira
c8e4ff3110
Restaurant spelled right (#8531) 
Signed-off-by: Valerian Pereira <valerianpereira25@gmail.com>
 2020-11-25 10:00:27 +01:00
Pierre Noël
ace487ace8
update gitignore in example and in generate-new (#8707) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-25 09:54:11 +01:00
dependabot[bot]
d394c8d3eb
Bump formik from 2.2.4 to 2.2.5 (#8703) 
Bumps [formik](https://github.com/formium/formik) from 2.2.4 to 2.2.5.
- [Release notes](https://github.com/formium/formik/releases)
- [Commits](https://github.com/formium/formik/compare/formik@2.2.4...formik@2.2.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-25 09:51:30 +01:00
dependabot[bot]
96343787fb
Bump @fortawesome/react-fontawesome from 0.1.11 to 0.1.12 (#8718) 
Bumps [@fortawesome/react-fontawesome](https://github.com/FortAwesome/react-fontawesome) from 0.1.11 to 0.1.12.
- [Release notes](https://github.com/FortAwesome/react-fontawesome/releases)
- [Changelog](https://github.com/FortAwesome/react-fontawesome/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FortAwesome/react-fontawesome/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-25 09:51:13 +01:00
cyril lopez
ba92484cf0
Fix #8606 (#8736) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-25 09:45:49 +01:00
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
cyril lopez
7cfaccf7fd
Merge pull request #8625 from meck93/feature/german-translations-update 
Translations Update: Adds & Improves German Translations
 2020-11-25 07:59:02 +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
Moritz Eck
28aac2ec24
Merge branch 'master' into feature/german-translations-update 2020-11-20 10:45:34 +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
Moritz Eck
c38e1c4da8
Merge branch 'master' into feature/german-translations-update 2020-11-18 17:35:06 +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
Moritz Eck
c7c14dccf0
Merge branch 'master' into feature/german-translations-update 2020-11-16 16:54:38 +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