yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,737 Commits 129 Branches 498 Tags
Commit Graph

14737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MattieBelt
fb53fadda0 Fix links action on role list page 
Fixes #8262

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-10-10 15:19:02 +02: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
Thomas P
5c792ff325 ENH: Update the default favicon with the new logo 
It looks so much better 😍

Signed-off-by: Thomas P <TPXP@users.noreply.github.com>
 2020-10-08 10:40:48 +02:00
cyril lopez
b5c7344c2a
Merge pull request #8092 from strapi/front/events 
Add events
 2020-10-08 09:42:02 +02:00
cyril lopez
3f7cd766d1
Merge branch 'master' into front/events 2020-10-08 09:41:40 +02:00
cyril lopez
8612af6a2c
Merge pull request #8230 from henrych4/fix-incorrect-notification 
Fix incorrect notification when copy media url to clipboard
 2020-10-08 09:40:47 +02:00
cyril lopez
d6a6af535a
Merge branch 'master' into fix-incorrect-notification 2020-10-08 09:40:18 +02:00
cyril lopez
ad2a2b0d0a
Merge pull request #8172 from pmrotule/fix/email-confirmation-redirection-copy 
Fix EN copy of email-confirmation-redirection description
 2020-10-08 09:39:34 +02:00
cyril lopez
cb1ffb6fb2
Merge branch 'master' into fix/email-confirmation-redirection-copy 2020-10-08 09:38:55 +02:00
cyril lopez
f3ad929665
Merge pull request #8229 from strapi/fix/glitch-compo-picker 
Fixes UI glitch
 2020-10-08 09:38:36 +02:00
cyril lopez
acbfe598d5
Merge branch 'master' into fix/glitch-compo-picker 2020-10-08 09:37:32 +02:00
davidmauskop
43ff63cc38
Update /_health to accept GET requests (#8234) 
Signed-off-by: David Mauskop <david@render.com>
 2020-10-08 09:33:32 +02:00
soupette
5b2236def8 Add cursor not-allowed for ce conditions select 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-08 09:32:03 +02:00
cyril lopez
d716a9b076
Merge branch 'master' into fix/glitch-compo-picker 2020-10-08 08:55:00 +02:00
dependabot[bot]
a0c957348d
Bump axios from 0.19.2 to 0.20.0 
Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-08 06:09:48 +00:00
Alexandre BODIN
e87af3f6c6
do not set id to undefined (#8232) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-07 23:11:00 +02:00
Jean-Sébastien Herbaux
e7861232d0
Fix wrong query generation with bookshelf (#8228) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-07 23:10:38 +02:00
henrych4
0593ca14d8 Fix incorrect notification when copy media url to clipboard 
Signed-off-by: henrych4 <singyinhenry@gmail.com>
 2020-10-07 23:59:28 +08:00
cyril lopez
62129e9b4f
Merge branch 'master' into front/events 2020-10-07 16:56:56 +02:00
soupette
eb03a06b07 Fixes #8175 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-07 16:53:55 +02:00
chachew
e0287c8d27
Add missing 'format' reserved model word. (#8194) 
* Add missing 'format' reserved model word.

* Move reserved word to attribute name.

Co-authored-by: Matt Kirkland <mkirkland616@gmail.com>
 2020-10-07 15:06:59 +02:00
Alexandre Bodin
755d216fbe Merge branch 'documentation' 2020-10-07 14:53:27 +02:00
Alexandre Bodin
5a77b560e3 v3.2.1 v3.2.1 2020-10-07 14:50:47 +02:00
cyril lopez
f3a64f2fcf
Fix util when no data (#8224) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-07 14:49:35 +02:00