33691 Commits

Author SHA1 Message Date
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
John Williamson
ea35200b8c
Update upload.md 2018-07-17 14:06:12 +10:00
John Williamson
a1330a5d81
clarified path 2018-07-17 13:52:18 +10:00
Kamal Bennani
f76e9baac9
Take into account allowGa config prop 2018-07-16 23:47:08 +02:00
Jim LAURIE
c8252724b5
Merge pull request #1536 from synth3tk/master
Skip number conversion on string fields
2018-07-16 19:07:57 +02:00
Jim LAURIE
dc9de9abd2
Merge branch 'master' into master 2018-07-16 18:59:08 +02:00
soupette
5620101613 Fix bug when no relations for the editDisplay object 2018-07-16 18:53:33 +02:00
soupette
cd5419468c Add data in editDisplay object in order to override the label and placeholder of an input 2018-07-16 18:45:52 +02:00
Jim LAURIE
eed7193b13
Merge pull request #1513 from bahdcoder/fix-update-providers-issue
Fix Update Providers Issue
2018-07-16 18:08:18 +02:00
Jim LAURIE
896077c6f8
Merge branch 'master' into fix-update-providers-issue 2018-07-16 17:50:04 +02:00
soupette
17a39af8ef Apply sort for relations in edit view 2018-07-16 17:26:51 +02:00
soupette
ecb9f306e3 Display edit input form 2018-07-16 16:36:26 +02:00
Jim LAURIE
dafb97665a
Merge pull request #1510 from johannpinson/patch-7
Fix Upload plugin for find query with filter
2018-07-16 16:25:53 +02:00
soupette
8c31a060f7 Handle add relation in dropdown 2018-07-16 16:11:16 +02:00
Jim LAURIE
33c138cece
Merge branch 'master' into patch-7 2018-07-16 16:08:29 +02:00
Jim LAURIE
ea00d491aa
Merge branch 'master' into fix-update-providers-issue 2018-07-16 16:07:30 +02:00
soupette
2a753fbb92 Sort relations 2018-07-16 15:18:21 +02:00
Jim LAURIE
6fb45797fb
Merge pull request #1555 from vaskort/add-ssl-auth-db-CLI-options
Add two options for the CLI - SSL and DB auth
2018-07-16 12:40:23 +02:00
Jim LAURIE
74a52e57f1
Merge branch 'master' into add-ssl-auth-db-CLI-options 2018-07-16 12:31:15 +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
ace0a7eca1
Merge pull request #1529 from strapi/settings-ctm
Content-manager customisation
2018-07-16 11:06:30 +02:00