yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-11 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,425 Commits 116 Branches 494 Tags
Commit Graph

766 Commits

Author SHA1 Message Date
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
Virginie Ky
9c67340e42 Merge branch 'master' into develop 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-31 15:19:53 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Virginie Ky
baf74d41b3 Merge branch 'master' into webhooks/tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-01-28 18:20:21 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +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
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +01:00
Jaroslav Vrána
0215f64648
Merge branch 'master' into feature/adminTranslationCs 2020-01-07 19:32:32 +01:00
Alexandre BODIN
3d8230d2ca
Merge branch 'master' into feature/slovak-translations 2020-01-07 14:20:38 +01:00
Alexandre BODIN
98aa94fc8a
Merge pull request #4864 from jozefcipa/fix/upload-plugin-config-form 
Fix not showing config form for selected upload provider
 2020-01-07 14:20:10 +01:00
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
Alexandre BODIN
473205ab8e
Merge branch 'master' into fix/upload-plugin-config-form 2020-01-06 09:33:52 +01:00
profispojka
458c8b077c
Update index.js 2020-01-05 16:03:14 +01:00
profispojka
379033a91c
Merge branch 'feature/adminTranslationCs' into feature/adminTranslationCsWithPlugins 2020-01-05 15:59:47 +01:00
unknown
72e76c97f2 update translations to latest master 2020-01-05 15:40:09 +01:00
unknown
8281ed7a8f merge master changes 2020-01-05 14:36:47 +01:00
unknown
d53d7ac5e2 cs translation fixes 2020-01-05 13:05:57 +01:00
Jaroslav Vrána
d65db853ea
Merge branch 'master' into feature/adminTranslationCs 2020-01-02 21:29:51 +01:00
Jim LAURIE
91c15a8e5c Merge branch 'master' of github.com:strapi/strapi into pr/4723 2020-01-02 14:00:44 +01:00
jozefcipa
ebed180f91 Fix not showing config form for selected upload provider 2019-12-31 16:56:22 +01:00
jozefcipa
760a3d5dd8 Add slovak translations 2019-12-30 16:22:25 +01:00
jozefcipa
502f746833 Fix reversed upload message 2019-12-29 22:24:25 +01:00
soupette
9f28c6b8c2 Fix conflicts 2019-12-17 10:20:03 +01:00
soupette
bffffe4bb0 Change header in upload and email plugins 2019-12-16 16:31:04 +01:00
soupette
bcd9db9987 Migrate upload plugin header to buffet s one 2019-12-16 15:56:42 +01:00
soupette
d6045876a7 Change plugin header in plugin upload 2019-12-16 15:47:44 +01:00
unknown
db412a4d3b translations 2019-12-15 17:57:16 +01:00
soupette
0511a54209 Remove useless assets in plugins 2019-12-13 16:15:25 +01:00
Jesús Rubio
8b30105588 Fix plugin upload UI description 2019-12-13 15:37:07 +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
harimkims
5f62dbc9a5 Update KO translation 2019-12-04 17:08:08 +09:00
Virginie Ky
c47985cf9b Merge branch 'features/dynamic-zones' into front/dynamic-zones-ctm-ui 2019-11-28 15:57:06 +01:00
Virginie Ky
c640f6872b Icons grid adjustments 2019-11-25 15:56:44 +01:00
Virginie Ky
11ccb5e7f3 Dynamic zone edit view ui 2019-11-20 17:46:53 +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
Virginie Ky
953f5b8ba3 upload plugin UI 2019-10-08 10:53:01 +02:00
cyril lopez
3a4bb7fda5
Merge branch 'develop' into front/context-api 2019-09-27 15:44:15 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00
soupette
6e425923ba Fix PR feedback 2019-09-17 16:04:38 +02:00
cyril lopez
6c8a446e0c
Merge branch 'master' into front/context-api 2019-09-17 13:36:59 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
soupette
62862f07c5 Update context api 2019-09-16 12:23:52 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
soupette
c971ab5ada Remove all context api in all plugins except users 2019-09-13 17:05:21 +02:00
soupette
2077e3d782 Fix PR feedback 2019-09-11 18:56:37 +02:00