Comical DERSKEAL
|
a2c9de74f0
|
Update configurations.md
|
2018-07-20 18:44:19 +01: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 |
|
Pierre Burgy
|
269e939010
|
Add job offer
|
2018-07-19 18:40:29 +02:00 |
|
Jim LAURIE
|
9840247d1c
|
Test generated API endpoint
|
2018-07-19 14:46:03 +02:00 |
|
Jim LAURIE
|
8a10225680
|
Merge branch 'master' into rename-hook-middleware
|
2018-07-19 11:04:57 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Jim LAURIE
|
ace0a7eca1
|
Merge pull request #1529 from strapi/settings-ctm
Content-manager customisation
|
2018-07-16 11:06:30 +02:00 |
|
Jim LAURIE
|
fabe370f90
|
Merge branch 'master' into settings-ctm
|
2018-07-16 10:56:26 +02:00 |
|
Jim LAURIE
|
2b6b2271b1
|
Merge pull request #1546 from derrickmehaffy/Update_Docs_DM
Update Admin build Docs
|
2018-07-16 09:44:38 +02:00 |
|
Kamal Bennani Bouchiba
|
9c0ec12546
|
Merge branch 'master' into bugfix/#1576/server-does-not-restart-after-files-changes
|
2018-07-15 16:18:51 +02:00 |
|
Kamal Bennani
|
fed929455d
|
Reset the reloading state after files changes
|
2018-07-15 15:51:30 +02:00 |
|
Jim LAURIE
|
3039b6dc69
|
Merge branch 'master' into Update_Docs_DM
|
2018-07-15 12:13:58 +02:00 |
|
David Thomas
|
c785248b2c
|
Fix removal of the filter keyword for field type comparison
|
2018-07-13 19:25:40 -04:00 |
|
David Thomas
|
422530ceed
|
Update fieldType comparison operator to strict
|
2018-07-13 18:00:47 -04:00 |
|
David Thomas
|
b3b2b32dd8
|
Merge branch 'master' of github.com:strapi/strapi
|
2018-07-13 17:52:43 -04:00 |
|
Jim LAURIE
|
c7d4858f4e
|
Fix rename readme
|
2018-07-13 17:03:34 +02:00 |
|
Jim LAURIE
|
d79a16b18c
|
Fix hook lazy loading
|
2018-07-13 16:59:57 +02:00 |
|
Jim LAURIE
|
5b633efacf
|
Fix API generator database hook
|
2018-07-13 16:42:10 +02:00 |
|
Jim LAURIE
|
9bf04f5fef
|
Fix conflict
|
2018-07-13 15:42:14 +02:00 |
|
Jim LAURIE
|
02129dc1d8
|
Merge pull request #1560 from maturano/bug/tmpPathYarn
Fix temp directory reference for Yarn
|
2018-07-13 12:39:05 +02:00 |
|