yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,224 Commits 119 Branches 507 Tags
Commit Graph

401 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 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
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
62b2192c95 Update license info 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 18:40:52 +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
Alexandre Bodin
b71ffa6c6c Merge branch 'master' into features/rbac 2020-07-16 14:52:55 +02:00
Alexandre BODIN
fb4a625f27
Merge pull request #6851 from admosity/patch-1 
fix(email): malformed json
 2020-07-16 12:34:19 +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
Pierre Noël
de395dfc88 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:41:19 +02:00
Pierre Noël
e000432027 add the possibility to edit the template for the forgot password email 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:41:18 +02:00
soupette
7f4bb2a5bc Update plugin object 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-07-08 11:04:27 +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
Adam
67e2104ba5
fix(email): malformed json 2020-06-29 13:04:26 -04:00
Alexandre Bodin
eaf40e1ada v3.0.5 2020-06-23 12:18:00 +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
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
Pierre Noël
9f277f67b5
better error handling in email (#6599) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-09 12:11:25 +02:00
Alexandre Bodin
5b64e05d7f v3.0.1 2020-05-29 09:38:21 +02:00
Alexandre Bodin
6bb7a7f198 v3.0.0 2020-05-26 15:09:32 +02:00
Pierre Noël
aea700efc3 add default settings to plugin email 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 19:22:57 +02:00
Pierre Noël
d8f1449e73 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 15:05:35 +02:00
Pierre Noël
83f847f359 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 18:11:24 +02:00
Pierre Noël
471d9ef89c move email settings from db to files 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
soupette
4395f72df5 Add email plugin description 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-14 01:54:36 +02:00
soupette
5400f3e1dd Remove email plugin admin files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-13 17:21:17 +02:00
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 2020-05-07 13:02:11 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre Bodin
0925758742 Use static envs for email and upload settings until we remove it completely in future PRs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:40 +02:00
Alexandre Bodin
3745c7f0d0 Update project generator 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:36 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
soupette
71eec181fe Upagrade react helmet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +02:00
soupette
13d4c58bbe Update reducer injector in all plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00