yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 01:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,449 Commits 115 Branches 488 Tags
Commit Graph

503 Commits

Author SHA1 Message Date
Jim LAURIE
9852794ee4
Merge branch 'master' into Chinese-Translation 2018-03-01 13:03:18 +01:00
Jim LAURIE
d67d09ef90
Merge branch 'master' into alpha.10.3 2018-03-01 11:37:05 +01:00
Joseph Wang
f35b2519ba language hot fix 2018-03-01 16:30:44 +08:00
Joseph Wang
a6bf74c622 finish adding traditional chinese translations 2018-03-01 11:50:33 +08:00
Adrien Lepoutre
1110fe7df2 ISSUE 689 - Fix /user/me and ctx.state.user doesn't return OneToMany relations properly 2018-02-28 10:35:28 -05:00
Jim LAURIE
f0706d474c
Merge branch 'master' into alpha.10.3 2018-02-26 18:15:49 +01:00
Jim Laurie
99559e20ea 3.0.0-alpha.10.3 2018-02-26 17:57:23 +01:00
Jim Laurie
443d6b81fb Fix remove user on role update 2018-02-24 17:42:33 +01:00
Jim Laurie
6c4e837c7c Hotfix users models relations 2018-02-24 14:35:12 +01:00
Jim LAURIE
acfbd8bcaf
Merge branch 'master' into relations/polymorphic 2018-02-23 15:29:29 +01:00
Aurelsicoko
946f0f17b3 Enhance polymorphic syntax 2018-02-22 15:34:33 +01:00
cyril lopez
5bbe541668 Merge branch 'master' of github.com:strapi/strapi into improve-ctm-edit 2018-02-22 14:01:31 +01:00
cyril lopez
e5513d3cd6 Display relations when editing 2018-02-22 10:35:19 +01:00
Özgür ERSOY
8821818028 turkish language | strapi-plugins 2018-02-22 02:34:00 +03:00
Aurelsicoko
dc75b51d6f [WIP] Polymorphic associations with Bookshelf 2018-02-20 19:59:05 +01:00
Jim Laurie
de3da8eaf7 Fix conflicts 2018-02-19 19:56:23 +01:00
Jim Laurie
9ef00e217d Delete file upload 2018-02-19 16:00:37 +01:00
Jim Laurie
cf029dac07 Create db entry on upload and get uploads 2018-02-19 15:41:26 +01:00
Jim LAURIE
3fb12f16ba
Merge branch 'master' into 3.0.0-alpha.10.2 2018-02-19 12:28:51 +01:00
Jim Laurie
0a5e80be93 3.0.0-alpha.10.2 2018-02-19 11:38:20 +01:00
Jim LAURIE
1277517159
Merge pull request #658 from strapi/fix-update-provider-email 
Fix update email provider
 2018-02-19 10:26:26 +01:00
cyril lopez
99ca8e7117
Merge branch 'master' into master 2018-02-16 13:39:38 +01:00
Jim Laurie
174d2e7ca7 Fix update email provider 
Co-authored-by: soupette <cyril.lpz@gmail.com>
 2018-02-16 12:05:32 +01:00
Freakspot
33826d8e91 Fixed even more spelling mistakes and made some strings prettier 2018-02-16 01:13:20 +01:00
Freakspot
f21f690645 Fixed a few spelling mistakes as well as enhanced some strings 2018-02-15 23:30:31 +01:00
inder redni
4a16c4ecff polish language | corrections 2018-02-15 17:21:24 +01:00
inder redni
abfe04a9c7 polish language | strapi-plugin-users-permissions 2018-02-15 17:12:32 +01:00
Freakspot
095df2dffc Translated most of all basic plugins and the admin into german 2018-02-15 16:26:19 +01:00
Jim Laurie
00230f0f8f Hot fix provider login 
Co-authored-by: soupette <cyril.lpz@gmail.com>
 2018-02-14 17:02:44 +01:00
Jim Laurie
25d8217986 3.0.0-alpha.10.1 2018-02-14 11:03:00 +01:00
Jim Laurie
bbc2493f07 Fix front-end before release 
Fix eye position input password
Add notification on settings update plugin users permissions
Fix error display on login page

Co-authored-by: soupette <cyril.lpz@gmail.com>
 2018-02-13 16:26:27 +01:00
Jim Laurie
c52fe7165b Fix get email settings reset password 2018-02-13 15:59:06 +01:00
Jim Laurie
957e7a08cb Environment agnostic for users-permissions configs 2018-02-13 15:04:21 +01:00
Jim Laurie
5bf1e51422 Fix conflicts 2018-02-12 13:25:43 +01:00
Jim LAURIE
36f9f27d0c
Merge branch 'master' into design/icons 2018-02-09 18:19:21 +01:00
Aurelsicoko
21893dc8e6 Optimize SVG icons 2018-02-09 17:22:18 +01:00
Aurelsicoko
7c2317cba2 Update plugins list icon 2018-02-09 17:17:48 +01:00
Aurelsicoko
60821dca69 Update naming and default links icon 2018-02-09 17:16:30 +01:00
Jim LAURIE
08d74e1515
Merge branch 'master' into fix/boot 2018-02-09 17:02:18 +01:00
Aurelsicoko
5cbfc6f050 Update logo 2018-02-09 17:01:04 +01:00
Jim LAURIE
6cbff0007c
Merge branch 'master' into enhancement/mask 2018-02-09 16:48:30 +01:00
Aurelsicoko
46a64b449f Update default hook timeout to 3000 milliseconds 2018-02-09 16:36:23 +01:00
Aurelsicoko
2cb0e2c3d5 Hide resetPasswordToken from response 2018-02-08 14:59:39 +01:00
Jim Laurie
05804c391a Update user info in JWT 
Just set user id in auth jwt
fix #528
 2018-02-08 14:37:54 +01:00
Jim LAURIE
e963ee1414
Merge branch 'master' into enhancement/database-uri 2018-02-07 17:57:14 +01:00
Pierre BURGY
b67c5e34a8
Merge branch 'master' into enhancement/database-uri 2018-02-07 15:00:37 +01:00
Pierre Burgy
7f6e5ba5a8 3.0.0-alpha.9.3 2018-02-07 14:22:27 +01:00
cyril lopez
ff560d2cd8
Merge branch 'master' into disabled-autocomplete 2018-02-06 18:53:19 +01:00
cyril lopez
fc8781363e Merge branch 'master' of github.com:strapi/strapi into add/inputs-to-users 2018-02-06 18:45:47 +01:00
cyril lopez
5a4bc75c91 Implement new lib input in EditPage container 
Use Label component in InputSearchContainer.
Add new Inputselect in Policies component
 2018-02-06 18:42:42 +01:00