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

14709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
b8d206ede7 Cleanup some useless option config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
c81af9a1d0 Init admin reset 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
5cc40a350f Merge branch 'master' of github.com:strapi/strapi 2020-10-14 13:13:49 +02:00
Alexandre Bodin
ea7a26d365 Add doc team as code owner instead of individuals 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:12:50 +02:00
hhh
ed71cc2d8a
Fix file info of new uploaded file not being persisted after edit (#8244) 
* Fix file info of new uploaded file not being persisted after edit

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Fix typo and add test

Signed-off-by: henrych4 <singyinhenry@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-10-14 13:04:08 +02:00
Thomas Pockrandt
10443df9e2
Update admin panel screenshot (#8265) 
* Update admin panel screenshot

Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>

* Update image

Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>
 2020-10-14 11:20:25 +02:00
Jean-Sébastien Herbaux
9871562359
Fix wrong permissions assigns (upload, users-permissions) (#8320) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-13 18:51:09 +02:00
Jonas De Kegel
ecb377727a
Don't use mongoose 5.10.7 (#8278) 
resolved strapi/strapi#8066

Signed-off-by: Jonas De Kegel <jonas@fluid.desi>
 2020-10-13 18:14:48 +02:00
Maxime Castres
96e836a663
Add Academy link to the 'Join the community' card in the homepage (#8316) 
* Add Academy link to the 'Join the community' card in the homepage

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* Remove academy image

Signed-off-by: Maxime Castres <mcastres@student.42.fr>
 2020-10-13 16:20:33 +02:00
Yanuar Aditia
24ae46727c
Add indonesian lang for strapi-admin & strapi-plugin-users-permission (#8309) 2020-10-13 15:45:19 +02:00
Bochkarev Ivan
6d586e48b4 Update russian translate strapi-plugin-content-type-builder 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:15:27 +02:00
Bochkarev Ivan
0abd23eaab
Added new translations into Russian (#8312) 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:14:58 +02:00
yvesdo
94154d31df
Update Platform.sh button image URL (#8300) 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-12 19:29:38 +02:00
yvesdo
6b391844bf
Update Deploy Button URL (#8299) 2020-10-12 19:28:32 +02:00
Sam Williams
96a33ed942
Fix validations for custom field types (#8297) 
Signed-off-by: Sam Williams <spwilliams91@icloud.com>
 2020-10-12 18:59:06 +02:00
Alexandre Bodin
ba9711d134 Add code owners 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-12 11:48:34 +02:00
cyril lopez
a28cb0d496
Merge pull request #8290 from Ibochkarev/strapi-admin-ru 
Update Russian translate strapi-admin
 2020-10-12 11:42:58 +02:00
cyril lopez
abc34d295a
Merge branch 'master' into strapi-admin-ru 2020-10-12 11:42:45 +02:00
cyril lopez
00e06a4a9b
Merge pull request #8277 from Ibochkarev/russian-translate 
Update Russian translate strapi-plugin-content-manager
 2020-10-12 11:41:58 +02:00
cyril lopez
ca94042724
Merge branch 'master' into russian-translate 2020-10-12 11:41:36 +02:00
cyril lopez
25b4081c9f
Merge pull request #8271 from sebqq/drafts_translations_sk 
Add Draft/Publish translations in Slovak language
 2020-10-12 11:41:07 +02:00
cyril lopez
0785ae7587
Merge branch 'master' into drafts_translations_sk 2020-10-12 11:40:56 +02:00
cyril lopez
432f182792
Merge pull request #8264 from thomaspockrandt/feature/add-missing-german-translation 
Add missing german translation
 2020-10-12 11:40:07 +02:00
cyril lopez
638bb34672
Merge branch 'master' into feature/add-missing-german-translation 2020-10-12 11:39:54 +02:00
cyril lopez
7b1112d8d4
Merge pull request #8174 from tanmoyopenroot/5416-fix-uid-input-field 
Add right padding if contains some right adornment for UID input
 2020-10-12 11:39:23 +02:00
Thomas Pockrandt
f076292b0c
Merge branch 'master' into feature/add-missing-german-translation 2020-10-12 11:39:17 +02:00
cyril lopez
3173904561
Merge branch 'master' into 5416-fix-uid-input-field 2020-10-12 11:14:01 +02:00
cyril lopez
cd3ff9dc5c
Merge pull request #8245 from strapi/chore/remove-not-need-dep 
Remove remove-markdown dependency
 2020-10-12 11:10:20 +02:00
Thomas Pockrandt
1addf75181
Merge branch 'master' into feature/add-missing-german-translation 2020-10-12 10:48:22 +02:00
Bochkarev Ivan
e8fdd15ebd
Merge branch 'master' into strapi-admin-ru 2020-10-12 14:17:27 +06:00
cyril lopez
04322ff1a1
Merge branch 'master' into chore/remove-not-need-dep 2020-10-12 10:16:20 +02:00
cyril lopez
a34e093cdd
Merge pull request #8263 from thomaspockrandt/fix/update-favicon 
Update favicon
 2020-10-12 10:16:10 +02:00
cyril lopez
7618cba9cf
Merge branch 'master' into chore/remove-not-need-dep 2020-10-12 10:15:08 +02:00
Bochkarev Ivan
f0ee4302d6 Update Russian translate strapi-admin 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-12 08:00:40 +06:00
Ibochkarev
8e32edfc5a Update russian translate strapi-plugin-content-manager 
Signed-off-by: Ibochkarev <ivanx86@gmail.com>
 2020-10-11 14:26:03 +06:00
Sebastian Trebunak
b15d5c8af4 Add Draft/Publish translations in Slovak language 
Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>
 2020-10-10 10:19:36 +02:00
Thomas Pockrandt
51e0cec3c8 Add missing german translation and remove unnecessary complicated wordings 
Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>
 2020-10-10 01:45:18 +02:00
Thomas Pockrandt
f023187e81 Update favicon 
Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>
 2020-10-10 00:45:11 +02:00
Alexandre Bodin
7485de2fdf v3.2.3 v3.2.3 2020-10-09 17:12:50 +02:00
Alexandre BODIN
b91059a522
Fix undefined pk (#8260) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-09 17:08:37 +02:00
Laurens Kling
7545f9501a
Update index.js (#8242) 
Fix `TypeError: Cannot read property 'message' of undefined` and use `error.message` directly instead of `error.error.message`
 2020-10-09 14:50:13 +02:00
Convly
b3d0b72198 v3.2.2 v3.2.2 2020-10-09 11:52:09 +02:00
dependabot[bot]
efa530e933
Bump rimraf from 3.0.0 to 3.0.2 (#8257) 
Bumps [rimraf](https://github.com/isaacs/rimraf) from 3.0.0 to 3.0.2.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Changelog](https://github.com/isaacs/rimraf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/rimraf/compare/v3.0.0...v3.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-10-09 10:31:59 +02:00
Jean-Sébastien Herbaux
b2b4515d9b
Fix D&P population (#8249) 
* Fix D&P population (gql, rest)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix units tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix mongoose filtering on non draft & publish model

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-08 20:54:48 +02:00
Jean-Sébastien Herbaux
38126d9a32
Fix "has same role as author" condition not working properly (#8202) 
* Fix "has same role as author" condition not working properly

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Use creators constants

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add e2e test for default conditions, fix conditions on mongoose

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix tests in CE

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-08 19:50:39 +02:00
jiv_e
6fb0a63751
Refactor log level configuration (#7695) 
* Refactor log level configuration

- Remove STRAPI_LOG_LEVEL environment variable related redundant code.
- Add helpful error message to the current log level configuration
  system.

Signed-off-by: Juho Viitasalo <juho.viitasalo@lildrop.com>

* Fix error message

Signed-off-by: Juho Viitasalo <juho.viitasalo@lildrop.com>

* Fix log level base value

* Fix breaking change

* Add debug message

* Change logger code to use Pino's log level values directly

* Update index.js

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-08 18:58:59 +02:00
cyril lopez
1cab03f562
Merge pull request #8237 from strapi/dependabot/npm_and_yarn/axios-0.20.0 
Bump axios from 0.19.2 to 0.20.0
 2020-10-08 16:48:45 +02:00
soupette
641476ae7f Remove remove-markdown dependency 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-08 16:13:42 +02:00
cyril lopez
04e076ef2f
Merge branch 'master' into dependabot/npm_and_yarn/axios-0.20.0 2020-10-08 16:08:12 +02:00
cyril lopez
938f9fa29d
Merge pull request #8241 from TPXP/update-default-favicon 
ENH: Update the default favicon with the new logo
 2020-10-08 12:29:28 +02:00