yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,115 Commits 122 Branches 507 Tags
Commit Graph

245 Commits

Author SHA1 Message Date
soupette
b7f521603e Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-09-07 13:55:15 +02:00
soupette
f22d20e61b Fix conflicts 
Signed-off-by: soupette <cyril@strapi.io>
 2021-08-24 16:13:02 +02:00
Alexandre Bodin
575cbbdc7c Migrate plugin getters 2021-08-19 23:30:49 +02:00
Pierre Noël
63cc0832f2 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-13 15:43:04 +02:00
Alexandre Bodin
c122056f2c Fix search test and entity manager count query 2021-08-11 11:12:58 +02:00
Pierre Noël
260e2055c4 Merge branch 'v4/backend' into pluginAPI/loadPlugin 2021-08-11 10:07:03 +02:00
Pierre Noël
9e75d59e15 Fix some E2E tests 2021-08-11 10:05:20 +02:00
Alexandre Bodin
d3a1d6fc98 Fix tests and cleanups 2021-08-11 09:34:55 +02:00
Alexandre Bodin
f41cad3094 Fix test helper for app genereation 2021-08-10 19:06:33 +02:00
HichamELBSI
c79afa3f44 Fix design feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-08-10 17:41:51 +02:00
Alexandre Bodin
5b5434c001 Fix CI and some tests 2021-08-06 18:46:30 +02:00
Alexandre Bodin
189c819a1e Drop foreign keys before dropping tables 2021-08-06 11:19:17 +02:00
Alexandre Bodin
89fee54582 Merge branch 'v4/backend' into v4/database 2021-07-30 09:50:40 +02:00
Alexandre Bodin
81dd94c6ec Refactor all query() calls 2021-07-08 18:15:32 +02:00
Alexandre Bodin
09f7269b4a Implement compos in the entity service 2021-07-06 14:18:03 +02:00
Alexandre Bodin
e973804399 Filters working 2021-07-05 18:35:16 +02:00
soupette
e04ccb417e Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-05 11:20:21 +02:00
Alexandre Bodin
3711ca3072 wip 2021-07-02 02:26:14 +02:00
soupette
46ae14f532 Enable plan switch at runtime 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-07-01 15:50:11 +02:00
Alexandre Bodin
2d59716f5d Cleanup CTB 2021-06-30 22:52:12 +02:00
Alexandre Bodin
b4ecb48c44 Remove mongoose connector 2021-06-29 16:27:35 +02:00
Alexandre Bodin
5e46f2999e Remove connection 2021-06-24 09:09:29 +02:00
soupette
c1cb6d1d0d Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-06-23 20:18:13 +02:00
soupette
726ac4a2db Remove emitEvent from useGlobalContext and use useTracking instead 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-28 09:28:16 +02:00
soupette
acac7b1e69 Fix test setup 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-06 09:14:31 +02:00
soupette
ca23676992 Init webpack 5 migration 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-05-03 08:42:27 +02:00
Alexandre Bodin
ab3760bb66 Rename import & requires, fix tests 2021-04-29 13:51:12 +02:00
Alexandre Bodin
e45f6df0b9 Move plugins & cleanup configs 2021-04-29 11:11:46 +02:00
Alexandre Bodin
08526388ae Merge branch 'master' into features/i18n 2021-04-20 19:26:22 +02:00
innerdvations
e4d4ad1970
improve english text (#9858) 2021-04-20 15:01:18 +02:00
Jean-Sébastien Herbaux
93752c37ca
Chore/tests cleanup (#9857) 
* Use new jest runner

* Set loglevel to fatal

* Update snapshots

* Remove update option from cli

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2021-03-29 12:33:08 +02:00
Convly
4c21bea64b Use a global timeout instead of redefining it everytime 2021-03-26 20:15:38 +01:00
Convly
57ad9bc663 Set default jest timeout to 60s for every suite 2021-03-26 16:36:09 +01:00
Alexandre Bodin
c57b3be1eb Merge branch 'master' into features/i18n 2021-03-12 09:45:51 +01:00
mfrachet
f72f8ec2b9 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-16 09:42:42 +01:00
Pierre Noël
22d38b5ffc handle toggle i18n on CT and fields 2021-02-12 16:17:33 +01:00
Pierre Noël
b3a9b5ad76 add pluginOptions 2021-02-10 14:29:54 +01:00
mfrachet
2755a10885 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-05 08:16:07 +01:00
cyril lopez
0392758cc2
Merge pull request #9291 from strapi/features/i18n-front-delete-popup 
Features/i18n front delete popup
 2021-02-02 13:54:04 +01:00
mfrachet
ecb1b9facb Add delete modal and tests for that 2021-02-02 13:50:16 +01:00
mfrachet
1f2f4c2986 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-02 13:38:48 +01:00
Pierre Noël
24e1d979a7 update tests 2021-02-02 11:30:24 +01:00
mfrachet
d1b89fd391 [ContentManager] Improving Drag&Drop experience 2021-01-29 11:58:47 +01:00
Pierre Noël
291aeb07bc add read/create/update route for locales 2021-01-29 10:12:34 +01:00
Alexandre Bodin
fd6771315d add i18n plugin to testApp 2021-01-28 11:31:10 +01:00
Kim, Harim
ac3d10006c
Add session option to Strapi query for Mongo Multi-Document transaction (#6447) 
* add session option to mongo queries for transaction

Signed-off-by: harimkims <harimkims@gmail.com>

* seperate session parameter in buildQuery functions

Signed-off-by: harimkims <harimkims@gmail.com>

* clarify comment about mongoose create requirement

Signed-off-by: harimkims <harimkims@gmail.com>

Co-authored-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-13 10:37:23 +01:00
Convly
45c0152820 Fix tests, update snapshots 2021-01-12 17:25:48 +01:00
Convly
5228236246 Merge branch 'master' into features/sso 2021-01-12 11:36:11 +01:00
Convly
28b5ed87f2 Remove node/no-extraneous comment 2021-01-08 10:09:11 +01:00
Convly
b9edf6ba56 Take pr review into account 2021-01-08 10:09:10 +01:00