yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-04 03:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,619 Commits 123 Branches 507 Tags
Commit Graph

426 Commits

Author SHA1 Message Date
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
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
Virginie Ky
d4bc0c1683 Users permissions edit view policies fix 2019-10-07 13:42:39 +02:00
Ivo Bathke
5877ff93d0 fixed typo in de.json and removed unneccesary whitespace in model generator 2019-10-04 17:48:45 +02:00
soupette
2e7e7def33 Fix context in Edipage and children 2019-10-03 12:58:20 +02:00
soupette
743545606b Remove useless lifecycle in App and update its suffixURL 2019-10-03 11:54:23 +02:00
soupette
590ef49ec1 Fix HomePage contexts and update context api 2019-10-03 11:48:24 +02:00
soupette
5c42e43d4f Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb 2019-10-03 11:09:48 +02:00
Jim LAURIE
088653a9b9 Review the auth email template doc 2019-09-23 16:59:20 +02:00
Virginie Ky
2c67635b38 InputSearch as a func component 2019-09-19 16:37:26 +02:00
Virginie Ky
0f26597a92 InputSearch func component 2019-09-19 14:49:18 +02:00
Virginie Ky
1a1809006b Search refacto ip 2019-09-19 10:13:03 +02:00
Virginie Ky
c06b0d9031 components refacto ip 2019-09-18 17:39:54 +02:00
Natalia Tsvetkova
a4a26be4b3 Merge branch 'master' into feature/instagram_provider 2019-09-18 14:36:18 +02:00
Virginie Ky
b5a18e27bc EditForm refacto 2019-09-17 18:48:28 +02:00
Virginie Ky
28426555b6 users permissions plugin refacto ip 2019-09-17 17:36:03 +02:00
Virginie Ky
88a11cef3c node-sass removed 2019-09-17 16:20:45 +02:00
Virginie Ky
a6b57689fb styled components migration 2019-09-17 15:24:22 +02:00
Virginie Ky
4f45134dd1 Users permissions styled compo ip 2019-09-16 19:18:35 +02:00