5877 Commits

Author SHA1 Message Date
soupette
8bb43c9e6b Use layout from the core_store instead of fetching it 2018-07-23 15:56:14 +02:00
Jim LAURIE
8474aad3db
Merge pull request #1607 from derskeal/master
Update quick-start.md
2018-07-23 15:51:46 +02:00
Jim LAURIE
a64e12e5dd
Merge branch 'master' into master 2018-07-23 15:42:28 +02:00
Jim LAURIE
c23eb7c75b
Merge pull request #1606 from derskeal/patch-1
Update configurations.md
2018-07-23 15:42:08 +02:00
Jim LAURIE
b195fddfac
Merge branch 'master' into patch-1 2018-07-23 15:33:49 +02:00
Jim LAURIE
5e9490e207 Merge branch 'settings-ctm-edit-view' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-23 15:13:21 +02:00
Jim LAURIE
87a051e712 Move layout files in core store 2018-07-23 15:12:33 +02:00
DMehaffy
4c64168cda Add base structure for discord 2018-07-23 05:07:17 -07:00
DMehaffy
2fbb6027bd Merge remote-tracking branch 'origin/master' into discordProvider 2018-07-23 05:05:23 -07:00
cyril lopez
88f8737e9d Handle add field 2018-07-23 13:49:28 +02:00
Jim LAURIE
ada58ec643
Merge pull request #1567 from download13/patch-1
Fix for JSON attribute types in GraphQL
2018-07-23 13:15:10 +02:00
cyril lopez
26c53c977e Handle remove logic when removing the edited relation 2018-07-23 12:34:35 +02:00
Jim LAURIE
d116fabd16
Merge branch 'master' into patch-1 2018-07-23 12:26:56 +02:00
Jim LAURIE
111d7aafb9
Merge pull request #1605 from strapi/fix-cm-file-update
Fix udpate file SQL via content manager
2018-07-23 11:54:46 +02:00
cyril lopez
21c06998f5 Allow to customize fields description and label for the EditPage layout 2018-07-23 11:52:05 +02:00
Jim LAURIE
980369580e
Merge branch 'master' into fix-cm-file-update 2018-07-23 11:44:13 +02:00
Jim LAURIE
86958a0112
Merge pull request #1604 from strapi/fix-delete-file
Fix delete uploaded file SQL
2018-07-23 11:43:23 +02:00
Jim LAURIE
43918491ab
Merge branch 'master' into fix-delete-file 2018-07-23 11:32:18 +02:00
David Thomas
06b741f322 Add Microsoft auth provider
Closes #1385
2018-07-22 22:03:29 -04:00
Leon Kyneur
92b045f647 Include yarn.lock in packages .gitignore 2018-07-22 09:26:48 +08:00
Comical DERSKEAL
492127c98f
Update quick-start.md 2018-07-20 19:15:43 +01:00
Comical DERSKEAL
a2c9de74f0
Update configurations.md 2018-07-20 18:44:19 +01:00
Yilin Gan
5e66ee59d0 update for undefined path 2018-07-20 10:17:19 -07:00
Jim LAURIE
83b032e9b3 Fix udpate file SQL via content manager fix #1461 2018-07-20 17:20:06 +02:00
cyril lopez
f4996b3663 Dynamic form to edit the label description of an either an input or a displayed relation 2018-07-20 15:23:09 +02:00
Jim LAURIE
aba7de44ce Fix delete uploaded file SQL fix #1459 2018-07-20 15:09:14 +02:00
Jim LAURIE
cf0e5a8340
Merge pull request #1598 from bahdcoder/fix-social-authentication
Fix social authentication signup
2018-07-20 14:18:00 +02:00
Kati Frantz
f108494cd9 update connect function to check for duplicate email and not provider 2018-07-20 11:36:34 +01:00
Jim LAURIE
de55df0bfa
Merge pull request #1577 from kamalbennani/bugfix/#1576/server-does-not-restart-after-files-changes
Server does not restart after files changes
2018-07-20 12:07:24 +02:00
Jim LAURIE
0639a5d859
Merge branch 'master' into bugfix/#1576/server-does-not-restart-after-files-changes 2018-07-20 11:58:30 +02:00
Jim LAURIE
8d4b560d76
Merge pull request #1597 from strapi/job-offer
Add job offer
2018-07-20 11:37:29 +02:00
Jim LAURIE
3f53e68232
Merge branch 'master' into job-offer 2018-07-20 11:09:53 +02:00
Jim LAURIE
afb2d38300
Merge pull request #1596 from strapi/add-test-api
Test generated API endpoint
2018-07-20 11:09:22 +02:00
Pierre Burgy
09243d510d Merge branch 'master' of github.com:strapi/strapi into job-offer 2018-07-20 10:56:32 +02:00
Pierre Burgy
3ac0ec1149 Indent Readme 2018-07-20 10:55:26 +02:00
Jim LAURIE
60663d2105
Merge branch 'master' into add-test-api 2018-07-20 10:34:54 +02:00
Jim LAURIE
e57ae71a9a
Merge pull request #1564 from strapi/rename-hook-middleware
Rename hook modules with prefix
2018-07-20 09:34:47 +02:00
yummyelin
36175b0237
Merge branch 'master' into master 2018-07-19 17:29:16 -07:00
Pierre Burgy
269e939010 Add job offer 2018-07-19 18:40:29 +02:00
cyril lopez
be3a28ea04 Fix remove algo 2018-07-19 15:41:22 +02:00
Jim LAURIE
9840247d1c Test generated API endpoint 2018-07-19 14:46:03 +02:00
cyril lopez
40ceb6bddd Simplified removed logic with the Manager class 2018-07-19 13:19:21 +02:00
Jim LAURIE
8a10225680
Merge branch 'master' into rename-hook-middleware 2018-07-19 11:04:57 +02:00
cyril lopez
e10f2e61b4 Add utils & fix lint 2018-07-19 03:07:15 +02:00
cyril lopez
2a419dd92e Created Manager class for dnd fields 2018-07-19 02:37:12 +02:00
soupette
fb0cd167b7 fix conflict 2018-07-18 19:11:52 +02:00
soupette
657c6fe9e0 Change the remove element logic in order to handle the drag and sort of different element size.
This is a dirty commit since the algorithm is not working (yet)... Need to handle the size of the added div that simulates inputs element.
2018-07-18 19:07:37 +02:00
soupette
659655273e Change the remove element logic in order to handle the drag and sort of different element size.
This is a dirty commit since the algorithm is not working (yet)... Need to handle the size of the added div that simulates inputs element.
2018-07-18 19:00:54 +02:00
soupette
1c7075e75b User rdnd to sort VariableWidthAttr 2018-07-18 15:26:22 +02:00
soupette
edadb6f918 Handle remove without modifying the layout 2018-07-18 13:29:18 +02:00