yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 10:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,269 Commits 121 Branches 507 Tags
Commit Graph

5269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Basile Bong
f0b8b411e6 Add > DE translation keys > strapi-plugin-email 2018-07-26 16:38:33 +02:00
Basile Bong
c2b34db19e Add > DE translation keys > strapi-plugin-content-type-builder 2018-07-26 16:34:36 +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
Basile Bong
25e32a5459 Add > DE translation keys > strapi-plugin-content-manager 2018-07-26 15:55:30 +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
Basile Bong
0796dd4876 Add > DE translation keys > strapi-admin 2018-07-26 13:21:41 +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
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
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
bardaq
033219560a Add missing translation keys in RU language 🇷🇺 2018-07-25 10:14:55 +03:00
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
Özgür ERSOY
e8aa35fe42
Merge pull request #2 from moersoy/patch-1 
#1628 Missing translations
 2018-07-24 17:41:00 +03:00
Özgür ERSOY
c41e218aa0
Merge branch 'master' into patch-1 2018-07-24 17:40:49 +03:00
Özgür ERSOY
e25f7fb2b5
Merge pull request #1 from moersoy/patch-2 
Patch 2
 2018-07-24 17:39:44 +03:00
Özgür ERSOY
0f4e1912be #1628 Missing translations 🇹🇷 2018-07-24 17:35:08 +03:00
Özgür ERSOY
d9dadd3d76
#1628 Missing translations 2018-07-24 17:27:56 +03:00
Özgür ERSOY
7aba6ff4b7
#1628 Missing translations 2018-07-24 17:22:32 +03:00
Marianelli Michele
62ebbacb0e
Another update of it.json 2018-07-24 16:07:52 +02:00
DMehaffy
1b0579db22 Updating purest config 2018-07-24 07:04:25 -07:00
DMehaffy
02d5a8386c Merge remote-tracking branch 'origin/master' into discordProvider 2018-07-24 06:47:52 -07:00
Marianelli Michele
a97ed480a1
Update it.json 2018-07-24 15:10:18 +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
DMehaffy
4c64168cda Add base structure for discord 2018-07-23 05:07:17 -07:00
DMehaffy
2fbb6027bd Merge remote-tracking branch 'origin/master' into discordProvider 2018-07-23 05:05:23 -07: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