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

1778 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
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
99dfd24eaf
Fixes #7301 (#7312) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-08-12 12:15:39 +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
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
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
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
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
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
Alexandre Bodin
4d31935716 v3.0.6 2020-07-16 17:03:04 +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
Alexandre Bodin
4edad86029 Add basic created_by updated_by 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:16 +02:00
soupette
030066d542 Connect to check permissions to the API and disable Admin/indext.test.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:09:46 +02:00
soupette
1a23abf405 Fix unlockApp in ctb 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:09:44 +02:00
soupette
b64af2c309 Change adminReducer to immer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:09:42 +02:00
Convly
ef94229d81 Add Condition Provider & Permissions Engine 2020-07-08 11:05:49 +02:00
soupette
6a298fc991 Rename permissions components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:10 +02:00
Pierre Noël
2339c6b8f7 fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:09 +02:00
Pierre Noël
e078c0b022 rename permissions to actions, inverted params of provider.get, separated formatter, add possibility to not specigy pluginName for ::application 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:07 +02:00
Pierre Noël
707746ef45 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Pierre Noël
ae0dcb9745 add route GET /admin/permissions 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
soupette
50c16dee16 Move plugins trads 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:05 +02:00
soupette
6e6c8c05cb Add permissions to ctm injected components 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:05 +02:00
soupette
2e314756cf Add permissions to doc main compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:04 +02:00
soupette
7d9041ecc3 Add permissions to ctb main compo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:05:04 +02:00
soupette
7f4bb2a5bc Update plugin object 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:27 +02:00
soupette
2790068e36 Update menu to display the models 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:26 +02:00
soupette
b68245b8b1 Add permissions to plugins links in the menu only 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:25 +02:00
soupette
05f6fb7d40 Move configure button to the ctm 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 10:57:40 +02:00
soupette
62a79a5fc0 Created basic routing for the settings 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 09:45:28 +02:00
richardgrey
47197419e1 Add Ukrainian translations for the whole project 
Signed-off-by: richardgrey <richie.grey@gmail.com>
 2020-06-30 17:23:01 +04:00
Alexandre Bodin
eaf40e1ada v3.0.5 2020-06-23 12:18:00 +02:00
soupette
6dffb1a8d2 Fixes #6775 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-06-23 12:09:23 +02:00
Alexandre Bodin
9ed11a6682 v3.0.4 2020-06-19 09:19:52 +02:00
Alexandre Bodin
c909d7162d v3.0.3 2020-06-18 19:17:15 +02:00
Boom Lee
a26b4f65a8
Fix node version (#6482) (#6691) 2020-06-16 11:32:23 +02:00
Alexandre Bodin
497fb742eb v3.0.2 2020-06-15 17:09:15 +02:00
ELABBASSI Hicham
f2cec21acc
Add reserved names for attributes (#6620) 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-06-15 14:10:33 +02:00
Fadhil Ahmad
7123a11444
Add Malay(ms.json) Translation (#6394) 
* feat: add malay  translation for strapi-admin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay locale on strapi-generate-plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for content-manager

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for content-type-builder

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* faet: add malay translation for strapi-plugin-documentation

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for email plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation on upload plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for permission plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* Fix language middleware (#6387)

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

* [typo] Persmissions > Permissions (#6390)

Signed-off-by: ScottAgirs <scott@ijs.to>
Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* refactor: fix typo, suitable word and grammar

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* test: add ms test

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* fix: typos on plugin.description email

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Scott Agirs <ScottAgirs@users.noreply.github.com>
Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-06-11 12:05:16 +02:00
Rasmus Nørskov
2aace1f593 Merge branch 'master' of https://github.com/strapi/strapi into feature/slugify-options 2020-05-30 20:46:13 +02:00
cyril lopez
b766d9e9e4
Merge branch 'master' into patch-1 2020-05-29 16:17:11 +02:00
Alexandre Bodin
5b64e05d7f v3.0.1 2020-05-29 09:38:21 +02:00
Koen Verheyen
ae8b5c6772
Merge branch 'master' into patch-1 2020-05-28 20:48:08 +02:00