yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 08:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 112 Branches 488 Tags
Commit Graph

6761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
91838a8934 Start sort drag variable width 2018-07-25 19:18:36 +02: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
soupette
831de78567 Fix Remove element 2018-07-25 14:28:29 +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
soupette
0ebc1ba15d Fix remove element 2018-07-24 19:21:38 +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
soupette
4e05bd6359 Use the layout from the core_store in Manager.js 2018-07-24 15:16:47 +02: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
soupette
8adf547910 Fix delete variable width element 2018-07-24 11:30:57 +02: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
soupette
e4d68be3a3 Apply custom label and description for relations 2018-07-23 17:59:24 +02:00
soupette
02acfefd01 Add sortfield logic in editPage 2018-07-23 17:46:05 +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
soupette
4916f9277b Use the default layout to prevent from displaying sensitive field in the admin 2018-07-23 16:59:30 +02:00
Jim LAURIE
e7a8659f44
Merge branch 'master' into gitignore 2018-07-23 16:06:22 +02:00
soupette
8bb43c9e6b Use layout from the core_store instead of fetching it 2018-07-23 15:56:14 +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
5e9490e207 Merge branch 'settings-ctm-edit-view' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-23 15:13:21 +02:00
Jim LAURIE
87a051e712 Move layout files in core store 2018-07-23 15:12:33 +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
cyril lopez
88f8737e9d Handle add field 2018-07-23 13:49:28 +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
cyril lopez
26c53c977e Handle remove logic when removing the edited relation 2018-07-23 12:34:35 +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
cyril lopez
21c06998f5 Allow to customize fields description and label for the EditPage layout 2018-07-23 11:52:05 +02:00
Jim LAURIE
980369580e
Merge branch 'master' into fix-cm-file-update 2018-07-23 11:44:13 +02:00