Virginie Ky
|
51aedd869f
|
Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/popupwarning
|
2020-02-06 17:21:56 +01:00 |
|
cyril lopez
|
8b5cc90cd3
|
Merge pull request #5192 from strapi/front/ctm-filters-btn-ui
CTM filters btn ui
|
2020-02-06 15:02:34 +01:00 |
|
Virginie Ky
|
8eb12811aa
|
Merge branch 'front/ui-improvements' into front/popupwarning
|
2020-02-06 14:38:59 +01:00 |
|
cyril lopez
|
ce8961c72f
|
Merge pull request #5175 from strapi/front/ctm-back-button
CTM back button - Administrator panel
|
2020-02-06 14:32:56 +01:00 |
|
Virginie Ky
|
159521a8de
|
fix filters button position
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-06 14:30:09 +01:00 |
|
soupette
|
e9aa6143a3
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-06 14:28:05 +01:00 |
|
cyril lopez
|
83f40d8cd2
|
Merge pull request #5170 from strapi/chore/upgrade-styled-components
[WIP] Upgrade to styled-components v5
|
2020-02-06 14:05:39 +01:00 |
|
soupette
|
d8f0edf5b1
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-06 12:05:17 +01:00 |
|
soupette
|
7adc97b269
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-06 11:54:02 +01:00 |
|
cyril lopez
|
e5e1f921b7
|
Merge pull request #5136 from strapi/core/admin-settings-api
Core/admin settings api
|
2020-02-06 10:13:03 +01:00 |
|
Jim LAURIE
|
7b2fffdbb3
|
Merge pull request #5187 from gtsop/master
Update quick guide to reflect correct button names
|
2020-02-05 17:02:37 +01:00 |
|
Virginie Ky
|
33ce7dc7cd
|
Merge branch 'develop' into front/ui-improvements
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-05 16:05:50 +01:00 |
|
Virginie Ky
|
c1c56b4b36
|
Unit tests & snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-05 16:04:26 +01:00 |
|
Jim LAURIE
|
e97397a9eb
|
Merge branch 'master' into master
|
2020-02-05 15:56:50 +01:00 |
|
George.Tsopanoglou
|
9070549210
|
Update quick guide with correct button names
Signed-off-by: George.Tsopanoglou <george.tsopanoglou@karmarama.com>
|
2020-02-05 13:14:33 +00:00 |
|
Jim LAURIE
|
52e56ff320
|
Merge pull request #5142 from ilytrevino/master
Fixed misspelled word restaurant
|
2020-02-05 13:56:09 +01:00 |
|
Jim LAURIE
|
2cf6198b4c
|
Merge branch 'master' into master
|
2020-02-05 13:55:58 +01:00 |
|
Jim LAURIE
|
811cd73a22
|
Merge pull request #5154 from imrobinized/patch-1
Remove empty code block from beta.18 migration guide
|
2020-02-05 13:52:07 +01:00 |
|
Jim LAURIE
|
f780617f7c
|
Merge branch 'master' into patch-1
|
2020-02-05 13:51:57 +01:00 |
|
Virginie Ky
|
b2b4a3382e
|
Merge branch 'front/ui-improvements' into front/popupwarning
|
2020-02-05 10:32:15 +01:00 |
|
Virginie Ky
|
fd9fe6c6fd
|
Merge branch 'develop' into front/ui-improvements
|
2020-02-05 10:08:24 +01:00 |
|
Virginie Ky
|
3bef28a36b
|
Merge branch 'master' into develop
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-05 10:07:46 +01:00 |
|
Jim LAURIE
|
ebe76c4dea
|
Merge pull request #5173 from strapi/docs/alphaWarning
Add warning messages to Alpha docs
|
2020-02-04 19:24:05 +01:00 |
|
Virginie Ky
|
a31b63187f
|
administrator back button url
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-04 15:54:05 +01:00 |
|
Virginie Ky
|
d429e54070
|
Revert "test"
This reverts commit fea644818c2ae2fd81e5307671142b400f4557ef.
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-04 15:54:04 +01:00 |
|
Virginie Ky
|
c3ce67b418
|
Revert "back button url fix"
This reverts commit fd11d655d7e73e7796a8ebf4759c3c6658f19011.
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-04 15:54:04 +01:00 |
|
Virginie Ky
|
0bd50b47f6
|
back button url fix
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-04 15:54:03 +01:00 |
|
Virginie Ky
|
3760ed0ac0
|
test
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-04 15:54:02 +01:00 |
|
Virginie Ky
|
fb9d960a63
|
Merge branch 'front/ui-improvements' into front/popupwarning
|
2020-02-04 14:07:04 +01:00 |
|
Virginie Ky
|
232131faac
|
update snapshots waiting for jest config
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-04 09:56:50 +01:00 |
|
Derrick Mehaffy
|
1680fd0d81
|
Add warning messages to Alpha docs
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
|
2020-02-04 01:39:53 -07:00 |
|
cyril lopez
|
5a3f04a71b
|
Merge branch 'master' into master
|
2020-02-04 08:32:12 +01:00 |
|
cyril lopez
|
d16db60dad
|
Merge pull request #5169 from strapi/fix/remove-snapshots
Remove snapshots
|
2020-02-04 00:26:20 +01:00 |
|
soupette
|
24630ebd02
|
Remove snapshots
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 16:51:35 +01:00 |
|
soupette
|
6cf54385ca
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 16:43:12 +01:00 |
|
soupette
|
b6d0c5dc7b
|
Add snaps back
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 16:06:16 +01:00 |
|
soupette
|
c86e1dfb18
|
Update front-end jest config
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 16:03:36 +01:00 |
|
soupette
|
451589f875
|
Upgrade buffet.js with the next version
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 15:43:44 +01:00 |
|
soupette
|
f74082af33
|
Upgrade to styled-compo v5
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 15:36:59 +01:00 |
|
soupette
|
5e9af4c36c
|
Remove styled-compo dependency from content manager
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 15:34:44 +01:00 |
|
soupette
|
c91254b1aa
|
Remove snapshots
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 15:31:08 +01:00 |
|
soupette
|
f3c6472f4a
|
Update snap
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-02-03 11:51:23 +01:00 |
|
cyril lopez
|
89ee8df680
|
Merge branch 'develop' into core/admin-settings-api
|
2020-02-03 11:39:10 +01:00 |
|
Ky
|
8bd33e9282
|
Merge branch 'develop' into front/ui-improvements
|
2020-02-02 22:41:59 +01:00 |
|
Robin
|
72ef115ceb
|
Remove empty code block from migration guide
Signed-off-by: robin <almigod0718@gmail.com>
|
2020-02-02 15:27:53 +08:00 |
|
Virginie Ky
|
995ba8d8b3
|
popup warning snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-31 19:04:49 +01:00 |
|
cyril lopez
|
a6ca664ab8
|
Merge branch 'master' into master
|
2020-01-31 18:33:31 +01:00 |
|
Alexandre Bodin
|
349b28c291
|
Merge branch 'master' into develop
|
2020-01-31 18:21:42 +01:00 |
|
soupette
|
86a411812f
|
Update snapshots required since new component logic
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-31 17:30:42 +01:00 |
|
Virginie Ky
|
dacbff0dfa
|
Merge branch 'front/ui-improvements' into front/popupwarning
|
2020-01-31 17:17:28 +01:00 |
|