yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-22 07:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 120 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
34b7737a64 Set Manager in helper plugin 2018-07-27 15:33:37 +02:00
soupette
d7b12f1871 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-27 12:19:19 +02:00
Marianelli Michele
f998c5cf96
Plugin users permission admin - ITA 2018-07-27 11:05:57 +02:00
John Williamson
b257324119
updated version 2018-07-27 13:22:33 +10:00
soupette
bf0619a6d4 Fix begining drag sort 2018-07-26 19:27:27 +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
Basile Bong
757875245c Add > DE translation keys > strapi-plugin-users-permissions 2018-07-26 16:44:54 +02:00
Basile Bong
f2963b4eab Add > DE translation keys > strapi-plugin-upload 2018-07-26 16:42:02 +02:00
Basile Bong
792040a959 Add > DE translation keys > strapi-plugin-settings-manager 2018-07-26 16:40:25 +02:00
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
soupette
c39e7f2603 Refacto code 2018-07-26 14:12:58 +02:00
soupette
fb8c3d2297 Handle display edit layout 2018-07-26 13:33:57 +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
soupette
5830ed4a73 Display empty block when no fields in the editPage 2018-07-26 13:10:26 +02:00
soupette
eeca356060 Handle remove field with edit logic. 
Prevent from having a view without any field
 2018-07-26 12:05:17 +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
David Thomas
2b9fc1a8b9
Merge branch 'master' into auth-microsoft 2018-07-25 21:06:29 -04: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
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