29765 Commits

Author SHA1 Message Date
cyril lopez
cdfed813b7 Remove link in content type input name description 2017-09-21 16:23:39 +02:00
cyril lopez
aa1ef273fb Update branch
Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev
2017-09-21 16:13:49 +02:00
cyril lopez
bbc78f5218 Fix input addon width 2017-09-21 16:12:35 +02:00
cyril lopez
3d86aa732e Fix popups design 2017-09-21 16:07:56 +02:00
Jim Laurie
514b7d3d83 Fix load cron tasks 2017-09-21 15:58:55 +02:00
Aurelsicoko
015ba88544 Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev 2017-09-21 15:44:59 +02:00
Aurelsicoko
97292fc65b Order attribute parameters correctly and handle dominant case 2017-09-21 15:43:33 +02:00
cyril lopez
78a9b77086 Update branch
Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev
2017-09-21 15:43:20 +02:00
cyril lopez
35f8311cfd Fix design and add notifications 2017-09-21 15:42:22 +02:00
Aurelsicoko
2e534cd64d Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev 2017-09-21 15:02:13 +02:00
Aurelsicoko
4b3954633b Import new icon and fix design 2017-09-21 15:01:38 +02:00
Jim Laurie
3ed43d8b82 Use database connections fot sessions 2017-09-21 14:46:50 +02:00
cyril lopez
a5bb67f723 Make checkbox label clickable 2017-09-21 14:21:18 +02:00
cyril lopez
d66a1f6dd6 Fix design, add dominant when relation many to many 2017-09-21 14:07:34 +02:00
Aurelsicoko
00c77824a9 Generate relation attribute in right order and fix select on relation modal 2017-09-21 14:03:17 +02:00
Jim Laurie
68495606b2 Migration koa-generic-session to koa-session 2017-09-21 12:24:27 +02:00
Aurelsicoko
a67229496e Resolve conflicts 2017-09-20 18:17:10 +02:00
Aurelsicoko
67cd222c07 Avoid mistake on deletion with Bookshelf 2017-09-20 18:15:06 +02:00
Aurelsicoko
cefaff4c45 Fix delete on Mongoose 2017-09-20 18:14:18 +02:00
cyril lopez
ead60f4aca Fix e.preventDefault on toggleModalWarning bug 2017-09-20 16:34:40 +02:00
cyril lopez
46ce57ecf9 Fix redirection after editing a record, fix enter key submit 2017-09-20 16:22:04 +02:00
Aurelsicoko
bd16913b02 Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev 2017-09-20 15:25:39 +02:00
Aurelsicoko
0c270b387f Remove relationships on deletion 2017-09-20 15:25:10 +02:00
cyril lopez
f750be8bad Updtae branch
Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev
2017-09-20 15:23:53 +02:00
cyril lopez
f344cb6d07 Fix edit record 2017-09-20 15:21:58 +02:00
Aurelsicoko
384edfae29 Fix moment require 2017-09-20 14:54:27 +02:00
Aurelsicoko
7e8ca681c3 Fix sorting arrow position 2017-09-20 14:46:18 +02:00
Aurelsicoko
6b83375009 Improve design sorting arrow 2017-09-20 13:19:36 +02:00
cyril lopez
bb2c62aa7e Update branch
Merge branch 'plugin/content-type-builder-dev' of github.com:strapi/strapi into plugin/content-type-builder-dev
2017-09-20 12:32:15 +02:00
cyril lopez
b45d688872 Add select number format 2017-09-20 12:30:43 +02:00
Jim Laurie
4ef967ae3d Add link strapi-generate-api on setup 2017-09-20 12:13:33 +02:00
Aurelsicoko
e64e5414ce Apply CSS on empty table 2017-09-20 12:00:42 +02:00
Aurelsicoko
9ef6618f3a Run test on port 1338 and remove deprecated PropTypes warning 2017-09-20 11:12:04 +02:00
cyril lopez
b9136765d6 Fix bug select connections 2017-09-20 11:00:17 +02:00
Aurelsicoko
d95de47574 Apply few design updates to harmonize components 2017-09-19 19:04:39 +02:00
Aurelsicoko
2e79214a04 Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev 2017-09-19 17:22:47 +02:00
Aurelsicoko
d853db7f36 Introduce new layout position system 2017-09-19 17:19:35 +02:00
cyril lopez
ee055030e7 Update branch
Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev
2017-09-19 17:11:27 +02:00
cyril lopez
779b5da2d2 Fix desgin TableRow, add redirection after creating or updating a record 2017-09-19 17:10:14 +02:00
cyril lopez
302f92a1e3 Change functions naming to correspond to convention 2017-09-19 14:07:58 +02:00
Aurelsicoko
4d2ec1f5b0 Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev 2017-09-19 13:57:17 +02:00
Aurelsicoko
3176a431ec Display relationships on 3 cols and fix ID display 2017-09-19 13:56:51 +02:00
cyril lopez
72bcfd23f7 Update lib input 2017-09-19 13:51:40 +02:00
cyril lopez
9255f8098e Update branch
Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev
2017-09-19 13:50:56 +02:00
cyril lopez
dd551acdfa Add formValidations to edit container, add translations, update lib input 2017-09-19 13:49:49 +02:00
Aurelsicoko
019690d6d6 Improve notification behaviour and solve issue with no relationships 2017-09-19 13:40:26 +02:00
Pierre Burgy
d72467e670 Fix assets display in build mode 2017-09-19 13:21:06 +02:00
Aurelsicoko
7557cf20b4 Merge branch 'plugin/content-manager-dev' of github.com:strapi/strapi into plugin/content-manager-dev 2017-09-19 11:17:38 +02:00
Aurelsicoko
23746cce46 Fix relationships with Bookshelf 2017-09-19 11:17:04 +02:00
Jim Laurie
e6a0e82d3f Update p3p xss csp and session config 2017-09-19 10:06:16 +02:00