652 Commits

Author SHA1 Message Date
Jim LAURIE
f87ebea759
Merge branch 'master' into plugin-documentation 2018-12-17 16:22:03 +01:00
soupette
a401739405 Fix lang issue 2018-12-12 11:55:17 +01:00
soupette
54fdbc6897 Add option to copy token in the ui 2018-12-06 19:00:49 +01:00
soupette
a225d144c6 Add selector for errors 2018-11-21 12:57:20 +01:00
soupette
5406b678ac Add selectors for tests and fix bugs 2018-11-16 09:18:57 +01:00
soupette
779f575b47 Access reducer from cypress 2018-11-13 16:53:50 +01:00
soupette
2a5f0c95d2 Fix conflict 2018-11-08 17:54:45 +01:00
soupette
7a66850aa6 Add ids to buttons in ctb 2018-11-08 16:32:34 +01:00
Alberto Maturano
980b6d240d Improve code style and code quality
Just some little improvements that I found looking around the code.

Related 2410d5a
2018-10-30 16:55:11 -06:00
Jim LAURIE
e42e532f1a
Merge branch 'master' into revert-1928-master 2018-10-18 10:41:38 +02:00
Jim LAURIE
3d149ffc68
Merge branch 'master' into clean-dependencies 2018-10-17 16:14:26 +02:00
Jim LAURIE
bcb71242a8
Revert "Font-family declarations fixed" 2018-10-09 12:31:16 +02:00
cyril lopez
13f2193f73 Merge branch 'improve-ctm/delete-edit-view' of github.com:strapi/strapi into improve-ctm/delete-edit-view 2018-10-09 12:02:25 +02:00
cyril lopez
d186d33e39 Revert "Fix font-family"
This reverts commit 220fb2caf8f8ca46ffff5646d62c3adc62c69819.
2018-10-09 11:49:16 +02:00
Jim LAURIE
40a3c0418d
Merge branch 'master' into improve-ctm/delete-edit-view 2018-10-08 20:07:22 +02:00
Jim LAURIE
4dd93f4b78
Merge branch 'master' into split-admin-dev 2018-10-08 17:44:35 +02:00
Aurelsicoko
72e47dde75 Update delete button style 2018-10-08 16:45:24 +02:00
cyril lopez
9ce27ae3d8 Clean svg 2018-10-08 11:20:04 +02:00
Alberto Maturano
2410d5ab9d Simplify logic 2018-10-04 15:22:10 -05:00
cyril lopez
08eae80563 Add delete button 2018-10-03 17:22:08 +02:00
cyril lopez
4cc41331ce Change button secondary class 2018-10-03 16:19:04 +02:00
cyril lopez
220fb2caf8 Fix font-family 2018-10-03 12:49:43 +02:00
Jim LAURIE
29409f9531
Merge branch 'master' into master 2018-09-27 18:32:03 +02:00
cyril lopez
9156865f6a Remove useless dependencies in strapi helper plugin 2018-09-26 18:24:42 +02:00
cyril lopez
989b867714 Split admin entry point between dev and prod 2018-09-25 15:01:06 +02:00
Alberto Maturano
154fc28a57 Normalize to standar file permissions
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
2018-09-24 12:33:09 -05:00
uyouthe
2f2ad51804 Font-family declarations fixed 2018-09-10 20:59:33 +03:00
soupette
c865109337 Fixes #1914 2018-09-07 17:29:33 +02:00
soupette
270064e0cf Add error to LoadingIndicatorPage 2018-09-07 16:46:16 +02:00
soupette
b2d55b13a3 Fix pinput file 2018-09-07 12:47:45 +02:00
Jim LAURIE
3fe7f0cf2a
Merge branch 'master' into fix/reset-image-preview 2018-09-06 18:15:29 +02:00
Vladislav Arsenev
19fba87e85 fix: reset-image-preview - clear label and icon preview 2018-09-05 12:59:24 +03:00
Vladislav Arsenev
b254d46607
Merge branch 'master' into fix/repeat-upload-the-same-file 2018-08-31 14:06:54 +03:00
Vladislav Arsenev
d75f3acae5 fix:repeat-upload-the-same-file - clear file input after trigger event 2018-08-31 13:30:39 +03:00
Vladislav Arsenev
e30e61c217
Merge branch 'master' into fix/files-required-validation 2018-08-30 14:50:20 +03:00
Vladislav Arsenev
5a666d80df fix(files-required-validation): fix required prop save. add error display for component. fix validation file repeatedly 2018-08-30 14:44:57 +03:00
Jim LAURIE
eace470998 Fix build 2018-08-29 12:14:54 +02:00
Jim LAURIE
d56d75b05b
Merge branch 'master' into fix/autoReload 2018-08-29 11:02:44 +02:00
Vladislav Arsenev
d234b20d88
Merge branch 'master' into fix/multiple-files-cancel 2018-08-28 19:02:29 +03:00
Jim LAURIE
ed2e4112b1
Merge branch 'master' into fix/validation-check-null 2018-08-27 17:32:04 +02:00
soupette
e5e2af960c Fix input toggle true false 2018-08-27 15:47:41 +02:00
Vladislav Arsenev
2887f6e7be fix: validation-check-null - add check for length property may not exist 2018-08-27 10:41:00 +03:00
Vladislav Arsenev
d266961881 fix(multiple-files-cancel): discard action if canceled select file 2018-08-24 15:05:12 +03:00
soupette
81c19fb3bc Fix conflicts 2018-08-22 14:20:03 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
soupette
0fd23f4c16 Add comments to Manager 2018-08-22 14:10:50 +02:00
soupette
38c4fd6a47 Fix first part of PR feedback 2018-08-21 14:01:15 +02:00
Jim LAURIE
62c458741d
Merge branch 'master' into patch-2 2018-08-21 09:46:09 +02:00
Aurelsicoko
4f16144ee9 Update & enhance CSS 2018-08-20 14:18:37 +02:00
Luca
e90791ef4c
Merge branch 'master' into fix/autoReload 2018-08-17 16:04:19 +02:00