yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,750 Commits 129 Branches 498 Tags
Commit Graph

14750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ELABBASSI Hicham
e26b45e6be
Merge pull request #8336 from strapi/front/application-settings 
Add application details page
 2020-10-15 17:32:40 +02:00
soupette
edc9aacf4b Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-15 16:52:05 +02:00
soupette
c5f9cb96fa Merge branch 'features/application-settings' of github.com:strapi/strapi into front/application-settings 2020-10-15 15:27:00 +02:00
soupette
10a39592f9 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-15 15:02:29 +02:00
cyril lopez
a54e89ef9c
Merge pull request #8272 from MattieBelt/fix/8262 
Fix links action on role list page
 2020-10-15 14:34:10 +02:00
cyril lopez
69876b9086
Merge branch 'master' into fix/8262 2020-10-15 14:17:25 +02:00
Alexandre BODIN
e53b54c218
Support query operators _or & _where in graphql with deep nesting (#8332) 
* SUpport query operators _or _where in graphql with deep nesting

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add testing for complexe graphql queries

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 13:22:40 +02:00
Mattias van den Belt
5a1026322e
Merge branch 'master' into fix/8262 2020-10-15 12:46:53 +02:00
Alexandre BODIN
435b294439
Merge pull request #8226 from strapi/chore/node-14 
Support node v14 + CI refactor
 2020-10-15 12:40:32 +02:00
Alexandre Bodin
d450937f58 Fix code factor 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 10:19:12 +02:00
Mattias van den Belt
213d4922df
Merge branch 'master' into fix/8262 2020-10-15 08:21:35 +02:00
Alexandre Bodin
4bcce63afb Use local actions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 19:26:25 +02:00
soupette
3d4a684076 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-14 17:20:33 +02:00
soupette
3ae6291467 Add notification in left menu 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-14 17:12:51 +02:00
soupette
069f1d9700 Merge branch 'features/application-settings' of github.com:strapi/strapi into front/application-settings 2020-10-14 15:56:40 +02:00
cyril lopez
a9b9805920
Merge pull request #8250 from strapi/core/new-notif-api 
New notification API + Update notif
 2020-10-14 15:46:23 +02:00
HichamELBSI
0c31b80262 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-14 15:18:25 +02:00
Alexandre BODIN
8b212d1e87
Merge pull request #8311 from strapi/cli/reset-admin-pwd 
Reset admin password CLI
 2020-10-14 14:53:10 +02:00
soupette
1e065ffe0e Merge branch 'features/application-settings' of github.com:strapi/strapi into front/application-settings 2020-10-14 14:49:07 +02:00
HichamELBSI
46cb089496 Merge branch 'features/application-settings' into core/new-notif-api 2020-10-14 14:40:00 +02:00
soupette
f321960995 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-14 14:09:52 +02:00
Alexandre Bodin
f132bc1886 scope env vars 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:16 +02:00
Alexandre Bodin
ab3489fba6 Add global codecov to ci 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:15 +02:00
Alexandre Bodin
36b80f26d9 add codecov 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:15 +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
Alexandre Bodin
8af60259cd Add CLI documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:03 +02:00
Alexandre Bodin
fa43dd8add Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
b8d206ede7 Cleanup some useless option config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
c81af9a1d0 Init admin reset 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:14:02 +02:00
Alexandre Bodin
5cc40a350f Merge branch 'master' of github.com:strapi/strapi 2020-10-14 13:13:49 +02:00
Alexandre Bodin
ea7a26d365 Add doc team as code owner instead of individuals 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-14 13:12:50 +02:00
hhh
ed71cc2d8a
Fix file info of new uploaded file not being persisted after edit (#8244) 
* Fix file info of new uploaded file not being persisted after edit

Signed-off-by: henrych4 <singyinhenry@gmail.com>

* Fix typo and add test

Signed-off-by: henrych4 <singyinhenry@gmail.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-10-14 13:04:08 +02:00
Thomas Pockrandt
10443df9e2
Update admin panel screenshot (#8265) 
* Update admin panel screenshot

Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>

* Update image

Signed-off-by: Thomas Pockrandt <me@thomaspockrandt.com>
 2020-10-14 11:20:25 +02:00
Jean-Sébastien Herbaux
9871562359
Fix wrong permissions assigns (upload, users-permissions) (#8320) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-13 18:51:09 +02:00
Jonas De Kegel
ecb377727a
Don't use mongoose 5.10.7 (#8278) 
resolved strapi/strapi#8066

Signed-off-by: Jonas De Kegel <jonas@fluid.desi>
 2020-10-13 18:14:48 +02:00
Mattias van den Belt
e0913c3214
Merge branch 'master' into fix/8262 2020-10-13 17:17:30 +02:00
Maxime Castres
96e836a663
Add Academy link to the 'Join the community' card in the homepage (#8316) 
* Add Academy link to the 'Join the community' card in the homepage

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* Remove academy image

Signed-off-by: Maxime Castres <mcastres@student.42.fr>
 2020-10-13 16:20:33 +02:00
Yanuar Aditia
24ae46727c
Add indonesian lang for strapi-admin & strapi-plugin-users-permission (#8309) 2020-10-13 15:45:19 +02:00
Bochkarev Ivan
6d586e48b4 Update russian translate strapi-plugin-content-type-builder 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:15:27 +02:00
Bochkarev Ivan
0abd23eaab
Added new translations into Russian (#8312) 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:14:58 +02:00
yvesdo
94154d31df
Update Platform.sh button image URL (#8300) 
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-12 19:29:38 +02:00
yvesdo
6b391844bf
Update Deploy Button URL (#8299) 2020-10-12 19:28:32 +02:00
Sam Williams
96a33ed942
Fix validations for custom field types (#8297) 
Signed-off-by: Sam Williams <spwilliams91@icloud.com>
 2020-10-12 18:59:06 +02:00
cyril lopez
00f92eba56
Merge branch 'master' into fix/8262 2020-10-12 11:52:08 +02:00
HichamELBSI
634a555ada Clean code 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-12 11:50:01 +02:00
Alexandre Bodin
ba9711d134 Add code owners 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-12 11:48:34 +02:00
cyril lopez
7d0236cf8b
Merge branch 'master' into fix/8262 2020-10-12 11:43:15 +02:00
cyril lopez
a28cb0d496
Merge pull request #8290 from Ibochkarev/strapi-admin-ru 
Update Russian translate strapi-admin
 2020-10-12 11:42:58 +02:00
cyril lopez
abc34d295a
Merge branch 'master' into strapi-admin-ru 2020-10-12 11:42:45 +02:00
cyril lopez
00e06a4a9b
Merge pull request #8277 from Ibochkarev/russian-translate 
Update Russian translate strapi-plugin-content-manager
 2020-10-12 11:41:58 +02:00