Commit Graph

339 Commits (2da8784865588cde31f185bfeffb98a199633254)

Author SHA1 Message Date
Syed Ali Shahbaz f1c98181d2 tfunction added 2022-06-10 13:30:43 +05:30
Syed Ali Shahbaz ef5bbfe4f9 fixed timeZone key 2022-06-10 13:22:06 +05:30
Syed Ali Shahbaz a8ad052a03 --convert date to string in calendar event 2022-06-10 13:16:58 +05:30
Syed Ali Shahbaz cd3a80006c --fix 2022-06-10 13:10:16 +05:30
Syed Ali Shahbaz adab79040f --fix 2022-06-10 13:06:22 +05:30
Syed Ali Shahbaz 4431142d4e remove unnecessary return 2022-06-10 12:58:04 +05:30
Syed Ali Shahbaz f9c20bc8ce --fix null estimated value 2022-06-10 12:53:59 +05:30
Syed Ali Shahbaz 4f36681006 --fix 2022-06-10 12:51:24 +05:30
Syed Ali Shahbaz e3822c50d0
Update booking file with webhook payload 2022-06-10 12:43:41 +05:30
Syed Ali Shahbaz 542beb0079
adjust booking file 2022-06-10 11:46:51 +05:30
Syed Ali Shahbaz d569296654
Add webhook trigger --init 2022-06-09 17:09:20 +05:30
Agusti Fernandez Pardo 180e925bed feat: dynamic prisma almost working 2022-06-08 18:52:25 +02:00
Syed Ali Shahbaz db6f5cad15
401 message fix 2022-06-08 13:28:22 +05:30
Syed Ali Shahbaz 9b1dffbdb9
401 return fix 2022-06-08 13:27:48 +05:30
Syed Ali Shahbaz b881312f10
hotfix ctx removal 2022-06-08 13:20:44 +05:30
Syed Ali Shahbaz ef3838b476
hotfix ctx removal 2022-06-08 13:20:09 +05:30
Syed Ali Shahbaz bae84f2ce4
Added team event check to POST 2022-06-08 13:12:05 +05:30
Syed Ali Shahbaz cd03f5a821
Adds team event type check 2022-06-08 13:06:28 +05:30
Agusti Fernandez Pardo e407a16766 feat: dynamic prisma 2022-06-06 18:17:10 +02:00
Agusti Fernandez Pardo 0eed3e51e4 fix: only check event type ownership if not admin 2022-06-04 02:26:16 +02:00
Agusti Fernandez Pardo 0fc374c810 feat: add admin endpoint support for event-types id 2022-06-04 01:32:05 +02:00
Agusti Fernandez Pardo 12b7b3ecbf fix: add event-types admin endpoints 2022-06-04 01:17:01 +02:00
Agusti Fernandez Pardo 1180f3f258
Merge pull request #105 from calcom/feat/uuid-hooks
feat: adds automatic generation of uuid id for webhooks create on API
2022-06-02 15:56:01 +02:00
Agusti Fernandez Pardo 43b94d3e96 feat: adds automatic generation of uuid id for webhooks create on API 2022-06-01 17:05:33 +02:00
Agusti Fernandez Pardo 767f170cae
Merge pull request #103 from calcom/feat/admin-users
feat: Admin API users manegement endpoints
2022-05-31 21:00:51 +02:00
Agusti Fernandez Pardo 187d5f2b10 docs: add some comments 2022-05-31 18:53:41 +02:00
Agusti Fernandez Pardo 9459b9048d feat: Admin API users manegement endpoints 2022-05-31 18:33:01 +02:00
Agusti Fernandez Pardo 9c3f85834f fix: remove console logs 2022-05-28 01:51:25 +02:00
Agusti Fernandez Pardo 0b66e964fe fix: some logggingeventtypeid 2022-05-27 21:51:40 +02:00
Agusti Fernandez Pardo eee5fd0090
Merge pull request #101 from calcom/fix-event-types-id
fix: event types id endpoints
2022-05-27 21:45:17 +02:00
Agusti Fernandez Pardo be4ca8835e fix: event types id endpoints 2022-05-27 21:44:45 +02:00
Agusti Fernandez Pardo 458f37f5e9
Merge branch 'main' into production 2022-05-27 21:19:43 +02:00
Agusti Fernandez Pardo 8627b28a8e fix: conflicts 2022-05-27 21:18:47 +02:00
Agusti Fernandez Pardo b52832f333 fix 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo f40e799769 fix event types 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo 5b65bd1b66 fix 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo 824d01f358 fix: move log of userId 2022-05-27 21:01:15 +02:00
Agusti Fernandez Pardo a91dd428c0 fix 2022-05-27 21:01:01 +02:00
Agusti Fernandez Pardo 9f50972570 fix event-types 2022-05-27 20:49:50 +02:00
Agusti Fernandez Pardo d09fa56f63 fix 2022-05-27 20:47:02 +02:00
Agusti Fernandez Pardo 46e0b8f4f5 fix: moves event-types to find user including it's event-types 2022-05-27 20:46:53 +02:00
Syed Ali Shahbaz a945d5a61c Enabled webhook create call 2022-05-27 20:46:22 +02:00
Agusti Fernandez Pardo 8f9a970fb6 fix: moves event-types to find user including it's event-types 2022-05-27 20:43:10 +02:00
Syed Ali Shahbaz 0e95a1d3e8
Enabled webhook create call 2022-05-25 14:13:52 +05:30
Agusti Fernandez Pardo 6099bfb4ee fix: more logging 2022-05-23 23:23:53 +02:00
Agusti Fernandez Pardo 4629c5d5c7 fix: move log of userId 2022-05-23 23:18:41 +02:00
Agusti Fernandez Pardo beca5152e9 hotfix: debugging event-types in prod 2022-05-23 22:55:53 +02:00
Agusti Fernandez Pardo 93d9c4f6d0 fix: disable post 2022-05-20 22:15:25 +02:00
Agusti Fernandez Pardo 1585b2d8f9 fix: dont use schemareadpublic 2022-05-20 22:10:13 +02:00
Agusti Fernandez Pardo 1f8c895900 fix: hooks 2022-05-20 21:52:41 +02:00
Agusti Fernandez Pardo f1175a06f6 fix: hooks dont parse before read 2022-05-20 21:27:11 +02:00
Agusti Fernandez Pardo 8c8235c3c7 fix: dont parse hooks before read 2022-05-20 21:21:11 +02:00
Agusti Fernandez Pardo 418a4271d9 fix: adds console log to debug event-types 2022-05-20 03:46:01 +02:00
Agusti Fernandez Pardo 1717f14e83 fix: event type validations skip 2022-05-20 03:40:14 +02:00
Agusti Fernandez Pardo 9132bb51eb fix: disable create user post no role admin yet 2022-05-20 03:10:28 +02:00
Agusti Fernandez Pardo dc967b7d9e fix: hooks, event-types and booking references 2022-05-20 01:45:54 +02:00
Agusti Fernandez Pardo f2ce2f324b fix: build webhooks and event-types 2022-05-20 00:58:42 +02:00
Agusti Fernandez Pardo b237d71b2b fix: event type jsonschema or znull 2022-05-18 17:46:22 +02:00
Agusti Fernandez Pardo 0ca9748674 fix: dont throw err on bad query 2022-05-18 14:27:30 +02:00
Agusti Fernandez Pardo 075808ce40 fix event types 2022-05-18 13:55:05 +02:00
Agusti Fernandez Pardo 47ce92714b fix rewrite metadata 2022-05-17 22:49:12 +02:00
Agusti Fernandez Pardo f8554031ae fix: pass data directly 2022-05-17 22:41:54 +02:00
Agusti Fernandez Pardo f2ea38b440 fix: parse metadata 2022-05-17 22:37:43 +02:00
Agusti Fernandez Pardo fa157961be fix: dont parse on read event-type 2022-05-17 22:32:49 +02:00
Agusti Fernandez Pardo 5aa0b37443 fix build and pass lint 2022-05-17 19:33:18 +02:00
Agusti Fernandez Pardo 9afbb3d127 fix: event-type validations move to pick not omit and separate create/edit 2022-05-16 21:59:22 +02:00
Agusti Fernandez Pardo 72444792bc fix: disable admin only post endpoint for users as makes build fail until impersonate PR merged into web main/prod 2022-05-11 16:01:35 +02:00
Agusti Fernandez Pardo 7deb5f8e1f fix: webhooks upgraded to new version, need to update templates 2022-05-11 15:57:00 +02:00
Agusti Fernandez Pardo 982c32e92c
Merge pull request #67 from calcom/feat/add-webhook
added webhook endpoint
2022-05-10 21:10:18 +02:00
Agusti Fernandez Pardo 4c131fbcdd feat: adds auth/signup for ee customers 2022-05-10 19:52:59 +02:00
Syed Ali Shahbaz 17d8551442 added webhook endpoint 2022-05-10 13:26:38 +05:30
Agusti Fernandez Pardo 08eeb36d47 feat: add operationId for autogenerated sdk 2022-05-05 18:18:00 +02:00
Agusti Fernandez Pardo 1f2b59c18d feat: adds users post endpoint for admin only 2022-05-05 05:02:59 +02:00
Hariom Balhara 1703976a4f Fix docs request 2022-05-02 11:30:08 +05:30
Agusti Fernandez Pardo b572e4b0ff fix: move all req to deconstructed 2022-04-30 20:53:19 +02:00
Agusti Fernandez Pardo e27600b8c7 remove comment 2022-04-30 19:47:26 +02:00
Agusti Fernandez Pardo 005d0f8040 fix: channels removed 2022-04-30 19:46:04 +02:00
Agusti Fernandez Pardo 57aeb19c66 fix: pass enableCors true to swaggeruireact props doesn't seem to work 2022-04-29 19:45:33 +02:00
Agusti Fernandez Pardo c8d776aeb7 fix: remove extra comments 2022-04-29 17:36:25 +02:00
Agusti Fernandez Pardo 9bb0f82075 fix: improve comments, no anys 2022-04-29 17:29:57 +02:00
Agusti Fernandez Pardo d06a9488e4 fix: rename endpoints to be only 2 words max 2022-04-29 02:49:38 +02:00
Agusti Fernandez Pardo e13ea234b8 fix: improve docs in attendees availabilities and booking references 2022-04-29 02:30:59 +02:00
Agusti Fernandez Pardo d6c34a8e51 fix: remove empty lines 2022-04-29 01:54:21 +02:00
Agusti Fernandez Pardo bb28680413 fixes all openapi spect issues, removes json-schema auto-generated moving to manual examples 2022-04-29 01:38:40 +02:00
Agusti Fernandez Pardo e52af0bbef fix: post / patch attendees docs w examples 2022-04-27 19:25:36 +02:00
Agusti Fernandez Pardo 14e2964a6d fix: booking reference moved to pick-first create/edit separate validations 2022-04-26 22:48:15 +02:00
Agusti Fernandez Pardo 6997606a4c fix: moves to pick and separates availabilities 2022-04-26 22:23:33 +02:00
Agusti Fernandez Pardo 3759eccfca fix: attendees move to use pick, separate patch/post 2022-04-26 22:12:28 +02:00
Agusti Fernandez Pardo fa30b52988 remove v1 from specs 2022-04-26 21:56:59 +02:00
Agusti Fernandez Pardo ad04be9394 fix: availability patch 2022-04-25 06:13:27 +02:00
Agusti Fernandez Pardo 804fe27458 fix availabilites validations 2022-04-25 03:12:33 +02:00
Agusti Fernandez Pardo b38f78bbad fix: remove withValidSchedule from get/patch/delete shared endpoint 2022-04-24 23:57:17 +02:00
Agusti Fernandez Pardo 4c022d5d07 feat: adds full validations for users endpoint 2022-04-24 23:56:25 +02:00
Agusti Fernandez Pardo dad70d5a12 fix users, availabilites, attendees 2022-04-24 02:10:32 +02:00
Agusti Fernandez Pardo 096fd40044 fix: fixess attends:id endpoit 2022-04-23 05:51:26 +02:00
Agusti Fernandez Pardo 9078ee2f3f fix: build removing extra spaces 2022-04-23 02:40:39 +02:00
Agusti Fernandez Pardo 2009e6f0fb fix: remove comments 2022-04-23 02:22:43 +02:00
Agusti Fernandez Pardo 8d5605dc7b fix: move 401 to throw early in all endpoints 2022-04-23 02:17:06 +02:00
Agusti Fernandez Pardo 307eddcbd5 fix: invert 401 to throw early in attendees 2022-04-23 02:06:39 +02:00
zomars be3bcf2bf0 Refactoring and fixes 2022-04-21 19:42:53 -06:00
Agusti Fernandez Pardo ccd8637ae6 feat: all endpoints safe 2022-04-21 01:30:47 +02:00
Agusti Fernandez Pardo 103228cf84 feat: destination calendars ready 2022-04-21 01:15:58 +02:00
Agusti Fernandez Pardo d8bfff9525 feat: event type custom input endpoitns ready 2022-04-21 01:08:45 +02:00
Agusti Fernandez Pardo 18c1a2f026 remove unnecessary await on all getCalcomUserId() calls 2022-04-21 00:55:41 +02:00
Agusti Fernandez Pardo b0c0e9fb4c feat: memberships hardened mode 2022-04-21 00:55:22 +02:00
Agusti Fernandez Pardo 9c5624c748 fix: delete reminder mails endpoints for now as no userId, consult if needed 2022-04-21 00:50:34 +02:00
Agusti Fernandez Pardo cabe4ae9c6 feat: schedules hardend 2022-04-21 00:48:54 +02:00
Agusti Fernandez Pardo 80c2c4bdae feat: selected calendars hardened 2022-04-21 00:31:42 +02:00
Agusti Fernandez Pardo 6749840077 fix: improve comments on teams 2022-04-21 00:00:02 +02:00
Agusti Fernandez Pardo ec903b21c6 feat: teams return only userId related data, on POST create ownership membership for userId 2022-04-20 23:42:49 +02:00
Agusti Fernandez Pardo e138df47ba remove duplicated error check in event-types id 2022-04-20 20:25:26 +02:00
Agusti Fernandez Pardo 7734e86f6b improve readme. fix event-types 2022-04-19 13:44:24 +02:00
Agusti Fernandez Pardo 29666493d6 make event types return only userId data 2022-04-19 05:19:59 +02:00
Agusti Fernandez Pardo b4f3b8cc55 removes credentials endpoint 2022-04-18 23:40:28 +02:00
Agusti Fernandez Pardo 25a2a405da feat: adds apikeyAuth in swagger ui for all endpoints 2022-04-17 16:39:38 +02:00
Agusti Fernandez Pardo 5013ea2ef5 feat: adds apiKey auth as query params in docs and users endpoint 2022-04-17 16:18:42 +02:00
Agusti Fernandez Pardo 04052c53b4 cleanup no cors middleware 2022-04-15 18:12:25 +02:00
Agusti Fernandez Pardo a543d1fde3 disable middleware for cors 2022-04-15 17:29:03 +02:00
Agusti Fernandez Pardo a4851bd0b6 fix add new withCorsMiddleware 2022-04-15 17:04:17 +02:00
Agusti Fernandez Pardo babfc6d7cf adds cors support to docs endpoint 2022-04-15 16:10:57 +02:00
Agusti Fernandez Pardo 1405f7a861 adds app-store to be transpiled to fix build 2022-04-13 18:53:44 +02:00
Agusti Fernandez Pardo d987d52dbb feat: credentials, teams 2022-04-13 02:12:16 +02:00
Agusti Fernandez Pardo 9447bd859d feat hardened attendees, availabilites, booking-references, and bookings 2022-04-11 16:47:01 +02:00
Agusti Fernandez Pardo 9cefd119ee feat: make booking-references only return user booking related resources 2022-04-11 15:42:50 +02:00
Agusti Fernandez Pardo fca49a23c5 feat: make availabilities safe and return only userId related resources 2022-04-11 15:26:06 +02:00
Agusti Fernandez Pardo 081b511e1e Make attendees id endpoint return only user owned resources 2022-04-11 15:20:38 +02:00
Agusti Fernandez Pardo 0bda988676 feat: all resources endpoints for get all and new unified 2022-04-11 15:10:16 +02:00
Agusti Fernandez Pardo 963c893727 feat: unify new/index of attendees, availabilities, booking references, bookings, selected calendars, update response types 2022-04-11 12:03:15 +02:00
Agusti Fernandez Pardo ddc1b4043c fix: docs bad ref in event type 2022-04-11 00:10:38 +02:00
Agusti Fernandez Pardo d95325c06c payments safe, unify endpoints for remindermails schedules 2022-04-10 02:10:34 +02:00
Agusti Fernandez Pardo af72b1f5b5 feat: unitfy new/index of teams and selected calendars 2022-04-09 01:29:26 +02:00
Agusti Fernandez Pardo 7fcc270fe8 adds index with message redirecting users to docs just so checkly doesn't fail 2022-04-08 23:20:52 +02:00
Agusti Fernandez Pardo 935e27f9ca Fix calcom user bad import 2022-04-08 21:08:25 +02:00
Agusti Fernandez Pardo 1f561e70be reanem getCalcomUserId util 2022-04-08 20:54:48 +02:00
Agusti Fernandez Pardo 9edc1dbd29 some fixes on helpers/middlewares 2022-04-08 18:08:26 +02:00
Agusti Fernandez Pardo fc3677631f attendes of users bookings only 2022-04-08 03:16:53 +02:00
Agusti Fernandez Pardo 325b19ba3f Add userId check in users getAll and id endpoints 2022-04-07 21:55:43 +02:00
Agusti Fernandez Pardo fc2978a61b feat: initial work unifying new endpoint and generating api key 2022-04-07 03:29:53 +02:00
Agusti Fernandez Pardo 5b3f9ee95c fix availabilities spelling 2022-04-04 21:53:03 +02:00
Agusti Fernandez Pardo 89dfa2efe1 feat all endpoints one id file 2022-04-04 21:39:30 +02:00
Agusti Fernandez Pardo de8d7f64c3 mvoe to less files 2022-04-04 02:02:11 +02:00
Agusti Fernandez Pardo 5233dad5f9 re-unify into one route all id ops for teams and users 2022-04-04 00:49:05 +02:00
Agusti Fernandez Pardo 61819772bc fix all swagger docs, dont build templates 2022-04-03 17:47:18 +02:00
Agusti Fernandez Pardo d144c0f9e1 feat: upgrade all validations, rename to use snake_case 2022-04-02 03:46:24 +02:00
Agusti Fernandez Pardo 1e18e9b945 feat: adds reminder-mail endpoints 2022-04-02 02:45:28 +02:00
Agusti Fernandez Pardo 3271e17317 feat: adds payments CRUD endpoints 2022-04-02 02:38:46 +02:00
Agusti Fernandez Pardo fc795f963b fix: hack around create/connect issues for now 2022-04-02 02:09:04 +02:00
Agusti Fernandez Pardo 9f4a62e2ef feat: yarn build no errors 2022-04-02 01:55:41 +02:00
Agusti Fernandez Pardo 1c19032884 chore: bring up to date booking references, bookings, and credentials 2022-04-01 23:03:03 +02:00
Agusti Fernandez Pardo 55f93cded6 feat: update attendees / availabilites / users endpoints and document parameters 2022-04-01 22:05:10 +02:00
Agusti Fernandez Pardo e284707250 initail work on paid booking, improve validations 2022-04-01 17:53:52 +02:00
Agusti Fernandez Pardo 12de89294d swagger docs add params, memberships handle compoundId 2022-03-31 22:14:37 +02:00
Agusti Fernandez Pardo 9aa4b0e30d feat: inherit all validations from auto-generated zod 2022-03-30 17:37:51 +02:00
Agusti Fernandez Pardo 367621ea51 feat: users, teams, selectedCalendars w new code/docs 2022-03-30 16:56:24 +02:00
Agusti Fernandez Pardo 1de7bc4146 prettier 2022-03-30 14:17:55 +02:00
Agusti Fernandez Pardo 443e01f0da chore: update imports to use dasheS 2022-03-29 04:01:23 +02:00
Agusti Fernandez Pardo 20a93a13c9 feat: update users/teams/apiKeys to use middleware 2022-03-29 03:59:57 +02:00
Agusti Fernandez Pardo 3011e0ecf7 chore: no default export 2022-03-29 03:23:22 +02:00
Agusti Fernandez Pardo ec8fe36930 feat: successfully protected all endpoints with next-api-middleware for verifyApiKey 2022-03-29 02:25:24 +02:00
Agusti Fernandez Pardo 8165977ec3 Adds basic CRUD endpoints for bookingReferences, Crendentials, DailyEventReferences, DestinationCalendars, EventTypeCustomInputs, Memberships, Schedules, and SelectedCalendars 2022-03-29 00:27:14 +02:00
Agusti Fernandez Pardo 99d328c35d chore: refactor-out apiKey check into middleware 2022-03-28 17:46:12 +02:00
Agusti Fernandez Pardo 1241ae6cfc feat: move findAll to return arrays 2022-03-28 16:05:00 +02:00
Agusti Fernandez Pardo 19934d8c3a Adds basic api-key auth in users, need to extract out 2022-03-28 02:51:40 +02:00
Agusti Fernandez Pardo 0e3131d866 feat: improve validations 2022-03-27 15:15:46 +02:00
Agusti Fernandez Pardo 396c5b8d8c chore: refactor all delete endpoints to use if/else instead of .catch() and .error() 2022-03-27 01:08:00 +01:00
Agusti Fernandez Pardo 936572e7e1 feat: adds availabilitesi and attendees endpoints, some cleanup less try/catch more if/else 2022-03-27 00:58:22 +01:00
Agusti Fernandez Pardo ac307f7161 feat: adds bookings and more tests 2022-03-26 22:29:30 +01:00
Agusti Fernandez Pardo 7998e8fc2c feat: 50% almost code coverage 2022-03-26 05:28:53 +01:00
Agusti Fernandez Pardo 62a917c7a8 renames team -> teams adds tests for users and teams 2022-03-26 02:16:46 +01:00
Agusti Fernandez Pardo 8b8629f37a feat: Adds teams endpoints and zod validations 2022-03-26 01:53:56 +01:00
Agusti Fernandez Pardo f2be36f89c fix: remove console statements 2022-03-26 01:41:22 +01:00
Agusti Fernandez Pardo 12a7129e5a feat: adds tests for api keys endpoints 2022-03-26 01:40:43 +01:00
Agusti Fernandez Pardo 9e8be659c5 feat: initial tests for api-keys endpoint 2022-03-26 00:42:12 +01:00
Agusti Fernandez Pardo 084c91f6c1 feat: improve api key endpoints, add users endpoint 2022-03-25 23:26:22 +01:00
Agusti Fernandez Pardo d9c34f67e6 feat: adds api keys endpoints, new QueryIdAsString as apiKey has a UUID string-like ID unlike the numbers of event-type or others 2022-03-25 20:17:37 +01:00
Agusti Fernandez Pardo c2234593db feat: adds module transpiling so api can require @calcom/prisma and not @prisma/client directly 2022-03-25 19:37:51 +01:00
Agusti Fernandez Pardo a2817a2fee Feat: event-types and tests 2022-03-25 06:54:57 +01:00
Agusti Fernandez Pardo f6371c3b75 adds message and full error in eventtype/new 2022-03-25 01:52:13 +01:00
Agusti Fernandez Pardo f4d889e87b add @lib and @api paths for cleaner imports 2022-03-25 00:43:35 +01:00
Agusti Fernandez Pardo 737a8897ba extracting out schemaQuery validation to lib, extracting out delete/edit to it's own files for clarity 2022-03-25 00:04:07 +01:00
Agusti Fernandez Pardo e4d9f7bc7d remove example validation file 2022-03-24 23:19:13 +01:00
Agusti Fernandez Pardo 84ab74b46a feat: tests all codepaths of event-type/[id] 2022-03-24 23:16:48 +01:00
Agusti Fernandez Pardo dfa227f1b6 adds testing for validations 2022-03-24 23:10:24 +01:00
Agusti Fernandez Pardo 713f53acc4 feat: add next-validations and zod validations 2022-03-24 21:25:35 +01:00
Agusti Fernandez Pardo c5b12d46af chore: rename return types to Data, import prisma from @calcom/prisma 2022-03-24 19:01:37 +01:00
Agusti Fernandez Pardo b753466bda moving to nextjs/api 2022-03-24 17:02:33 +01:00
Agusti Fernandez Pardo 60d2b81c29 feat: Initial work on event-types, add jest for testing w node-http-mocks 2022-03-23 22:35:38 +01:00
Agusti Fernandez Pardo c46a899c1b remove all next-auth related stuff 2022-03-23 22:27:03 +01:00
Agusti Fernandez Pardo 9a5c3f96ec rebase fixing conflicts 2022-03-23 22:22:57 +01:00