2419 Commits

Author SHA1 Message Date
cyril lopez
957b92692a Sort functions by name 2017-12-07 15:27:11 +01:00
cyril lopez
cba9cac629 Delete useless request file in ctm and order Auth controller by function s name 2017-12-07 15:21:54 +01:00
Jim Laurie
cbc0cf73dd Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 14:57:45 +01:00
Jim Laurie
3f15a5b618 Fix bookshelf fetch for auth 2017-12-07 14:56:25 +01:00
Aurelsicoko
f5023b2fdc Use private data instead of state to send source to actions in Content Manager 2017-12-07 14:37:09 +01:00
cyril lopez
f3184590d7 Fix typo 2017-12-07 14:35:35 +01:00
Aurelsicoko
94c153dd5f Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-07 14:31:13 +01:00
Aurelsicoko
3056736ca9 Use get default value in LeftMenuLinkContainer 2017-12-07 14:30:31 +01:00
Aurelsicoko
6f0396ea04 Remove unnecessary backend url from sagas' urls 2017-12-07 14:28:55 +01:00
cyril lopez
ce94f85a50 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-07 14:17:23 +01:00
cyril lopez
592a7cb58c Fix request helper 2017-12-07 14:16:21 +01:00
cyril lopez
795950c7cb Remove X-Forwarded-Host header in strapi-generate-new 2017-12-07 14:11:06 +01:00
cyril lopez
d09b3e3312 Pass object to redirect the user 2017-12-07 14:07:37 +01:00
Aurelsicoko
48c9670240 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-07 14:05:47 +01:00
Aurelsicoko
d20c349276 Optimize i18n functions 2017-12-07 14:05:10 +01:00
cyril lopez
2b82bdf388 Remove 404 in AdminPage container 2017-12-07 13:50:43 +01:00
cyril lopez
cb1dbc8333 Fix PopUpForm close button position 2017-12-07 13:41:02 +01:00
cyril lopez
4b71c2b140 Fix ctb notification id 2017-12-07 13:31:32 +01:00
cyril lopez
efc37c4b24 Fix ctm notification id 2017-12-07 13:26:25 +01:00
cyril lopez
342ced6ed0 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-07 13:18:44 +01:00
cyril lopez
f352a27e8f Fix admin notification id 2017-12-07 13:17:39 +01:00
Aurelsicoko
9c7b09716c Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-07 12:09:00 +01:00
Aurelsicoko
d050e4df28 Fix redirect and load custom middleware 2017-12-07 12:08:13 +01:00
cyril lopez
768aeed0bf Created Row Component to handle listPlugin PopUpWarning bug 2017-12-07 10:57:39 +01:00
cyril lopez
a19e6eaf15 Fix roles.json bug 2017-12-07 10:16:36 +01:00
cyril lopez
1a56f117ee Update doc plugins => UI-components => Input 2017-12-06 18:14:12 +01:00
cyril lopez
6474841abc Handle 404 in users-permissions 2017-12-06 17:45:38 +01:00
cyril lopez
9b5be00115 Add 404 in content type builder 2017-12-06 17:23:14 +01:00
cyril lopez
c2fd6468b4 Add 404 in settings manager 2017-12-06 17:05:03 +01:00
cyril lopez
63c5c73aee Handle Admin page 404 2017-12-06 16:40:32 +01:00
cyril lopez
9a2e051361 Fix input email error css 2017-12-06 16:21:12 +01:00
cyril lopez
95d87cfb35 Clean roles.json 2017-12-06 16:01:12 +01:00
cyril lopez
d995d4feef Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-06 15:59:26 +01:00
cyril lopez
a2ebbfab9e Handle any api errors in ctm 2017-12-06 15:58:20 +01:00
Jim Laurie
23b7537914 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-06 15:22:19 +01:00
Jim Laurie
dce9c3f232 Fix set load middleware function 2017-12-06 15:21:26 +01:00
cyril lopez
ac102e88e5 Fix conflict 2017-12-06 15:15:43 +01:00
cyril lopez
59872ac890 Handle backend errors in ctm 2017-12-06 15:11:55 +01:00
Jim Laurie
29e25686d1 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-06 14:16:44 +01:00
Jim Laurie
15e4f9985f Remove password and token from fetchable data USER API / AUTH 2017-12-06 14:15:27 +01:00
Aurelsicoko
4444d806d6 Replace PNG logo to SVG & handle email/password type in Content Manager list 2017-12-06 13:44:58 +01:00
Jim Laurie
8ab44d86af Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-06 12:26:09 +01:00
Jim Laurie
427b4b3903 Reverse fetchable data 2017-12-06 12:25:08 +01:00
cyril lopez
1084e88826 Catch register errors and handle it in front 2017-12-06 12:19:43 +01:00
Aurelsicoko
0383bfded2 Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions 2017-12-06 12:00:25 +01:00
Aurelsicoko
ff5d5e2839 Fix register permissions 2017-12-06 11:58:24 +01:00
Jim Laurie
bef37d0cec Remove password and token from fetchable data 2017-12-06 11:54:19 +01:00
cyril lopez
ec09ee6a28 Update branch
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
2017-12-06 11:51:36 +01:00
cyril lopez
642bee0085 Init auth errors 2017-12-06 11:47:39 +01:00
Jim Laurie
ce00536663 Fix conflict 2017-12-06 11:44:48 +01:00