5192 Commits

Author SHA1 Message Date
Marianelli Michele
f998c5cf96
Plugin users permission admin - ITA 2018-07-27 11:05:57 +02:00
Jim LAURIE
96f83eb2b1
Merge pull request #1647 from strapi/3.0.0-alpha.13.0.1
3.0.0 alpha.13.0.1
2018-07-26 17:09:17 +02:00
Jim LAURIE
a0c49e3340 Fix package conflicts 2018-07-26 16:19:28 +02:00
Jim LAURIE
09a2a4b73d 3.0.0-alpha.13.0.1 v3.0.0-alpha.13.0.1 2018-07-26 16:12:17 +02:00
Jim LAURIE
172e5bcc69 Merge pull request #1646 from strapi/fix-1645
Fix delete morph relation bookshelf
2018-07-26 15:24:54 +02:00
Jim LAURIE
aa37a3a5c2 Merge pull request #1643 from derrickmehaffy/fix1642
Change MySQL text to longtext
2018-07-26 15:24:54 +02:00
Jim LAURIE
2b622cee8e
Merge pull request #1646 from strapi/fix-1645
Fix delete morph relation bookshelf
2018-07-26 15:05:05 +02:00
Jim LAURIE
2c85b0f8d8
Merge branch 'master' into fix-1645 2018-07-26 14:52:35 +02:00
Jim LAURIE
f6f65aa270 Fix #1645 2018-07-26 14:19:47 +02:00
Jim LAURIE
f6157540a6
Merge pull request #1643 from derrickmehaffy/fix1642
Change MySQL text to longtext
2018-07-26 13:31:12 +02:00
Jim LAURIE
79259a10dc
Merge branch 'master' into fix1642 2018-07-26 13:13:46 +02:00
Jim LAURIE
1056278811
Merge pull request #1618 from nicroto/add-amazon-ses-email-provider
Add amazon ses email provider
2018-07-26 10:45:24 +02:00
Jim LAURIE
4d10278395
Update version 2018-07-26 10:25:27 +02:00
Jim LAURIE
dfae250b91
Merge branch 'master' into add-amazon-ses-email-provider 2018-07-26 10:24:55 +02:00
DMehaffy
c38112ed56 change mysql from text to longtext 2018-07-25 11:04:22 -07:00
Jim LAURIE
7b2ce955ff
Merge pull request #1641 from strapi/3.0.0-alpha.13
3.0.0-alpha.13
2018-07-25 17:33:39 +02:00
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00
Nikolay Tsenkov
ff0652b35e Fix: plugin: strapi-email-amazon-ses: error on sending an email. 2018-07-24 13:41:22 +03:00
Nikolay Tsenkov
c8b9b272f1 Improve: plugin: strapi-email-amazon-ses: setting labels;
Remove: plugin: strapi-email-amazon-ses: unnecessary setting.
2018-07-24 12:54:25 +03:00
Nikolay Tsenkov
b73e3561f5 Add: plugin: strapi-email-amazon-ses. 2018-07-24 10:37:04 +03: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