yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-20 07:27:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,832 Commits 115 Branches 484 Tags
Commit Graph

90 Commits

Author SHA1 Message Date
Alexandre Bodin
8c1f25a058 Update user model metadatas configurations 2019-08-06 13:49:25 +02:00
Alexandre Bodin
b58d7a138a Support content types layouts and metadatas defaults with Model.config.js(on) files 2019-08-06 13:49:24 +02:00
Abdón Rodríguez Davila
5429931b10 Move collectionName to the top as the generated API models 2019-04-12 15:01:05 +02:00
Abdón Rodríguez Davila
efb989dcfd
Enable timestamps option as default in the User & Permissions plugin 2019-04-12 14:57:17 +02:00
soupette
d2f50f7bae Fix relations 2019-03-25 19:08:17 +01:00
Alexandre Bodin
a0b45e2741 Add cypress run 2019-03-13 00:10:20 +01:00
Ky
c1ffbbfb57 Content manager Links with injected components (UI in progress) 2019-02-08 19:23:02 +01:00
Aurélien Georget
4f2928339a Reset loaders instead of clearing cache 2019-01-22 13:47:44 +01:00
Aurélien Georget
e1ce257d2f Revert codebase and apply limit, skip, start and sort parameters 2018-12-06 18:11:53 +01:00
Aurelsicoko
3d7dacef70 Apply options on Mongoose instance 2018-11-16 15:53:00 +01:00
ByoungYong Kim
12cc6d6039 Added provider into user model as it seems to be required for SSO. 2018-10-08 13:16:28 +02:00
Jim LAURIE
2aebb74424
Fix private key in User model 2018-09-25 14:42:15 +02:00
Jim LAURIE
cee9fe2811
Merge branch 'master' into email-validation 2018-08-23 18:46:48 +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
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +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
eec423a2cd Add confirmation email 2018-08-08 17:57:02 +02:00
Jim LAURIE
3f2576cb68 Can block a user 2018-08-06 17:46:58 +02:00
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +02:00
soupette
ccb4fe0270 Pull enhancement/sortable-input because master is too buggy with my modifications 2018-08-02 15:51:10 +02:00
Aurelsicoko
6a4a07428a Split component and put logic into the reducer 2018-08-02 15:27:30 +02:00
Jim LAURIE
57d5a6afd9
Remove relations 2018-08-01 09:53:30 +02:00
Aurelsicoko
120f515e5e Better design many-to-many and add jump link 2018-07-31 16:57:16 +02:00
Aurélien GEORGET
065792bea6
Update User.settings.json 2018-07-31 14:16:27 +02:00
Aurelsicoko
d8e5d0403b Update design, behavior and add link for selectMany 2018-07-30 16:33:50 +02:00
soupette
6bf3ddeea9 Update displayed fields when removing a field from the content type builder 2018-07-30 13:59:25 +02:00
soupette
54aef15b75 Handle add attr logic 2018-07-27 17:24:58 +02:00
soupette
4e05bd6359 Use the layout from the core_store in Manager.js 2018-07-24 15:16:47 +02:00
Jim LAURIE
87a051e712 Move layout files in core store 2018-07-23 15:12:33 +02:00
cyril lopez
26c53c977e Handle remove logic when removing the edited relation 2018-07-23 12:34:35 +02:00
cyril lopez
2a419dd92e Created Manager class for dnd fields 2018-07-19 02:37:12 +02:00
soupette
6cc063e98c Add new key in schema to display the editView fields 
Design the relation drag & sort
 2018-07-16 12:29:57 +02:00
Jim LAURIE
157c249382 Merge branch 'master' of github.com:strapi/strapi into tests/split 2018-06-27 14:28:30 +02:00
Jim LAURIE
561e910558
Fix empty string not require 2018-06-26 17:14:42 +02:00
Jim LAURIE
75c1c4bac5 Fix JSON type format SQL fix #1425 2018-06-20 16:21:09 +02:00
Aurelsicoko
c2d0e81f22 Run Jest in the monorepo packages 2018-06-12 17:41:28 +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
Jim Laurie
8085a2deaf Update oneToOne test with id 2018-06-03 20:46:43 +02:00
soupette
44d3519130 remove relations 2018-04-19 17:23:23 +02:00
soupette
81383f3562 Fixes #959 2018-04-19 15:45:35 +02:00
Jim Laurie
bb114a592d Clean model 2018-04-12 14:19:22 +02:00
Jim Laurie
bdd1583543 Handle polymorphic in admin 
Only for collection: * poly side
 2018-04-10 14:46:36 +02:00
Jim Laurie
5d03c350e4 Clean user model 2018-03-27 16:44:25 +02:00
Jim Laurie
54af44901b Remove useless clone object 2018-03-15 12:01:10 +01:00
Jim Laurie
6c4e837c7c Hotfix users models relations 2018-02-24 14:35:12 +01:00