Jim LAURIE
|
638ddd201e
|
Merge branch 'master' into update-zh-hans-translations
|
2020-02-07 09:56:09 +01:00 |
|
Jim LAURIE
|
37d29530fd
|
Merge pull request #5063 from wysher/feat/update-pl-translations
Updated PL translations
|
2020-02-07 09:54:47 +01:00 |
|
Jim LAURIE
|
6eaf63007b
|
Merge branch 'master' into feat/update-pl-translations
|
2020-02-07 09:54:36 +01:00 |
|
Ryan Wang
|
eba60f0230
|
Merge branch 'master' into update-zh-hans-translations
|
2020-02-07 14:37:54 +08:00 |
|
Jim LAURIE
|
a91b268447
|
Merge pull request #5181 from strapi/docs-plugin-queries
Remove queries section in local plugin docs
|
2020-02-06 22:23:00 +01:00 |
|
Jim LAURIE
|
d256126cd9
|
Merge branch 'master' into docs-plugin-queries
|
2020-02-06 22:22:40 +01:00 |
|
Gambhiro
|
1c466cd056
|
typos and clean up
|
2020-02-06 21:04:39 +00:00 |
|
Fredrik Söderquist
|
52e6d33f0e
|
Match provider when logging in, to make sure the right user is found
Signed-off-by: Fredrik Söderquist <fregu808@gmail.com>
|
2020-02-06 21:14:36 +01:00 |
|
cyril lopez
|
3e98f25376
|
Merge pull request #5114 from strapi/front/popupwarning
Popup Warning UI
|
2020-02-06 18:20:19 +01:00 |
|
cyril lopez
|
0296b56e10
|
Merge branch 'master' into update-zh-hans-translations
|
2020-02-06 18:19:50 +01:00 |
|
Virginie Ky
|
59e54fee2d
|
update snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-02-06 18:19:25 +01:00 |
|
cyril lopez
|
8fabde104d
|
Merge pull request #5140 from strapi/fix/select-relations
Fix select relations
|
2020-02-06 17:57:15 +01:00 |
|
Virginie Ky
|
51aedd869f
|
Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/popupwarning
|
2020-02-06 17:21:56 +01:00 |
|
HichamELBSI
|
bd284f0637
|
Fix list max height
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-02-06 16:00:49 +01:00 |
|
HichamELBSI
|
fe46e9ac10
|
Add restriction to relation attribute
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-02-06 15:31:46 +01:00 |
|
cyril lopez
|
7466d64ed8
|
Merge pull request #5179 from strapi/single-types/ctb-edit
Edit single type options
|
2020-02-06 15:25:32 +01:00 |
|
cyril lopez
|
3a8e79817f
|
Merge branch 'develop' into fix/select-relations
|
2020-02-06 15:16:31 +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 |
|
cyril lopez
|
8745d2373a
|
Merge branch 'master' into feat/update-pl-translations
|
2020-02-06 14:39:05 +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 |
|
HichamELBSI
|
d2dc5735e4
|
Update after requested changes
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-02-06 14:19:06 +01:00 |
|
HichamELBSI
|
abbb045277
|
Edit single type options
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
|
2020-02-06 14:13:48 +01:00 |
|
HichamELBSI
|
6fff7fcf46
|
Merge branch 'develop' into features/single-types
|
2020-02-06 14:11:44 +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 |
|
HichamELBSI
|
98871fcb46
|
Merge branch 'develop' into features/single-types
|
2020-02-05 16:41:30 +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 |
|
Jim LAURIE
|
13078d851b
|
docs: remove queries section
Since this section is no more interesting I remove it.
Related to close #5106
Signed-off-by: lauriejim <j.laurie6993@gmail.com>
|
2020-02-04 17:22:59 +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 |
|