yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-30 12:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,194 Commits 115 Branches 486 Tags
Commit Graph

199 Commits

Author SHA1 Message Date
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
soupette
eb00b7e0ea Add newline-before-return rule 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:31:05 +01:00
soupette
2a4351794b Fix lint webhooks 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:25:14 +01:00
soupette
b3ba8c27ef Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:12:46 +01:00
soupette
f50f89f0a8 Update eslint configuration 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:03:31 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Alexandre BODIN
ff4aa8890b
Merge branch 'master' into bugfix/4499 2020-01-13 16:38:50 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
Vedran Krizic
f29b712b86
changed location of overrides 2020-01-09 17:19:48 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
Jaroslav Vrána
d65db853ea
Merge branch 'master' into feature/adminTranslationCs 2020-01-02 21:29:51 +01:00
jozefcipa
760a3d5dd8 Add slovak translations 2019-12-30 16:22:25 +01:00
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
Jim LAURIE
5102051b10 fix: get route desc 
Fix the access to the `config.description` if the the `config` key not exist.

fix #2533
 2019-12-20 14:47:31 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00
Alexandre Bodin
94234012c8 Fix swagger params after swagger v update 2019-12-19 10:47:42 +01:00
Alexandre Bodin
8e2fb1ff1a v3.0.0-beta.18.1 2019-12-18 09:05:32 +01:00
Alexandre Bodin
09629c11e8 v3.0.0-beta.18 2019-12-17 14:55:58 +01:00
soupette
58f9ac440a Add header from buffet in documentation plugin 2019-12-16 16:44:25 +01:00
unknown
db412a4d3b translations 2019-12-15 17:57:16 +01:00
soupette
305ed06634 Change trash icon 2019-12-06 17:11:17 +01:00
Alexandre Bodin
29c06e10a3 Merge branch 'develop' into features/dynamic-zones 2019-12-06 12:35:35 +01:00
Alexandre Bodin
2bf3533c85 Merge branch 'master' into develop 2019-12-06 12:34:26 +01:00
Derrick Mehaffy
140f0f4064
Update Swagger Dist to 3.24.3 2019-12-04 05:37:08 -07:00
Derrick Mehaffy
3a76652245
Update some depends 
A few of which haven't been updated in 2 years x_x
 2019-12-04 05:32:43 -07:00
Alexandre Bodin
d901b54c2e Support dynamic zones in documentation plugin 2019-12-02 12:00:07 +01:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Alexandre Bodin
63abfc6db9 Merge branch 'develop' into features/dynamic-zones 2019-11-27 15:28:33 +01:00
Alexandre Bodin
9aff9af165 v3.0.0-beta.17.6 2019-11-25 18:54:50 +01:00
Virginie Ky
c640f6872b Icons grid adjustments 2019-11-25 15:56:44 +01:00
Long Nguyen
8bec836388 Add Vietnamese translation (#4414) 
* Add Vietnamese translation

* chore: tweak vietnamese admin's translations

* chore: vietnamese placeholder

* feat: vietnamese content manager's translations

* chore: plugin documentation's vietnamese translations

* chore: plugin email's vietnamese translations

* chore: plugin upload's vietnamese translations

* chore: plugin users-permissions's vietnamese translations

* chore: register vietnamese to language switcher

* chore: add vietnamese welcome message
 2019-11-20 11:58:35 +01:00
Alexandre Bodin
b9122edf0d Rename groups to components 2019-11-13 18:49:02 +01:00
Alexandre Bodin
b2e0ec5d1f v3.0.0-beta.17.5 2019-11-04 17:52:02 +01:00
Alexandre Bodin
7a61db7285 v3.0.0-beta.17.4 2019-10-23 15:11:30 +02:00
Alexandre Bodin
9280cf9cd7 Merge branch 'master' into develop 2019-10-22 11:15:09 +02:00
Alexandre Bodin
3ddd383c30 v3.0.0-beta.17.3 2019-10-22 11:05:52 +02:00
soupette
6a852ad6cb Fix conflicts 2019-10-18 15:51:44 +02:00
Alexandre Bodin
b6feabf689 v3.0.0-beta.17.2 2019-10-18 13:42:22 +02:00
Alexandre Bodin
f0ad2ab52c Merge branch 'master' into develop 2019-10-16 14:16:52 +02:00
Alexandre Bodin
9f0713649b v3.0.0-beta.17.1 2019-10-16 11:42:54 +02:00
Alexandre Bodin
7c8eda443e v3.0.0-beta.17 2019-10-16 10:40:18 +02:00
soupette
beef6e5510 Fix conflicts 2019-10-10 06:34:31 +02:00