yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,149 Commits 121 Branches 507 Tags
Commit Graph

443 Commits

Author SHA1 Message Date
soupette
be64adaa1c Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 10:29:36 +01:00
soupette
6c27d224f2 Add eslint config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 11:33:43 +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
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
profispojka
2c9b8283b3
Update cs.json 2020-01-05 16:04:00 +01:00
profispojka
379033a91c
Merge branch 'feature/adminTranslationCs' into feature/adminTranslationCsWithPlugins 2020-01-05 15:59:47 +01:00
unknown
6e4fe7141a fix typos, merge 2020-01-05 15:48:51 +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
jozefcipa
ea23166e3e Fix typos 2020-01-05 14:11:00 +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
Jaroslav Vrána
3d590e5762 fix: typo 2020-01-02 21:24:51 +01:00
jozefcipa
760a3d5dd8 Add slovak translations 2019-12-30 16:22:25 +01:00
Jim LAURIE
e5456da8eb
Merge branch 'master' into master 2019-12-23 11:04:29 +01:00
soupette
9f28c6b8c2 Fix conflicts 2019-12-17 10:20:03 +01:00
soupette
5c2893a6dd Remove useless test 2019-12-16 17:53:42 +01:00
soupette
326f543f48 Fix baseline and migrate to buffetjs header 2019-12-16 17:33:06 +01:00
soupette
69c637d27b Add plugin header from buffet to users plugin hp 2019-12-16 16:54:45 +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
soupette
305ed06634 Change trash icon 2019-12-06 17:11:17 +01:00
soupette
30c70deb3b Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dz-post-data 2019-12-06 14:38:32 +01:00
Alexandre Bodin
29c06e10a3 Merge branch 'develop' into features/dynamic-zones 2019-12-06 12:35:35 +01:00
soupette
c001fe1f3d Remove i tags 2019-12-06 11:09:48 +01:00
Sulakin Vadim
a858c66158
Merge pull request #4 from sulakin/Adding-a-VK-Provider 
add vk
 2019-12-06 01:45:26 +03:00
Sulakin Vadim
fc6ac8e231 add vk 2019-12-06 01:38:06 +03: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
587e4450b7 PR review apply 2019-11-26 16:24:53 +01:00
Virginie Ky
ef66c9ccb8 Icon from db 2019-11-25 17:08:30 +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
soupette
774702af59 Fix conflicts 2019-10-15 14:09:11 +02:00
Alexandre BODIN
c69e3fd042
Merge branch 'master' into fix/forgot-password-url 2019-10-15 12:17:00 +02:00
Jim LAURIE
bd323c7cae Fix typo 2019-10-15 12:03:03 +02:00
Jim LAURIE
5ddb32222b Apply PR feedback 2019-10-15 11:56:13 +02:00
Virginie Ky
c53f3672b1 merge 2019-10-11 15:16:51 +02:00
Virginie Ky
5b32e32758 Some UI fixes 2019-10-11 14:59:41 +02:00
soupette
f09422d524 Merge branch 'master' of github.com:strapi/strapi into develop 2019-10-11 13:03:14 +02:00
Jim LAURIE
9b49bee4b4 Fix #549 forgot password url 2019-10-09 17:37:16 +02:00
soupette
a288198306 Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb 2019-10-08 12:34:48 +02:00
soupette
e4f9f808e4 Update modals 2019-10-08 11:23:35 +02:00
Virginie Ky
22b8ab0bff Users permissions search list overflow 2019-10-08 10:38:08 +02:00
Virginie Ky
ee65a6a05a users permissions plugins responsive UI 2019-10-08 10:21:27 +02:00
Virginie Ky
6cae06b63c Users permissions edit page responsive ip 2019-10-08 09:50:15 +02:00
Virginie Ky
42257b3af4 Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb 2019-10-07 13:54:31 +02:00