6761 Commits

Author SHA1 Message Date
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
Jim LAURIE
9905fd0229 Fix PR feedback 2018-07-18 11:57:09 +02:00
Jim LAURIE
985830ecce
Merge pull request #1421 from johannpinson/graphql-type-datetime
Add DateTime support for GraphQL plugin
2018-07-18 10:23:35 +02:00
soupette
85889c5d67 Design VariableDraggableAttr component for fields sort 2018-07-17 14:06:21 +02:00
Jim LAURIE
f8febb5b8b
Merge branch 'master' into graphql-type-datetime 2018-07-17 12:28:37 +02:00
Jim LAURIE
29507efd68
Merge pull request #1514 from bahdcoder/fix-user-roles-and-permissions
Fix user roles and permissions issue
2018-07-17 12:22:54 +02:00
Jim LAURIE
1dfd671c32
Merge branch 'master' into fix-user-roles-and-permissions 2018-07-17 12:08:09 +02:00
Jim LAURIE
bc447d1167
Merge pull request #1581 from kamalbennani/bugfix/#1580/take-into-account-allowGa-config-prop
Take into account allowGa value
2018-07-17 12:07:25 +02:00
Jim LAURIE
2f71186002
Merge branch 'master' into bugfix/#1580/take-into-account-allowGa-config-prop 2018-07-17 11:57:19 +02:00
soupette
3bf7fa2348 Fix css dropdown 2018-07-17 11:27:34 +02:00
soupette
2407e8cb4a Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-17 11:11:47 +02:00
Jim LAURIE
a53d628438
Merge pull request #1582 from Velua/patch-1
Clarified path for plugins providers configs
2018-07-17 10:56:35 +02:00
soupette
41379ebbfa Remove arrow function from EditPage render 2018-07-17 10:41:31 +02:00
soupette
7c88f72c19 Remove arrow functions from render in ListPage 2018-07-17 10:39:43 +02:00
soupette
20224d3f90 Remove Arrow functions in render SettingsPage 2018-07-17 10:25:38 +02:00
soupette
977406d7ba Remove arrow functions from dom in SettingPage 2018-07-17 10:17:00 +02:00
Jim LAURIE
db8a47a016 Merge branch 'master' of github.com:strapi/strapi into rename-hook-middleware 2018-07-17 08:53:36 +02:00