yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-20 14:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 123 Branches 496 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
375b902301
Bump eslint-config-prettier from 6.11.0 to 6.15.0 (#8746) 
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.11.0 to 6.15.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.11.0...v6.15.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-11-26 13:10:11 +01:00
ELABBASSI Hicham
0ba3f0746d
Merge pull request #8749 from strapi/rf/enable-sort 
Enable sort on relation
 2020-11-26 12:15:19 +01:00
soupette
6c9955d210 Apply PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-26 11:56:24 +01:00
soupette
2bba46ffc5 Fix sort 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-26 10:41:01 +01:00
soupette
a57329d9c6 Enable sort on relations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-26 10:11:20 +01:00
cyril lopez
3c9686f986
Merge pull request #8727 from strapi/relational-fields/display-in-list 
Display relational fields in the list view
 2020-11-26 09:46:38 +01:00
HichamELBSI
7498da6c4e Fix relationType 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-26 09:37:41 +01:00
HichamELBSI
08fa129884 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-25 18:56:31 +01:00
Abdón Rodríguez Davila
b4eba072a6
Remove files that no longer need to be changed (#8730) 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2020-11-25 07:39:50 -08:00
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
HichamELBSI
ea4b0bbe8f Merge branch 'master' into rbac/decorrelate-crud 2020-11-25 16:06:30 +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
Gandharv
472c1260ea
fix(docs): Remove unreachable code (#8388) 
In the catch block the code would never reach the return statement, hence removing
 2020-11-25 10:00:09 +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
DMehaffy
161b7198c9
Update docs FAQ with component filtering (#8724) 
* Update docs FAQ with component filtering

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* pr feedback

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-11-24 07:59:59 -08:00
HichamELBSI
91d772186b Display relational field in the list view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-23 22:49:40 +01:00
mijorus
9b6f7a54f7
Improved raw SQL queries example (#8720) 2020-11-23 07:42:16 -07:00
Akhil Mohan
bc3606d726
fixed admin-tutorial broken link in heroku-deployment (#8711) 
Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>
 2020-11-23 07:36:39 -07: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
davidmauskop
b290d2ef34
Add Render as a deployment option (#8642) 
* Add Render as a deployment option

Signed-off-by: David Mauskop <david@render.com>

* Apply suggestions from code review

Co-authored-by: meganelacheny <meganelacheny@gmail.com>
Signed-off-by: David Mauskop <david@render.com>

Co-authored-by: meganelacheny <meganelacheny@gmail.com>
 2020-11-19 08:54:00 -07:00
soupette
031338bdb8 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-19 15:12:34 +01:00
HichamELBSI
a50c002af9 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-19 14:30:17 +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
DMehaffy
03b765294f
Make upload parser middleware example more clear (#8686) 
* Make upload parser middleware example more clear

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* slow down... take your time...

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-11-18 09:58:30 -07: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