74 Commits

Author SHA1 Message Date
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
Alberto Maturano
1a3e01c66f Fix linter errors 2018-08-20 14:37:49 -05:00
Jim LAURIE
d9725a719d
Merge branch 'master' into master 2018-08-20 16:24:01 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +02:00
KuongKnight
f508da6fce Fixed custom primaryType option 2018-08-02 23:13:38 +07:00
KuongKnight
6c0abfc314 change length to 36 for type uuid mysql 2018-08-02 00:05:29 +07:00
KuongKnight
dd7e6a479c Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	packages/strapi-hook-bookshelf/lib/index.js
2018-08-01 14:38:59 +07:00
Jim LAURIE
ba99e0f24d
Merge branch 'master' into feature/spanishTranslation 2018-07-31 13:38:18 +02:00
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +02:00
Jim LAURIE
09a2a4b73d 3.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
Alberto Maturano
1cf5dac2a6 Improve spanish translation
- Fix minor errors and improve translation after review it in context
(comments from PR #1566)

- Missing ES translations (issue #1621)

- Normalize tone using a formal style
2018-07-25 12:18:58 -05:00
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00
Jim LAURIE
e7a8659f44
Merge branch 'master' into gitignore 2018-07-23 16:06:22 +02:00
Leon Kyneur
92b045f647 Include yarn.lock in packages .gitignore 2018-07-22 09:26:48 +08:00
Jim LAURIE
83b032e9b3 Fix udpate file SQL via content manager fix #1461 2018-07-20 17:20:06 +02:00
Jim LAURIE
c7d4858f4e Fix rename readme 2018-07-13 17:03:34 +02:00
Jim LAURIE
634165c379 Fix strapi utils hook detection 2018-07-12 17:27:32 +02:00
Jim LAURIE
e888007878 Fix hook dependencies 2018-07-12 14:31:39 +02:00
Jim LAURIE
cf8184e223 Use hook prefix and rename 2018-07-11 16:23:14 +02:00