5174 Commits

Author SHA1 Message Date
Aurelsicoko
37b9c2ee4c Remove front-end dependency from marketplace.strapi.io 2018-07-24 19:37:27 +02:00
Aurélien GEORGET
06bcac7ee2
Disconnect projects from marketplace.strapi.io 2018-07-24 18:54:50 +02:00
Jim LAURIE
dc9dfa71da
Merge pull request #1615 from arnaudmolo/master
Fix search input extra scrollbar in Firefox
v3.0.0-alpha.13
2018-07-24 00:10:27 +02:00
Arnaud Pichon
3b5c88a1ed
Fix search input extra scrollbar in Firefox 2018-07-23 20:00:11 +02:00
Jim LAURIE
8e7bbbe20b
Merge pull request #1566 from akkys77/language/es
Spanish Translations
2018-07-23 18:06:27 +02:00
Jim LAURIE
fcebf4fc6e
Merge branch 'master' into language/es 2018-07-23 17:32:58 +02:00
Jim LAURIE
4edbef1840
Merge pull request #1611 from leonkyneur/gitignore
Include yarn.lock in packages .gitignore
2018-07-23 17:30:07 +02:00
Jim LAURIE
e7a8659f44
Merge branch 'master' into gitignore 2018-07-23 16:06:22 +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
ada58ec643
Merge pull request #1567 from download13/patch-1
Fix for JSON attribute types in GraphQL
2018-07-23 13:15:10 +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
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
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
Jim LAURIE
83b032e9b3 Fix udpate file SQL via content manager fix #1461 2018-07-20 17:20:06 +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
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