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

972 Commits

Author SHA1 Message Date
Tarun Thakurani
d1427cb6c8 [#932] fixed Setting user with numeric password fails 2018-09-22 18:45:49 +05:30
cyril lopez
d5aa66a5ff Change path for overrides files 2018-09-21 16:08:09 +02:00
Aurelsicoko
25e8ef587a Add documentation email and upload 2018-09-20 16:52:51 +02:00
cyril lopez
59961edf44 Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes 2018-09-19 17:36:59 +02:00
cyril lopez
bc49c3842c Change gitignore 2018-09-19 17:36:43 +02:00
cyril lopez
f002a0d144 Add override documentation to upload and users-permissions 2018-09-18 20:39:31 +02:00
Jim LAURIE
6c897555a0
Merge branch 'master' into improvement/pluralize-routes 2018-09-18 13:47:13 +02:00
Jason Lei
a3bdd9b3fb
Merge branch 'master' into graphql/mutations-aggregations-decimals 2018-09-15 19:53:48 +08:00
soupette
7906e43129 Fix conflicts 2018-09-14 13:48:43 +02:00
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
Jim LAURIE
67112e92cd
Merge branch 'master' into graphql/mutations-aggregations-decimals 2018-09-13 15:00:02 +02:00
Jim LAURIE
70507078d5
Merge branch 'master' into graphql/mutations-aggregations-decimals 2018-09-13 14:20:25 +02:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +02:00
soupette
ea8059840b Fix conflicts 2018-09-10 20:22:21 +02:00
soupette
f994ae5d91 Fix deprecated param 2018-09-10 20:15:28 +02:00
soupette
c2c66d5cb8 Change directory 2018-09-10 20:00:17 +02:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
Jim LAURIE
d2eb881ca8
Merge branch 'master' into master 2018-09-10 17:38:12 +02:00
Jason Lei
3378403954 GraphQL Mutations, Aggregations, Decimals 
Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).
 2018-09-10 16:05:00 +08:00
soupette
e46567db42 Add description to missing routes 2018-09-07 12:23:13 +02:00
soupette
f572780930 Update users-perm routes actionTypes 2018-09-07 10:33:40 +02:00
soupette
aa22123917 Add default doc in users-permissions plugin 2018-09-06 19:06:19 +02:00
soupette
fc2dcfb420 Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes 2018-09-06 10:12:04 +02:00
soupette
6b922b1c05 Add descriptions to u-p routes 2018-09-06 10:08:29 +02:00
Jim LAURIE
34124bd6a3
Check user exist before user is blocked 2018-09-05 11:14:03 +02:00
Jim LAURIE
3a396972f0 Fix #1882 2018-09-03 14:19:51 +02:00
Jim LAURIE
19486ded6e
Merge branch 'master' into fixRegisterTemplate 2018-08-27 18:05:02 +02:00
DMehaffy
56de235297 Modify template for english 2018-08-27 08:11:23 -07:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
Jim LAURIE
cee9fe2811
Merge branch 'master' into email-validation 2018-08-23 18:46:48 +02:00
Jim LAURIE
7fdccc62ee PR feedback 2018-08-23 18:28:13 +02:00
Aurélien GEORGET
e8b7bd478a
Update bootstrap.js 2018-08-23 12:00:46 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
soupette
38c4fd6a47 Fix first part of PR feedback 2018-08-21 14:01:15 +02:00
Jim LAURIE
f27b2ae2f6
Merge branch 'master' into email-validation 2018-08-21 11:54:22 +02:00
Jim LAURIE
ed3f7d9018
Merge branch 'master' into fix-it-users-permissions 2018-08-21 11:40:31 +02:00
Jim LAURIE
e97fa20ba3
Merge branch 'master' into master 2018-08-21 11:25:22 +02:00
Jim LAURIE
ef97f72ff7
Merge branch 'master' into improvement/remember-me 2018-08-21 09:00:41 +02:00
soupette
f120413d26 Fixes 1741 2018-08-20 17:54:00 +02:00
Jim LAURIE
df49f3b8e8
Merge branch 'master' into fix/rgpd 2018-08-20 17:42:27 +02:00
Jim LAURIE
fbc98ed4bb
Merge branch 'master' into master 2018-08-20 15:30:41 +02:00
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +02:00
Jan Brachhold
cef161bc28 Update DE translations - strapi-plugin-users-permissions 2018-08-16 14:34:27 +02:00
Chris Dekker
96d1eeb70b Fix for issue https://github.com/strapi/strapi/issues/1589 2018-08-16 14:17:54 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
Jim LAURIE
9c17701163
Merge branch 'master' into block-user 2018-08-10 10:02:52 +02:00
Jim LAURIE
86828d731a
Merge branch 'master' into auth-microsoft 2018-08-09 16:59:00 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Jim LAURIE
eec423a2cd Add confirmation email 2018-08-08 17:57:02 +02:00
Aurelsicoko
3532b20ecf Remove pre-checked checkbox 2018-08-08 16:34:17 +02:00