summary refs log tree commit diff
path: root/api (follow)
Commit message (Expand)AuthorAgeFilesLines
* Allow edited_timestamp to passthrough in handleMessageMadeline2022-09-251-2/+1
* Add discrim verify in PATCH /users/@meMadeline2022-09-251-0/+8
* Mostly working user guild settingsMadeline2022-09-252-209/+15153
* Potential nick reset fixMadeline2022-09-251-2/+2
* Fix default rights sucking, fix patch /guilds/:id/members/:id not checking pe...Madeline2022-09-241-1/+4
* fix my shitMadeline2022-09-211-2/+2
* Member settings routeMadeline2022-09-212-0/+33
* Forgot the webrtc client pluginMadeline2022-09-161-0/+74
* Add webrtc to bundleMadeline2022-09-161-2/+1
* Probably broken merge from webrtcMadeline2022-09-163-8/+240
* Trash ip logging for rate limitsMadeline2022-09-111-2/+2
* Added missing props to ChannelModifySchemaMadeline2022-09-102-15459/+102
* Send user settings on PATCH users/@me/settingsMadeline2022-09-081-1/+1
* ...and againMadeline2022-09-021-3/+2
* ...try againMadeline2022-09-021-6/+2
* Apply Iratu's patch for relationshipsMadeline2022-09-022-9/+16
* Message searching in guildsMadeline2022-09-021-0/+87
* Added sessions to /-/monitorzMadeline2022-09-021-0/+2
* /-/monitorz endpoint for system perf monMadeline2022-08-291-0/+16
* Switch to staging ratelimiterMadeline2022-08-251-20/+25
* Configurable max attachment sizeMadeline2022-08-221-1/+1
* Fix /users/@me/settings get and migrarionMadeline2022-08-211-3/+3
* fosscord-server/pulls/858Madeline2022-08-214-12/+26
* Fix before and after queries doing gt and lt comparisions incorrectlyMadeline2022-08-021-2/+2
* Fix messages?after=snowflake calling new Snowflake, which is not allwoedMadeline2022-08-021-1/+1
* if tenor or giphy is sent, embed image rather than thumbnailMadeline2022-07-301-0/+23
* Test embeding image/png etc responsesMadeline2022-07-241-42/+64
* Turns out I reverted the code I needed rather than the one that will delete a...Madeline2022-07-241-1/+9
* Merge branch 'feat/notesTable' into slowcordMadeline2022-07-231-10/+14
|\
| * Delete Note if no contentMadeline2022-07-231-10/+14
* | Merge branch 'feat/notesTable' into slowcordMadeline2022-07-231-11/+28
|\|
| * Moved user notes into separate tableMadeline2022-07-231-11/+28
* | Attempt to fix message ID bugMadeline2022-07-221-2/+1
* | Revert ascending order thingMadeline2022-07-221-1/+1
* | Get messages by ascending orderMadeline2022-07-221-1/+1
* | await the dm channel handlerMadeline2022-07-221-1/+1
* | Prevent demo user from enabling 2FAMadeline2022-07-201-1/+3
* | Merge branch 'feat/latestWebClient' into slowcordMadeline2022-07-203-0/+722
|\ \
| * \ Merge branch '2fa' into feat/latestWebClientMadeline2022-07-2011-7/+2253
| |\ \
* | \ \ Merge branch '2fa' into slowcordMadeline2022-07-208-2/+2222
|\ \ \ \ | | |/ / | |/| |
| * | | 2faMadeline2022-07-208-2/+1526
| | |/ | |/|
* | | Merge branch 'feat/captchaVerify' into slowcordMadeline2022-07-201-2/+2
|\ \ \
| * | | Captcha checkingMadeline2022-07-204-7/+69
| |/ /
* | | Merge branch 'feat/captchaVerify' into slowcordMadeline2022-07-204-19/+37
|\ \ \
| * | | Captcha checkingMadeline2022-07-204-7/+69
| |/ /
| * | chore: fix package.json scriptsNobody2022-07-191-5/+5
* | | Fix content type for captcha checkMadeline2022-07-201-0/+3
* | | Hcaptcha backendMadeline2022-07-204-8/+49
* | | Merge branch 'fix/messageLinkMetas' into slowcordMadeline2022-07-171-1/+5
|\ \ \
| * | | Message embeds use image width/heightMadeline2022-07-171-1/+5
| |/ /
* | | Attempt to fix headers being set after send to client in send messageMadeline2022-07-171-1/+1
* | | Merge branch 'fix/sendMemberInProfile' into slowcordMadeline2022-07-161-1/+1
|\ \ \
| * | | Actually respect with_mutual_guildsMadeline2022-07-161-1/+1
* | | | Merge branch 'fix/sendMemberInProfile' into slowcordMadeline2022-07-161-1/+1
|\| | |
| * | | Don't send @everyone roleMadeline2022-07-161-1/+1
* | | | Merge branch 'fix/sendMemberInProfile' into slowcordMadeline2022-07-161-1/+1
|\| | |
| * | | Forgot to send roles in guild_memberMadeline2022-07-161-25/+33
* | | | Forgot to send roles in guild_memberMadeline2022-07-161-25/+33
* | | | Merge branch 'fix/sendMemberInProfile' into slowcordMadeline2022-07-161-14/+39
|\| | |
| * | | Respect with_mutual_guilds and guild_id in /users/:id/profileMadeline2022-07-161-14/+39
| |/ /
* | | /channel/:id/messages/:id/ack responds with { token: null } on discord.comMadeline2022-07-131-1/+1
* | | Check if role icon was actually sent or if it's just an empty stringMadeline2022-07-101-1/+1
* | | Merge branch 'feat/latestWebClient' into slowcordMadeline2022-07-102-0/+4
|\ \ \ | | |/ | |/|
| * | Try to allow role icons to be removedMadeline2022-07-101-0/+1
| * | Fix username/discrim changingMadeline2022-07-102-0/+4
| * | Merge branch 'master' into feat/latestWebClientMadeline2022-07-102-4/+7
| |\|
* | | Merge branch 'master' into slowcordMadeline2022-07-091-1/+1
|\ \ \ | | |/ | |/|
| * | * Make max website preview download size for embeds configurableMadeline2022-07-091-3/+6
| * | Removed unused importMadeline2022-07-091-1/+1
* | | Redirect to custom login page when client navigates to /login or /registerMadeline2022-07-091-0/+13
* | | Merge branch 'fix/registerNewClients' into slowcordMadeline2022-07-092-0/+5
|\ \ \
| * | | Add `promotional_email_opt_in` field to register to allow newer clients to ma...Madeline2022-06-012-9858/+67
* | | | Merge branch 'fix/messageLinkMetas' into slowcordMadeline2022-07-091-3/+6
|\ \ \ \
| * | | | * Make max website preview download size for embeds configurableMadeline2022-07-091-3/+6
* | | | | Merge branch 'feat/latestWebClient' into slowcordMadeline2022-07-092-10/+21
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'feat/multiUploads' into feat/latestWebClientMadeline2022-07-095-68/+96
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'master' into feat/multiUploadsMadeline2022-07-092-483/+652
| | |\| |
| | | * | Filter out schemas that block generation instead, and also include util in filesMadeline2022-07-073-430/+1936
| | | * | Typescript-json-schema does not crawl extendsMadeline2022-07-071-1/+8
| | * | | Allow multiple attachments in messagesMadeline2022-07-092-10/+1365
| | |/ /
* | | | Merge branch 'fix/claim_accounts' into slowcordMadeline2022-07-081-3/+3
|\ \ \ \
| * | | | Check if email required in PATCH @meMadeline2022-07-081-3/+3
* | | | | Merge branch 'fix/claim_accounts' into slowcordMadeline2022-07-071-0/+2
|\| | | |
| * | | | Merge branch 'master' into fix/claim_accountsMadeline2022-07-0731-8333/+14444
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Ensure password was given if email is given in PATCH @meMadeline2022-07-071-0/+2
* | | | | Somehow the ID of demo user changed. Use email of demo insteadMadeline2022-07-071-4/+4
* | | | | Fix role icons not deleting?Madeline2022-07-071-0/+1
* | | | | Merge branch 'feat/latestWebClient' into slowcordMadeline2022-07-067-14/+43
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Welcome screenMadeline2022-07-042-3/+4
| * | | | Placeholder member verification endpointMadeline2022-07-041-0/+14
| * | | | Merge branch 'fix/channelPermissionOverwriteSchema' into feat/latestWebClientMadeline2022-07-032-7/+4
| * | | | Merge branch 'fix/channelPermissionOverwriteSchema' into feat/latestWebClientMadeline2022-07-032-422/+1935
| |\ \ \ \
| * | | | | Add premium_progress_bar_enabled to GuildUpdateSchemaMadeline2022-07-031-0/+1
| * | | | | Add Nitro Lite Monthly SKUMadeline2022-07-031-0/+16
| * | | | | Bump client versionMadeline2022-07-031-4/+4
* | | | | | Merge branch 'master' into slowcordMadeline2022-07-052-53/+68
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Format changed filesLachlanCourt2022-07-041-13/+6
| * | | | | Ensure query fails if role with specified id does not existLachlanCourt2022-07-041-1/+1
| * | | | | Add semicolonLachlanCourt2022-07-041-1/+1
| * | | | | Simplify role query as per code reviewLachlanCourt2022-07-041-2/+1
| * | | | | Move role_id specific api routes to correct fileLachlanCourt2022-07-042-137/+53
| * | | | | Fix compile error in get requestLachlanCourt2022-07-041-42/+4
| * | | | | Create role subdirectory and add GET api routeLachlanCourt2022-07-042-0/+145
| * | | | | Skip check for rate limit bypass if no user id is providedMadeline2022-07-021-5/+7
| |/ / / /
* | | | | Merge branch 'fix/nicknames' into slowcordMadeline2022-07-031-4/+1
|\ \ \ \ \
| * | | | | Revert "Perhaps a better nickname change implementation"Madeline2022-07-031-4/+1
* | | | | | Merge branch 'fix/nicknames' into slowcordMadeline2022-07-031-1/+4
|\| | | | |
| * | | | | Perhaps a better nickname change implementationMadeline2022-07-031-1/+4
| * | | | | Allow nicknames through MemberChangeSchemaMadeline2022-07-032-419/+1922
| |/ / / /
* | | | | Merge branch 'fix/nicknames' into slowcordMadeline2022-07-032-0/+6
|\ \ \ \ \
| * | | | | Allow nicknames through MemberChangeSchemaMadeline2022-07-032-419/+1922
| |/ / / /
* | | | | Prevent demo user from editing their profileMadeline2022-07-031-0/+3
* | | | | Revert RateLimit.tsMadeline2022-07-021-18/+6
* | | | | Merge branch 'fix/channelPermissionOverwriteSchema' into slowcordMadeline2022-07-023-114/+11416
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Filter out schemas that block generation instead, and also include util in filesMadeline2022-07-023-430/+1936
* | | | | Merge branch 'fix/channelPermissionOverwriteSchema' into slowcordMadeline2022-07-021-1/+8
|\| | | |
| * | | | Typescript-json-schema does not crawl extendsMadeline2022-07-021-1/+8
| |/ / /
* | | | Merge branch 'fix/rate_limits' into slowcordMadeline2022-07-021-5/+7
|\ \ \ \
| * | | | Skip check for rate limit bypass if no user id is providedMadeline2022-07-021-5/+7
| |/ / /
* | | | Update default rightsMadeline2022-07-021-18013/+66
* | | | Merge branch 'master' into slowcordMadeline2022-06-274-14/+34
|\| | |
| * | | Merge pull request #737 from fosscord/translationConner2022-06-262-4/+4
| |\ \ \
| | * | | New translations common.json (Polish)Samuel2022-04-251-2/+2
| | * | | New translations auth.json (Polish)Samuel2022-04-251-2/+2
| * | | | Fix compile errors in latestMadeline2022-06-261-10/+14
| * | | | fix the wrong nameErkin Alp Güney2022-06-261-1/+1
| * | | | self-leave logicErkin Alp Güney2022-06-261-3/+19
| * | | | JOIN_GUILDS is not the right flag thereErkin Alp Güney2022-06-261-1/+1
* | | | | Merge branch 'master' into slowcordMadeline2022-06-261-1/+1
|\| | | |
| * | | | Merge pull request #763 from KaKi87/spdxErkin Alp Güney2022-06-191-1/+1
| |\ \ \ \
| | * | | | Use SPDX license syntax in 'package.json' filesKaKi872022-06-021-1/+1
| | | |_|/ | | |/| |
* | | | | Merge branch 'feat/pingInformation' into slowcordMadeline2022-06-081-1/+17
|\| | | |
| * | | | Expose general instance information via api /ping routeMadeline2022-06-081-1/+17
| |/ / /
* | | | Merge remote-tracking branch 'origin/fix/claim_accounts' into slowcordMadeline2022-05-311-8/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into fix/claim_accountsMadeline2022-04-1125-3903/+2799
| |\ \ \
| * \ \ \ Merge branch 'master' into fix/claim_accountsErkin Alp Güney2022-03-055-21/+93
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' into slowcordMadeline2022-05-3113-83/+204
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Respect register_dateOfBirth_required = falseMadeline2022-05-301-1/+1
| * | | | | Finished file translation FlumeZ2022-05-261-10/+10
| * | | | | Fixed Broken Translates and finished the fileFlumeZ2022-05-261-11/+11
| * | | | | Update index.tsErkin Alp Güney2022-05-151-14/+18
| * | | | | Merge branch 'master' of https://github.com/fosscord/fosscord-serverErkin Alp Güney2022-05-153-16/+22
| |\ \ \ \ \
| | * | | | | Update bulk-delete.tsErkin Alp Güney2022-05-151-7/+13
| | * | | | | Update purge.tsErkin Alp Güney2022-05-151-3/+3
| | * | | | | Remove more WAAO referencesErkin Alp Güney2022-05-061-6/+6
| * | | | | | messages before/after soundness checkErkin Alp Güney2022-04-301-3/+12
| |/ / / / /
| * | | | | patch for missing router schema, and also add purge route self-deletion checksErkin Alp Güney2022-04-301-2/+11
| * | | | | introduce the purge endpointErkin Alp Güney2022-04-282-1/+78
| * | | | | Update prune.tsErkin Alp Güney2022-04-281-2/+6
| * | | | | needs to be asyncErkin Alp Güney2022-04-282-2/+3
| * | | | | exempt users logicErkin Alp Güney2022-04-281-2/+6
| * | | | | Merge pull request #736 from MaddyUnderStars/backfillingErkin Alp Güney2022-04-271-5/+24
| |\ \ \ \ \
| | * | | | | use return codes to allow for automationErkin Alp Güney2022-04-241-3/+5
| | * | | | | Backfilling privilege does not imply right to post messagesErkin Alp Güney2022-04-241-2/+5
| | * | | | | While backfilling, message ids must now be valid snowflakes, cannot be in the...Madeline2022-04-241-5/+19
| * | | | | | Do stuff for npm workspaceThesourtimes2022-04-263-18/+1
| * | | | | | eventually fix those errorsErkin Alp Güney2022-04-241-1/+1
| * | | | | | Update RateLimit.tsErkin Alp Güney2022-04-241-2/+3
| * | | | | | Update RateLimit.tsErkin Alp Güney2022-04-241-1/+1
| * | | | | | fix the seconds rounding logicErkin Alp Güney2022-04-241-2/+2
| * | | | | | Punitive rate limitingErkin Alp Güney2022-04-241-4/+8
| |/ / / / /
* | | | | | Merge branch 'fix/categoryNames' into slowcordMadeline2022-04-242-2/+87
|\| | | | |
| * | | | | Merge branch 'master' of https://github.com/fosscord/fosscord-serverErkin Alp Güney2022-04-234-8151/+12484
| |\ \ \ \ \
| | * | | | | Fix not assigning new changes to input fields in users/@meMadeline2022-04-231-1/+1
| * | | | | | backfilling — first stepsErkin Alp Güney2022-04-232-2/+87
* | | | | | | Merge branch 'fix/sanitisation' into slowcordMadeline2022-04-234-3/+12487
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Can no longer send messages to channel types that do not support it ( categor...Madeline2022-04-231-0/+5
| * | | | | | Fixed ability for user to edit any property of themselves, including `rights`...Madeline2022-04-233-8151/+12479
| |/ / / / /
* | | | | | Merge branch 'master' into slowcordMadeline2022-04-1920-79/+175
|\| | | | |
| * | | | | Use 1 thread on platform where fetching thread/core count failsTheArcaneBrony2022-04-191-1/+6
| * | | | | general rights enforcement stuffErkin Alp Güney2022-04-181-0/+3
| * | | | | Merge branch 'master' of https://github.com/fosscord/fosscord-serverErkin Alp Güney2022-04-181-1/+1
| |\ \ \ \ \
| | * | | | | Unified ghost instead of separate ghostsErkin Alp Güney2022-04-181-1/+1
| * | | | | | get single message && message rights enforcementErkin Alp Güney2022-04-182-2/+15
| |/ / / / /
| * | | | | reactions rights enforcementErkin Alp Güney2022-04-172-2/+3
| * | | | | remove misleading todo noteErkin Alp Güney2022-04-161-1/+0
| | |_|_|/ | |/| | |
| * | | | New translations common.json (Swedish)Samuel2022-04-121-14/+14
| * | | | New translations auth.json (Swedish)Samuel2022-04-121-10/+10
| * | | | Update passwordStrength.tsErkin Alp Güney2022-04-121-1/+1
| * | | | Fix compile errors in checkPassword's entropy checkMadeline2022-04-101-4/+4
| | |_|/ | |/| |
| * | | Update passwordStrength.tsErkin Alp Güney2022-04-091-1/+1
| * | | add an elegant entropy checkErkin Alp Güney2022-04-091-5/+16
| * | | fix MANAGE_GUILDS; rename getRight to getRightsbinsky2022-04-091-2/+2
| * | | fix invite right enforcementbinsky2022-04-091-1/+1
| * | | correct right nameErkin Alp Güney2022-04-081-1/+1
| * | | invite right enforcedErkin Alp Güney2022-04-081-1/+2
| * | | JOIN_GUILDSErkin Alp Güney2022-04-081-1/+1
| * | | rights enforcement in guild createErkin Alp Güney2022-04-081-3/+4
| * | | MANAGE_GUILDSErkin Alp Güney2022-04-081-2/+10
| * | | remove todos that are implementedErkin Alp Güney2022-04-081-3/+3
| * | | enforce the rightsErkin Alp Güney2022-04-081-3/+5
| * | | fix the build mistakes from yesternightErkin Alp Güney2022-04-081-7/+12
| * | | Update index.tsErkin Alp Güney2022-04-081-7/+10
| * | | added the maintenance listing endpointErkin Alp Güney2022-04-071-0/+1
| * | | scheduled maintenancesErkin Alp Güney2022-04-071-0/+12
| * | | New translations common.json (Hebrew)Samuel2022-04-051-7/+7
| * | | User Notes (#707)Madeline2022-04-051-5/+30
| * | | Fix typo in table 'client_relase' -> 'client_release' ( and other of the same...Madeline2022-03-305-12/+12
| * | | Bump minimist from 1.2.5 to 1.2.6 in /apidependabot[bot]2022-03-301-6/+12
* | | | Merge branch 'fix/relase_typo' into slowcordMadeline2022-03-315-12/+12
|\ \ \ \
| * | | | Fixed typo in table name 'client_relase' -> 'client_release'. Fixed more typo...Madeline2022-03-315-12/+12
| |/ / /
* | | | Merge branch 'master' into slowcordMadeline2022-03-313-5/+17
|\| | |
| * | | Make comments more accurate to use-caseLuna Alfien2022-03-271-0/+4
| * | | Create fosscord-login.jsLuna Alfien2022-03-271-0/+8
| * | | Fix `servers[0].url` in `openapi.json`.SpacingBat32022-03-201-1/+1
| * | | close issue #684Erkin Alp Güney2022-03-142-4/+4
* | | | Merge branch 'master' into slowcordMadeline2022-03-128-29/+77
|\| | |
| * | | fix(api): add vanity urls creation/update (#665)Nobody2022-03-091-5/+28
| * | | fix(api): working replies in dm channelsNobody2022-03-091-4/+6
| * | | Merge branch 'master' into fix/ban-listNobody2022-03-084-6/+12
| |\ \ \
| | * | | Temporary notes fixRealMANI2022-03-081-3/+3
| | * | | fix(api): working invisible status typeNobody2022-03-082-3/+3
| | * | | fix(api): don't send @everyone in route responseNobody2022-03-081-1/+4
| | * | | fix(api): prevent @everyone role duplicationNobody2022-03-081-1/+1
| | * | | fix(api): always add @everyone in user's rolesNobody2022-03-081-0/+3
| | * | | Fix bans list (#674)RealMANI2022-03-081-8/+12
| * | | | fix(api): working ban listNobody2022-03-081-8/+23
| |/ / /
| * | | Check usernameRealMANI2022-03-061-6/+8
| * | | [Fix] Changing bio and accent colorRealMANI2022-03-061-1/+1
* | | | Merge branch 'master' into slowcordMadeline2022-03-062-3818/+2581
|\| | |
| * | | Fixed npm run tsnode throwing error about ES modules for node-fetch. Probably...Madeline2022-03-062-3814/+2577
| | |/ | |/|
| * | Bump url-parse from 1.5.7 to 1.5.10 in /apidependabot[bot]2022-02-281-12/+12
* | | Merge branch 'master' into slowcordMadeline2022-03-063-16/+74
|\| |
| * | Merge pull request #621 from fosscord/origin/dev/erkinalp/self-bansErkin Alp Güney2022-02-251-6/+61
| |\ \
| | * \ Merge branch 'master' into origin/dev/erkinalp/self-bansErkin Alp Güney2022-02-041-0/+7
| | |\ \
| | * | | pretend self-bans don't exist in the views tooErkin Alp Güney2022-02-041-1/+4
| | * | | ban moderator schema actually changeErkin Alp Güney2022-02-041-2/+12
| | * | | ban moderator schema changeErkin Alp Güney2022-02-041-0/+1
| | * | | some important changesErkin Alp Güney2022-02-041-4/+4
| | * | | Try to commit this one again, this time over the webErkin Alp Güney2022-02-041-4/+8
| | * | | remove pretense of nonexistence from main view route for now to make it compi...Erkin Alp Güney2022-02-041-2/+0
| | * | | Extend the pretense of non-existence of self-bans to API view route tooErkin Alp Güney2022-02-021-0/+2
| | * | | Better protection against self-bansErkin Alp Güney2022-02-021-2/+3
| | * | | Make self-bans irreversibleErkin Alp Güney2022-02-021-1/+4
| | * | | Allow self-ban of non-ownersErkin Alp Güney2022-02-021-1/+34
| * | | | [Fix] Profile & banner uploadingRealMANI2022-02-201-1/+1
| * | | | Bump url-parse from 1.5.3 to 1.5.7 in /apidependabot[bot]2022-02-191-8/+12
* | | | | Merge branch 'fosscord:master' into slowcordMadeline2022-02-192-5/+18
|\| | | |
| * | | | changed user.premium_since to also load from the database.Iratu2022-02-182-1/+5
| * | | | Forgot the openapi.json change.Iratu2022-02-181-1/+2
| * | | | Fix for Premium Since to show the 'Guild Boost' and store it correctly in the...Iratu2022-02-181-3/+11
* | | | | Merge branch 'fix/claim_accounts' into slowcordMadeline2022-02-182-2/+13
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Added email sanitisation to /users/@me PATCH. Could previously have email as ...Madeline2022-02-172-1/+11
| * | | | Fixed bug in /users/@me PATCH where username must be present in every request...Madeline2022-02-171-1/+2
| |/ / /
* | | | Merge branch 'master' into slowcordMadeline2022-02-1819-39/+306
|\| | |
| * | | Merge pull request #608 from Featyre/masterErkin Alp Güney2022-02-1615-24/+208
| |\ \ \
| | * | | Return none for dev portal + todo for categoriesFeatyre2022-02-021-1/+7
| | * | | Merge branch 'fosscord:master' into masterFeatyre2022-02-011-5/+5
| | |\| |
| | * | | Dev portal + categories load dbFeatyre2022-01-268-23/+77
| | * | | change lineFeatyre2022-01-251-1/+1