yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-02 13:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,758 Commits 115 Branches 491 Tags
Commit Graph

655 Commits

Author SHA1 Message Date
Jim Laurie
4d47d65c6d Fix default role provider and create user fix #1212 2018-06-12 19:19:10 +02:00
Jim LAURIE
5a77a67338
Merge branch 'master' into bulk-actions 2018-06-12 11:32:01 +02:00
soupette
ae51f39c62 Fix default role when login with custom providers 2018-06-11 16:08:43 +02:00
cyril lopez
6403df2960
Merge branch 'master' into bulk-actions 2018-06-08 12:21:11 +02:00
Jim Laurie
2a449532ec 3.0.0-alpha.12.3 2018-06-06 17:34:07 +02:00
soupette
c8492a6b11 Clean code 2018-06-06 16:49:25 +02:00
soupette
127179cd76 Fix conflicts 2018-06-06 16:24:11 +02:00
soupette
e7357e025c Handle delete many with models from users-permissions 2018-06-06 16:20:52 +02:00
soupette
8302d32d71 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-05 12:06:17 +02:00
soupette
9a62aa4939 Fix PR feedback 2018-06-05 12:04:08 +02:00
Cyril lopez
cb895ab586 Fix PR feedback 2018-06-04 17:46:08 +02:00
Jim LAURIE
3d3d75b135
Merge branch 'master' into test-suits 2018-06-03 20:59:57 +02:00
Jim Laurie
8085a2deaf Update oneToOne test with id 2018-06-03 20:46:43 +02:00
soupette
78c9c8b936 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-06-01 14:55:12 +02:00
Jim LAURIE
a9d725c74c
Merge branch 'master' into third-party-windows-auth 2018-05-31 14:54:51 +02:00
Jim LAURIE
aee7157d5a
Merge branch 'master' into fix/graphql 2018-05-29 21:09:57 +02:00
soupette
1b5be59745 Fix css 2018-05-28 16:13:17 +02:00
Aurelsicoko
4ca24a37de Add usage tracking link in the menu #1280 2018-05-28 14:39:02 +02:00
soupette
48514fa8c4 Fix strapi utils convert params function 2018-05-25 15:57:07 +02:00
soupette
c95be9312d Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters 2018-05-25 13:33:52 +02:00
soupette
3847fd8c67 Fix filter for decimal 2018-05-25 13:21:57 +02:00
soupette
88d5cc2c37 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-25 12:23:55 +02:00
soupette
eecccbcbd8 Remove Json from available filters 2018-05-24 18:15:35 +02:00
Aurelsicoko
c111aaba13 Fixes #1247 2018-05-24 17:20:32 +02:00
Johan Baath
1cdb1dfc76 fix clean up of duplicate permissions 2018-05-23 14:25:32 +02:00
soupette
87d70a8d34 Fix count query bookshelf in ctm & users-permissions 2018-05-23 10:29:04 +02:00
soupette
cc1669faf5 Fix sort query bookshelf users-permissions 2018-05-22 18:27:07 +02:00
soupette
d1dfb7fc40 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-22 18:17:56 +02:00
soupette
7d3dd2ad0c Clean user model 2018-05-22 17:56:13 +02:00
Yakup AD
58e4b27ddb update Turkish language translates 2018-05-20 14:08:47 +03:00
soupette
f3bdbff968 Fix conflicts 2018-05-18 14:56:40 +02:00
Jim Laurie
6c194ff333 Init create new app test 2018-05-18 14:22:24 +02:00
Jim LAURIE
74d3987a11
Merge branch 'master' into add-styled-component 2018-05-18 11:07:32 +02:00
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 2018-05-17 16:54:27 +02:00
Aurelsicoko
bcb81a928e Remove layout.json & add it in .gitignore 2018-05-17 15:12:00 +02:00
Aurelsicoko
535e263203 Fix icons which were not displayed in list row 2018-05-17 13:44:32 +02:00
Jim Laurie
4069a3bdaf Fix fail build on publish npm release 2018-05-16 15:22:20 +02:00
soupette
97d8200c6c Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-16 14:41:28 +02:00
soupette
fdad43f60d Created Filter component 2018-05-16 12:47:59 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
soupette
d9a4b2990f Init filter design 2018-05-15 17:01:47 +02:00
soupette
51f5adc56a Add styled-components 2018-05-15 14:07:18 +02:00
Jim LAURIE
f4905a9b2e
Merge branch 'master' into enhance/relations 2018-05-14 17:33:37 +02:00
Jim LAURIE
0c6f86ce3e
Merge branch 'master' into eslint 2018-05-14 16:13:47 +02:00
Jim Laurie
8cd33563ae Harmonize model templates 2018-05-14 12:05:09 +02:00
cyril lopez
1f019c60c3
Merge branch 'master' into eslint 2018-05-14 11:50:32 +02:00
Marco Stephan
10b0bbffad Fix third party authenticators always disabled on windows 2018-05-11 22:18:02 +02:00
Konstantin Tsabolov
9e897bcfda Return HTTP 403 if user is not allowed to perform an operation 2018-05-10 19:36:15 +02:00
Aurelsicoko
c7f871745a Fix findOne user, many-to-many relationship loss and remove relation business logic from CM 2018-05-09 16:57:16 +02:00
Aurelsicoko
02a2e087cc Remove warning where clause 2018-05-09 15:11:55 +02:00