yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,224 Commits 127 Branches 497 Tags
Commit Graph

2340 Commits

Author SHA1 Message Date
Pierre Noël
fb2db4b050 v3.1.4 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-08-13 19:05:20 +02:00
Pierre Noël
231263a353 v3.1.4 2020-08-13 18:58:14 +02:00
Alexandre Gigleux
e3d6ce132e
Fix #7141 - Wrong conversion of to a boolean value (#7161) 
Signed-off-by: agigleux <alexandre.gigleux@sonarsource.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-08-13 09:16:36 +02:00
dependabot[bot]
3c80a6c9a5
Bump stylelint-config-recommended from 2.2.0 to 3.0.0 (#7431) 
* Bump stylelint-config-recommended from 2.2.0 to 3.0.0

Bumps [stylelint-config-recommended](https://github.com/stylelint/stylelint-config-recommended) from 2.2.0 to 3.0.0.
- [Release notes](https://github.com/stylelint/stylelint-config-recommended/releases)
- [Changelog](https://github.com/stylelint/stylelint-config-recommended/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint-config-recommended/compare/2.2.0...3.0.0)

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

* Fix lint and dump stylelint

Signed-off-by: HichamELBSI <elabbassih@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: HichamELBSI <elabbassih@gmail.com>
 2020-08-12 22:58:17 +02:00
cyril lopez
f6f5095cc5
Fix WYSIWYG bugs (#7370) 
* Fixes #7314

Signed-off-by: soupette <cyril.lpz@gmail.com>

* Fixes #4300

Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-12 12:07:15 +02:00
soupette
a8b95220f0 Fixes #7414 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-11 10:50:28 +02:00
Alexandre Bodin
97922f99ae v3.1.3 2020-07-31 09:59:56 +02:00
Alexandre Bodin
6aaa018ff5 v3.1.2 2020-07-29 13:34:01 +02:00
Alexandre BODIN
0ea63e05e4
Merge pull request #7178 from ericliu-el/fix-Input-Number-issue 
Fix Input Number issue
 2020-07-29 13:20:38 +02:00
Alexandre Bodin
ac62bac98e Upgrade lodash 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:05:50 +02:00
dependabot[bot]
aea96bca68
Bump lodash from 4.17.15 to 4.17.19 (#7239) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-07-29 11:10:32 +02:00
soupette
61412ebdbd Fixes #7189 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-28 12:39:20 +02:00
soupette
3639fdc047 Fixes #7186 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-27 12:04:44 +02:00
soupette
b84e33ca47 Fix date and datetime required validations issue 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-27 11:52:27 +02:00
Eric Liu
6df99143a6 change biginteger back to text 
Signed-off-by: Eric Liu <eric@ericliu.page>
 2020-07-27 10:19:35 +12:00
Eric Liu
bc611017ca Merge branch 'master' into fix-Input-Number-issue 2020-07-27 10:19:07 +12:00
Eric Liu
e099889fe2 fix Input Number issue 
Signed-off-by: Eric Liu <eric@ericliu.page>
 2020-07-26 18:39:16 +12:00
dependabot[bot]
33634151d4
Bump pluralize from 7.0.0 to 8.0.0 (#7126) 
Bumps [pluralize](https://github.com/blakeembrey/pluralize) from 7.0.0 to 8.0.0.
- [Release notes](https://github.com/blakeembrey/pluralize/releases)
- [Commits](https://github.com/blakeembrey/pluralize/compare/v7.0.0...v8.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-07-25 08:53:05 +02:00
soupette
a9387d49f4 Fixes #7139 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-24 12:11:52 +02:00
Alexandre Bodin
35bae7df57 v3.1.1 2020-07-23 18:53:55 +02:00
Alexandre Bodin
1bbf1bc0dc v3.1.0 2020-07-21 19:30:45 +02:00
Alexandre BODIN
c2fb4904cd
Merge pull request #6965 from strapi/features/rbac 
Features/rbac
 2020-07-20 19:07:46 +02:00
Alexandre Bodin
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +02:00
Alexandre BODIN
6baa8dbb98
Merge pull request #7041 from strapi/chore/markdown-it 
Change preview for markdown-it in order to have all md support
 2020-07-20 13:19:48 +02:00
Abdón Rodríguez Davila
51d514b042 Removing carets 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2020-07-20 09:46:14 +02:00
Abdón Rodríguez Davila
e34202bae2 Update slugify dependency 
Signed-off-by: Abdón Rodríguez Davila <a@abdonrd.com>
 2020-07-18 19:32:31 +02:00
Alexandre Bodin
9b7c360f0c update lock file 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:38:40 +02:00
Alexandre Bodin
6bafa35a36 Merge branch 'releases/3.1.0' into features/rbac 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-18 10:12:40 +02:00
soupette
7b1e75a495 Add tip support 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-17 11:06:21 +02:00
soupette
4e0ff23878 Change preview for markdown-it in order to have all md support 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 17:35:51 +02:00
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +02:00
cyril lopez
dd023c388e
Merge pull request #7026 from strapi/chore/fix-wysiwyg-preview 
Chore/fix wysiwyg preview
 2020-07-16 15:37:34 +02:00
soupette
990dc43035 Fix users list design 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 15:35:18 +02:00
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
soupette
529833cd20 Merge branch 'features/rbac' of github.com:strapi/strapi into chore/fix-wysiwyg-preview 2020-07-16 13:56:41 +02:00
soupette
12170ff800 Change theme 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 12:12:56 +02:00
soupette
afae5b8964 Add syntax highlight in preview wysiwyg 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-16 11:54:11 +02:00
Nick Hayden
a43b14e250
FIX - Update regex error value for English translation (#6976) 
Co-authored-by: Nick Hayden <nick@192-168-1-101.tpgi.com.au>
 2020-07-16 11:18:48 +02:00
soupette
b3ec0c37e2 Clean files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 18:27:51 +02:00
soupette
2ee8207149 Fixes #6051 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 17:53:52 +02:00
soupette
80c7d385d5 Reorder translation files by key value and add script to remove the unneeded keys 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 12:05:25 +02:00
soupette
3f4f555528 Clean code 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-15 11:34:55 +02:00
soupette
b62cb702d1 Fix trads refresh 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 17:29:35 +02:00
soupette
4dba7a65d3 Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 14:53:48 +02:00
Alexandre Bodin
109e41ea1f Fix e2e tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 13:53:56 +02:00
soupette
61540b658a Fix filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
722282004d Fix delete forbidden in CM 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
9e1ac1bdc9 Fix error message in CM when deleting an entry 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
soupette
aaab4c17f5 Fix WYSIWYG and JSON inputs disabled state 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:48:46 +02:00
Convly
e63306b559 Rewrote users-permissions's controller to fit with rbac, fix various bugs in content-manager's controllers 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:44 +02:00