yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-18 04:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,027 Commits 122 Branches 495 Tags
Commit Graph

17027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
169238b2c1
Bump eslint-plugin-jsx-a11y from 6.3.1 to 6.4.1 (#9256) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.3.1 to 6.4.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.3.1...v6.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-29 10:29:16 +01:00
Pierre Noël
291aeb07bc add read/create/update route for locales 2021-01-29 10:12:34 +01:00
Pierre Noël
2c5e3d7872 add get iso-locales route 2021-01-29 10:12:34 +01:00
Pierre Noël
b0bf427ac4 Merge branch 'master' into features/i18n 2021-01-29 10:11:52 +01:00
HichamELBSI
c14c5a0e5d Add locales list view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-29 10:08:58 +01:00
ELABBASSI Hicham
454f666b11
Merge pull request #9237 from strapi/fix/9236 
Fix regex validation
 2021-01-29 09:59:58 +01:00
cyril lopez
0b55c84d9f
Merge branch 'master' into fix/9236 2021-01-29 09:05:17 +01:00
Ben LeFevre
fd42889083
strapi-plugin-upload: Read responsive breakpoints from config (#9002) 
* Read responsive breakpoints from config

* Move strapi.config.get into function
 2021-01-28 17:31:09 +01:00
Jorrit Schippers
175422d760
Update .npmignore files (#8865) 
Add .editorconfig, .snyk, __tests__, jest.config.js
Remove .npmignore and .gitignore from admin subdirectories

Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-28 16:57:29 +01:00
Rémi de Juvigny
4fe9117229 Restore transaction name 2021-01-28 16:47:35 +01:00
cyril lopez
3c05702085
Merge pull request #9247 from strapi/fix/snapshots 
Fix snapshots
 2021-01-28 16:18:23 +01:00
Convly
56ca7365a4 Add e2e tests for provider login 2021-01-28 16:07:54 +01:00
Convly
f34da1f1c6 Update front tests snapshots 2021-01-28 12:01:23 +01:00
soupette
7e0d50c6da Fix snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-28 11:55:46 +01:00
Alexandre Bodin
5524d72396 Merge branch 'master' into features/i18n 2021-01-28 11:35:17 +01:00
HichamELBSI
8ccfe75ad6 Add i18n settings page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-28 11:33:37 +01:00
Convly
f19b5d2831 Split sso/passport(ee|ce) unit tests 2021-01-28 11:32:27 +01:00
Alexandre Bodin
fd6771315d add i18n plugin to testApp 2021-01-28 11:31:10 +01:00
Bobby Glidwell
b77b0644b9
add support for actionOptions for provider upload and delete functions (#9219) 
* add config.options to upload and delete functions

Supports options object in providerOptions which can contain any cloudinary upload/delete options

* add actionOptions to upload object and createProvider function

used to initialize upload/delete custom options which can be passed to a provider's upload/delete function

* Update README.md

added actionOptions description with link to available cloudinary upload/delete options

* wrapFunctionForErrors for upload and delete

* make actionOptions {} by default
 2021-01-28 11:24:11 +01:00
Convly
1d17fa383e Fix features-routes middleware loading 2021-01-28 10:50:36 +01:00
Convly
1a3887d27e Remove tmp file 2021-01-28 10:45:28 +01:00
Convly
4ff790830f Merge master into features/sso 2021-01-28 10:44:17 +01:00
Convly
bf92cc8698 Fix passport unit test 2021-01-28 10:40:57 +01:00
Rémi de Juvigny
e09f310639 Fix undefined transaction tag 2021-01-28 10:12:35 +01:00
dependabot[bot]
e7894779ce
Bump react-select from 3.2.0 to 4.0.2 (#9244) 
Bumps [react-select](https://github.com/JedWatson/react-select) from 3.2.0 to 4.0.2.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@3.2.0...react-select@4.0.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-28 09:50:17 +01:00
Convly
6874d96666 Make enabled ee features available to the frontend 2021-01-27 18:24:24 +01:00
Convly
bd91f748d8 Merge master into features/sso 2021-01-27 16:34:43 +01:00
soupette
47edbcbfb0 Fixes #9236 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-27 15:42:18 +01:00
Convly
531c926dfd Authentication events, sso gold only 2021-01-27 11:52:02 +01:00
Jorrit Schippers
3f63902d4b
Use https:// in package.json and README.md files (#9227) 
Signed-off-by: Jorrit Schippers <jorrit@ncode.nl>
 2021-01-26 17:06:25 +01:00
Virgil B
8eca3534c7
Merge branch 'master' into master 2021-01-26 13:45:19 +02:00
Virgil B
063c9b8ba5
Fixed syntax error 2021-01-26 13:43:53 +02:00
Virgil B
f67ca1688b
fix reverse text on code/quote blocks 2021-01-26 13:26:36 +02:00
Alexandre BODIN
d023624c98
Merge pull request #9216 from strapi/i18n/init-permissions 
Add locale crud permissions
 2021-01-26 12:07:37 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 v3.4.5 2021-01-26 11:59:47 +01:00
Virgil B
9168b8823a
Merge branch 'master' into master 2021-01-26 12:10:37 +02:00
cyril lopez
8b39f5ac05
Fixes #9180 (#9204) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 11:09:49 +01:00
Rémi de Juvigny
a82bc5f864 Move service require 2021-01-26 11:06:33 +01:00
Rémi de Juvigny
8fcc848f94 Move jest reset modules 2021-01-26 10:58:28 +01:00
Virgil B
ab5bf198dd
Merge pull request #1 from virgilbugnariu/wysiwyg-reversed-text-fix 
Fixed Wysiwyg reversing text
 2021-01-26 11:55:01 +02:00
Virgil B
5a87c9af8f
Fixed Wysiwyg reversing text 
After adding a MD formatting block (b, i, u, etc.) the text would be reversed. This fixes that issue as well as automatically selecting the placeholder text when no selection is being made.
 2021-01-26 11:49:31 +02:00
Alexandre BODIN
54af039f17
Fix is-creator condition not applied on find (#9213) 
* Fix is-creator condition not applied on find

* Add test
 2021-01-26 10:18:43 +01:00
soupette
9960ceb837 Merge branch 'chore/ctb' of github.com:strapi/strapi into features/i18n-front 2021-01-26 10:07:07 +01:00
soupette
8f958553b9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 10:06:16 +01:00
Alexandre Bodin
cd01ef0234 Add snapshot to permissions registration 2021-01-26 09:18:13 +01:00
Alexandre Bodin
ff6127a21f Add locale crud permissions 2021-01-25 20:58:33 +01:00
Rémi de Juvigny
f3b362df16 Fixed description translations 2021-01-25 19:35:21 +01:00
Rémi de Juvigny
7b247791c0 Finishing touches 2021-01-25 19:10:52 +01:00
Bartek Igielski
3f1fa39ccb
Prevent returning optimized image if it's larger than original (#9214) 
* Prevent returning optimized image if it's larger than orginal

* Move size checking inside promisse
 2021-01-25 18:21:44 +01:00
cyril lopez
b238d35220
Merge pull request #9207 from strapi/ctb/redux 
[WIP] Ctb/redux
 2021-01-25 18:12:27 +01:00