yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-04 19:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,246 Commits 145 Branches 512 Tags
Commit Graph

1747 Commits

Author SHA1 Message Date
Convly
2a483ba958 Cleanup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 10:09:08 +01:00
Convly
857a78e252 Add all missing e2e tests (draft) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:22 +01:00
HichamELBSI
47d641d8c0 Fix UI review on SSO 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-07 17:37:12 +01:00
HichamELBSI
0f33931d28 Update buffetjs 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-04 14:47:54 +01:00
HichamELBSI
3810f7c71d Update BuffetJS 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
HichamELBSI
a09985706d Add auth providers list and page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:28 +01:00
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
soupette
43d476660a Upgrade buffet.js 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-21 10:50:49 +01:00
cyril lopez
5f7992f7b3
Merge branch 'master' into fix/inputs-display 2020-12-21 09:38:00 +01:00
soupette
97e33908a0 Fix input uid 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-12-18 16:44:24 +01:00
DMehaffy
aad1c2fa03
Cleaning up codebase for doc repo move (#8892) 
* [WIP] Cleaning up codebase for doc repo move

WIP

* Fix deleted files, add links to doc repo issues

* Add repo note to readme
 2020-12-18 15:50:37 +01:00
Alexandre Bodin
ea636b4d31 v3.4.0 2020-12-17 13:18:50 +01:00
HichamELBSI
53231b5833 Merge branch 'master' into feature/relational-fields 2020-12-16 10:17:47 +01:00
Pierre Burgy
30ed3985c6
Replace John Doe by Kai Doe (#8738) 
Signed-off-by: Pierre Burgy <pierre.burgy@gmail.com>
 2020-12-14 16:57:18 +01:00
EdgyCoder ✌
18cb87a93f
Small changes to 'cognito' case! (#8549) 
Removed comment on Cognito and removed unnecessary variable
 2020-12-14 12:22:20 +01:00
Charles Johannisen
05de9e26b9
adjust condition for subdomain when it is an empty string (#8358) 
Signed-off-by: Charles Johannisen <cjohannisen@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-12-14 12:15:45 +01:00
HichamELBSI
f09e4e0b56 Add buffet LoadingIndicator 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-11 14:27:03 +01:00
dependabot[bot]
eab3592329
Bump grant-koa from 5.2.0 to 5.4.8 (#8857) 
Bumps [grant-koa](https://github.com/simov/grant) from 5.2.0 to 5.4.8.
- [Release notes](https://github.com/simov/grant/releases)
- [Changelog](https://github.com/simov/grant/blob/master/CHANGELOG.md)
- [Commits](https://github.com/simov/grant/compare/v5.2.0...v5.4.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-10 09:44:59 +01:00
dependabot[bot]
8dfba3bb89
Bump @purest/providers from 1.0.1 to 1.0.2 (#8817) 
Bumps [@purest/providers](https://github.com/simov/purest-providers) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/simov/purest-providers/releases)
- [Commits](https://github.com/simov/purest-providers/commits/v1.0.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-07 09:36:31 +01:00
cyril lopez
3c9686f986
Merge pull request #8727 from strapi/relational-fields/display-in-list 
Display relational fields in the list view
 2020-11-26 09:46:38 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 2020-11-25 16:22:45 +01:00
HichamELBSI
91d772186b Display relational field in the list view 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-23 22:49:40 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +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
Alexandre Bodin
7d8d710cc9 Return rejection in user service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-03 17:38:34 +01:00
Alexandre Bodin
08a603623b Cleanup tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:46 +01:00
Alexandre Bodin
07e7cfc0bd Make lint stricter and fix the errors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-02 19:41:42 +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
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
Alexandre Bodin
bf18c2bfbf Apply feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-16 17:48:03 +02:00
Alexandre Bodin
529d147726 Add confirmationToken to user for email confirmation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-16 17:36:45 +02:00
jecapi
9b62d98b45
Update sv.json (#8355) 
Added swedish translation
 2020-10-16 14:28:51 +02:00
soupette
10a39592f9 Merge branch 'master' of github.com:strapi/strapi into features/application-settings 2020-10-15 15:02:29 +02:00
Mattias van den Belt
5a1026322e
Merge branch 'master' into fix/8262 2020-10-15 12:46:53 +02:00
Mattias van den Belt
213d4922df
Merge branch 'master' into fix/8262 2020-10-15 08:21:35 +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
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
Mattias van den Belt
e0913c3214
Merge branch 'master' into fix/8262 2020-10-13 17:17:30 +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
0abd23eaab
Added new translations into Russian (#8312) 
Signed-off-by: Bochkarev Ivan <ivanx86@gmail.com>
 2020-10-13 15:14:58 +02:00
HichamELBSI
634a555ada Clean code 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-12 11:50:01 +02:00