3943 Commits

Author SHA1 Message Date
Jim LAURIE
46bcadaae5
Fix PR feedback 2018-03-19 18:00:04 +01:00
Jim LAURIE
792b909b85
Merge branch 'master' into ga-admin 2018-03-19 17:48:31 +01:00
Jim Laurie
9017c0d1d0 Add ga in admin to improve Strapi 2018-03-19 17:45:33 +01:00
Aurélien GEORGET
11c68bebf2
Update User.js 2018-03-19 17:31:04 +01:00
Adrien Lepoutre
d8281d7036 Add lodash to package.json to avoid version problem 2018-03-19 12:27:01 -04:00
cyril lopez
34e968077d Fix lineheight 2018-03-19 15:35:47 +01:00
Jim LAURIE
5d82812355
Merge pull request #789 from strapi/migration-10-to-11
Add migration guide alpha 10 to 11
2018-03-19 14:44:19 +01:00
Jim LAURIE
615e8e5e09
Merge branch 'master' into migration-10-to-11 2018-03-19 14:25:57 +01:00
Jim LAURIE
75fb9d1f60
Merge pull request #807 from strapi/design/auth-form
Update styles.scss
2018-03-19 14:25:47 +01:00
Aurélien GEORGET
c7fdd84340
Update styles.scss 2018-03-19 14:07:02 +01:00
Jim LAURIE
54d5104f30
Merge pull request #805 from strapi/prevent-ctb-from-breaking-unknown-attr
Prevent the ctb from breaking
2018-03-19 13:06:29 +01:00
cyril lopez
17aa4049d1 Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-19 12:53:15 +01:00
cyril lopez
c6b24f046b Prevent the ctb from breaking if a user tries to edit an attribute that it cannot currently handle 2018-03-19 12:49:25 +01:00
cyril lopez
0952c9aaa9 Add new layout dynamic 2018-03-19 12:30:04 +01:00
Jim LAURIE
d78c0a0200
Merge pull request #792 from johannpinson/patch-1
Update model.template for generate api
2018-03-19 12:22:34 +01:00
Jim LAURIE
164a29a6b6
Fix PR feedback 2018-03-19 12:14:25 +01:00
Jim LAURIE
2ba257ce1c
Merge branch 'master' into patch-1 2018-03-19 12:08:05 +01:00
cyril lopez
67cb54ae12 Add request to fetch layout in ctm 2018-03-19 11:57:47 +01:00
Jim LAURIE
25b85830b5
Merge pull request #796 from abdonrd/array
Allow Array type in the backend
2018-03-19 10:33:50 +01:00
cyril lopez
06760f7dfd Fixes #799 2018-03-19 10:25:21 +01:00
Jim LAURIE
3d2f611af2
Merge branch 'master' into array 2018-03-19 10:15:14 +01:00
Jim LAURIE
38f2986c3c
Merge pull request #801 from abdonrd/paths
Fix spaces path issues on npm run build --plugins
2018-03-19 10:14:23 +01:00
cyril lopez
2098ff1782 Init preview HTML
(still very buggy)
2018-03-19 09:47:56 +01:00
Abdón Rodríguez Davila
1e7682eddd Fix spaces path issues on databases 2018-03-18 13:29:49 +01:00
Abdón Rodríguez Davila
1dd36a5eb6 Fix spaces path issues on npm run build --plugins 2018-03-18 13:11:11 +01:00
Abdón Rodríguez Davila
3cd5cff861 Add Array type 2018-03-17 16:43:25 +00:00
Abdón Rodríguez Davila
a186ac3d3b Sort types alphabetically 2018-03-17 16:42:28 +00:00
Jim LAURIE
4fb877d9c2
Merge pull request #790 from strapi/fix/mask
Fix/mask
2018-03-16 17:21:48 +01:00
Jim LAURIE
ee968ad2d0
Merge branch 'master' into fix/mask 2018-03-16 16:10:33 +01:00
Johann Pinson
9d6d2c0b9f Update model.template for mongoose 2018-03-16 16:01:27 +01:00
Johann Pinson
49536526f8 Update model.template for bookshelf 2018-03-16 16:00:14 +01:00
Johann Pinson
4ed7ad2064
Update models.md 2018-03-16 15:54:53 +01:00
cyril lopez
644ccd13a0 Init preview 2018-03-16 14:52:17 +01:00
cyril lopez
0b5fcc39a2 Init preview html 2018-03-16 13:48:32 +01:00
Aurelsicoko
7148eafd2a Improve request 2018-03-16 12:20:58 +01:00
Jim Laurie
c9b736543a Add migration guide alpha 10 to 11 2018-03-16 12:18:11 +01:00
cyril lopez
deed38e50e Design buttons wysiwyg 2018-03-16 12:05:16 +01:00
cyril lopez
98f0b6f3fc Created ToggleToMArkdown button 2018-03-16 11:45:21 +01:00
Aurelsicoko
7760ae54cc Improve errors handling 2018-03-16 11:42:17 +01:00
cyril lopez
63575565b1 Merge branch 'master' of github.com:strapi/strapi into wysiwyg 2018-03-15 22:20:54 +01:00
cyril lopez
1b82aa0940 Fix offsets 2018-03-15 20:21:21 +01:00
cyril lopez
1047a5bdda Order funcs 2018-03-15 19:10:02 +01:00
cyril lopez
a353c4bc41 Add character numbers and hanle add simple link without selection 2018-03-15 18:58:40 +01:00
cyril lopez
feee771cc5 Fix quotes and code block 2018-03-15 18:27:18 +01:00
cyril lopez
eb3b07c592 Handle Tab key command with event listener
I have to force the tab key event since it is not working with the Editor handleKeyCommand handler
2018-03-15 18:10:19 +01:00
cyril lopez
a54db55d0c Clean add media 2018-03-15 17:28:12 +01:00
cyril lopez
24a1d3cb92 Refacto addUl and addOl 2018-03-15 17:18:05 +01:00
cyril lopez
798536f0d6 Handle auto add ol 2018-03-15 16:54:28 +01:00
Jim LAURIE
90e1c6dafe
Merge pull request #781 from strapi/fix/mask
Fix dominant true when updating relationship
2018-03-15 16:39:37 +01:00
Jim LAURIE
a97e96c240
Merge branch 'master' into fix/mask 2018-03-15 16:21:05 +01:00