833 Commits

Author SHA1 Message Date
Jim LAURIE
c3c24ca7ad 3.0.0-alpha.19 2019-01-16 11:49:16 +01:00
Jim LAURIE
09530e9cd9 3.0.0-alpha.18 2019-01-04 11:23:15 +01:00
Jim LAURIE
fd3ae96498 3.0.0-alpha.17 2018-12-18 14:37:15 +01:00
Jim LAURIE
f87ebea759
Merge branch 'master' into plugin-documentation 2018-12-17 16:22:03 +01:00
Jim LAURIE
596d4dd791
Merge branch 'master' into add-cypress 2018-12-12 20:18:57 +01:00
soupette
43966b8416 Fix conflicts 2018-12-12 14:25:44 +01:00
soupette
a401739405 Fix lang issue 2018-12-12 11:55:17 +01:00
soupette
27df580edb Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-12-11 12:12:53 +01:00
soupette
9882078843 Move react-copy-toclipboard in helper 2018-12-06 19:02:12 +01:00
soupette
54fdbc6897 Add option to copy token in the ui 2018-12-06 19:00:49 +01:00
soupette
636cb54c29 Add snyk 2018-12-05 15:42:58 +01:00
Jim LAURIE
a75e0c5485 3.0.0-alpha.16 2018-12-04 18:31:19 +01:00
soupette
43e02ffb3d Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-12-03 11:24:03 +01:00
Jim LAURIE
c126b94325
Merge branch 'master' into fixNodeVersions 2018-11-29 11:21:55 +01:00
Jim LAURIE
fb03d4f18c 3.0.0-alpha.15 2018-11-28 14:55:41 +01:00
DMehaffy
ecb6baaea5 Update all the packages and generated json 2018-11-28 00:14:12 -07:00
soupette
d60b5c5b34 Fix conflicts 2018-11-27 20:22:41 +01:00
soupette
0aa7796a82 Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-27 12:27:18 +01:00
soupette
547563f56f Lock babel dependencies version until I found the dependency to update 2018-11-26 18:18: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
d9ee893c8f Merge branch 'master' of github.com:strapi/strapi into add-cypress 2018-11-14 18:20:40 +01:00
soupette
779f575b47 Access reducer from cypress 2018-11-13 16:53:50 +01:00
Jim LAURIE
8fcf2ed8ae 3.0.0-alpha.14.5 2018-11-13 14:50:07 +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
01a2442e7d 3.0.0-alpha.14.4.0 2018-10-25 17:18:26 +02:00
Jim LAURIE
379331f822 3.0.0-alpha.14.4 2018-10-25 16:41:07 +02: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
Jim LAURIE
87c3af3d1e 3.0.0-alpha.14.3 2018-10-08 17:14:19 +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
12a1a28b94 Update babel-plugin-transform-proptypes 2018-10-04 12:02:24 +02: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
a4d511a124 Update front-end dependencies
Move to react, redux, immutable @latest.
Note: prepare for upgrading webpack.
2018-09-27 15:19:09 +02:00
cyril lopez
3dca9151d2 Remove gitbook-cli 2018-09-27 13:59:11 +02:00
cyril lopez
9156865f6a Remove useless dependencies in strapi helper plugin 2018-09-26 18:24:42 +02:00
Jim LAURIE
46c9b0f966 3.0.0-alpha.14.2 2018-09-26 11:08:10 +02:00
cyril lopez
989b867714 Split admin entry point between dev and prod 2018-09-25 15:01:06 +02:00