yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 03:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,903 Commits 116 Branches 488 Tags
Commit Graph

2471 Commits

Author SHA1 Message Date
Moritz Eck
c38e1c4da8
Merge branch 'master' into feature/german-translations-update 2020-11-18 17:35:06 +01:00
Boudringhin Julien
553a188bd6
Merge branch 'master' into feature/dynamiczone-categories 2020-11-18 17:07:55 +01:00
akhilmhdh
c1b7ab3231 fixed click event on non-repeatable empty component 
Signed-off-by: akhilmhdh <akhilmhdh@gmail.com>
 2020-11-18 13:12:34 +05:30
Moritz Eck
c7c14dccf0
Merge branch 'master' into feature/german-translations-update 2020-11-16 16:54:38 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Boudringhin Julien
e168f257c5
Merge branch 'master' into feature/dynamiczone-categories 2020-11-16 14:21:40 +01:00
jbo@lachose.fr
636877c7d0
Remove comment on DynamicZone 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:48 +01:00
jbo@lachose.fr
c4a36471cc
Create ComponentsList 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:32 +01:00
jbo@lachose.fr
6887cc28e9
CategoryItem remove background color 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:15:06 +01:00
jbo@lachose.fr
e1e4915947
CategoryItem : create handleExited function 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:14:43 +01:00
jbo@lachose.fr
47bf5712b2
BannerWrapper include updates from @HichamELBSI 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:14:24 +01:00
jbo@lachose.fr
a69cc8b818
update logic of collapses 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:13:59 +01:00
jbo@lachose.fr
89613f34a9
ComponentsPicker Add categoriesList padding-bottom 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:13:29 +01:00
jbo@lachose.fr
d6915d3e57
Update componentPickerTitle margin-bottom to 10px 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-16 12:12:42 +01:00
Moritz Eck
b368bb41ed add & improve german translations 
Signed-off-by: Moritz Eck <moritz.eck@gmail.com>
 2020-11-11 19:21:55 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00
Alexandre Bodin
98bb6a3d31 v3.3.1 2020-11-09 19:22:52 +01:00
Pierre Noël
ec1c2a22c3 v3.3.0 2020-11-09 17:55:10 +01:00
Boudringhin Julien
e1b9fd559d
Opened selector if single category 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-03 14:53:41 +01:00
Boudringhin Julien
25a0a65279
Adding Categories selector for Dynamic zone 
Signed-off-by: Julien Boudringhin <julien.boudringhin@gmail.com>
 2020-11-03 14:53:40 +01:00
cyril lopez
fd3e54b821
Merge branch 'master' into features/application-settings 2020-11-02 16:14:44 +01:00
Eneko Rodríguez
3cba913a2f feat: improve spanish translations 
Signed-off-by: Eneko Rodríguez <eneko.rodriguez99@gmail.com>
 2020-10-31 20:19:41 +01:00
soupette
30cb4f4226 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-27 17:28:39 +01:00
Alexandre Bodin
c78591553f v3.2.5 2020-10-22 17:40:58 +02:00
soupette
aedac98725 Fix XSS wysiwyg preview 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-22 16:14:27 +02:00
soupette
3de1a1fe98 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-21 14:56:00 +02:00
Alexandre Bodin
e8153d99c0 v3.2.4 2020-10-16 18:22:15 +02:00
soupette
10a39592f9 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-15 15:02:29 +02:00
HichamELBSI
0c31b80262 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-14 15:18:25 +02:00
HichamELBSI
46cb089496 Merge branch 'features/application-settings' into core/new-notif-api 2020-10-14 14:40:00 +02:00
Alexandre Bodin
71a2657ed8 test node v14 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:14 +02:00
HichamELBSI
634a555ada Clean code 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-12 11:50:01 +02:00
cyril lopez
ca94042724
Merge branch 'master' into russian-translate 2020-10-12 11:41:36 +02:00
cyril lopez
0785ae7587
Merge branch 'master' into drafts_translations_sk 2020-10-12 11:40:56 +02:00
cyril lopez
3173904561
Merge branch 'master' into 5416-fix-uid-input-field 2020-10-12 11:14:01 +02:00
Ibochkarev
8e32edfc5a Update russian translate strapi-plugin-content-manager 
Signed-off-by: Ibochkarev <ivanx86@gmail.com>
 2020-10-11 14:26:03 +06:00
Sebastian Trebunak
b15d5c8af4 Add Draft/Publish translations in Slovak language 
Signed-off-by: Sebastian Trebunak <trebunak.sebastian@gmail.com>
 2020-10-10 10:19:36 +02:00
Alexandre Bodin
7485de2fdf v3.2.3 2020-10-09 17:12:50 +02:00
Convly
b3d0b72198 v3.2.2 2020-10-09 11:52:09 +02:00
Jean-Sébastien Herbaux
38126d9a32
Fix "has same role as author" condition not working properly (#8202) 
* Fix "has same role as author" condition not working properly

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Use creators constants

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add e2e test for default conditions, fix conditions on mongoose

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix tests in CE

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-08 19:50:39 +02:00
HichamELBSI
a804b8c087 New notification API + Update notif 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-08 17:22:38 +02:00
cyril lopez
62129e9b4f
Merge branch 'master' into front/events 2020-10-07 16:56:56 +02:00
Alexandre Bodin
5a77b560e3 v3.2.1 2020-10-07 14:50:47 +02:00
cyril lopez
f3a64f2fcf
Fix util when no data (#8224) 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-07 14:49:35 +02:00
Stanko Tadić
848d554c79
fixes #8221 - fixed publish failing if non-repeateable component data is "null" (#8222) 
Signed-off-by: Stanko <stanko.tadic@gmail.com>
 2020-10-07 14:20:18 +02:00
Alexandre Bodin
95f3502ab4 v3.2.0 2020-10-06 11:01:02 +02:00
Alexandre Bodin
af8a96c18b Fix search tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 18:07:50 +02:00
Alexandre Bodin
cd6894e573 Fix tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 16:00:58 +02:00
Alexandre Bodin
c98089ff65 Merge branch 'master' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 12:00:03 +02:00
ELABBASSI Hicham
8c52046e4b
Merge pull request #8130 from strapi/dp/front-events 
Add events regarding the D&P feature
 2020-10-05 09:38:30 +02:00