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

5256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
043838ba3f Handle added upload relations 2018-07-31 14:54:52 +02:00
soupette
2d4dded100 Improve ctb by making the continue button the submit one 2018-07-31 13:59:30 +02:00
soupette
aa343f4af3 Add custom drag layer 2018-07-30 19:08:13 +02:00
soupette
3db2cc1ca1 Merge branch 'master' of github.com:strapi/strapi into settings-ctm-edit-view 2018-07-30 14:40:05 +02:00
soupette
11edb99900 Fix dup key in Manager.js 2018-07-30 14:38:10 +02:00
soupette
6bf3ddeea9 Update displayed fields when removing a field from the content type builder 2018-07-30 13:59:25 +02:00
Jim LAURIE
f8d5da71ac
Merge pull request #1662 from jfrux/patch-1 
Update configurations.md
 2018-07-29 17:27:26 +02:00
Jim LAURIE
538d7c82b4
Rename database name 2018-07-29 17:16:19 +02:00
Joshua F. Rountree
661cb8be7c
Update configurations.md 
Minor typo in configurations.md in the documentation under postgres.
 2018-07-29 11:07:57 -04:00
Jim LAURIE
179894c4c2
Merge pull request #1635 from strapi/fix/1609 
Disconnect projects from marketplace.strapi.io
 2018-07-29 14:35:03 +02:00
Jim LAURIE
3e956670a9
Merge branch 'master' into fix/1609 2018-07-29 14:25:49 +02:00
Jim LAURIE
fceeff74e0
Merge pull request #1653 from Velua/patch-2 
updated version from  alpha 12 to 13
 2018-07-29 14:16:21 +02:00
soupette
54aef15b75 Handle add attr logic 2018-07-27 17:24:58 +02:00
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +02:00
soupette
43cfa8a3a3 Change checkbox to toggle 2018-07-27 15:56:38 +02:00
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
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
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
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
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
DMehaffy
c38112ed56 change mysql from text to longtext 2018-07-25 11:04:22 -07: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
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
soupette
4e05bd6359 Use the layout from the core_store in Manager.js 2018-07-24 15:16:47 +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