Browse code Fix merge issues, update to reflect config changes and package.json master
1 parent 0408065 commit e4a4759e971387675d127990b53dfd8b3a443d82 Diego Magdaleno authored on 22 May 2021

Showing 36 changed files

• assets/passwords.txt
• locales/id/common.json
• package-lock.json
• package.json
• patches/i18next-http-middleware+3.1.1.patch
• src/Server.ts
• src/routes/channels/#channel_id/invites.ts
• src/routes/channels/#channel_id/messages/#message_id/ack.ts
• src/routes/channels/#channel_id/messages/#message_id/index.ts
• src/routes/channels/#channel_id/messages/#message_id/reactions.ts
• src/routes/channels/#channel_id/messages/bulk-delete.ts
• src/routes/channels/#channel_id/messages/index.ts
• src/routes/channels/#channel_id/pins.ts
• src/routes/guilds/#guild_id/channels.ts
• src/routes/guilds/#guild_id/delete.ts
• src/routes/guilds/#guild_id/index.ts
• src/routes/guilds/#guild_id/members.ts
• src/routes/guilds/#guild_id/members/#member_id/index.ts
• src/routes/guilds/#guild_id/members/#member_id/nick.ts
• src/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts
• src/routes/guilds/#guild_id/members/index.ts
• src/routes/guilds/#guild_id/roles.ts
• src/routes/guilds/#guild_id/vanity-url.ts
• src/routes/guilds/index.ts
• src/routes/invites/index.ts
• src/routes/users/@me/affinities/user.ts
• src/schema/Invite.ts
• src/schema/Member.ts
• src/schema/Message.ts
• src/schema/Roles.ts
• src/test/test.ts
• src/util/Channel.ts
• src/util/Member.ts
• src/util/Message.ts
• src/util/instanceOf.ts
• tsconfig.json

Show notes View assets/passwords.txt 100644 → 0
Too large (Show diff)

Ignore Space Show notes View locales/id/common.json

Ignore Space Show notes View package-lock.json
Too large (Show diff)

Ignore Space Show notes View package.json

Show notes View patches/i18next-http-middleware+3.1.1.patch 100644 → 0

Ignore Space Show notes View src/Server.ts

Ignore Space Show notes View src/routes/channels/#channel_id/invites.ts

Ignore Space Show notes View src/routes/channels/#channel_id/messages/#message_id/ack.ts 0 → 100644

Ignore Space Show notes View src/routes/channels/#channel_id/messages/#message_id/index.ts

Ignore Space Show notes View src/routes/channels/#channel_id/messages/#message_id/reactions.ts

Ignore Space Show notes View src/routes/channels/#channel_id/messages/bulk-delete.ts

Ignore Space Show notes View src/routes/channels/#channel_id/messages/index.ts

Ignore Space Show notes View src/routes/channels/#channel_id/pins.ts

Ignore Space Show notes View src/routes/guilds/#guild_id/channels.ts

Ignore Space Show notes View src/routes/guilds/#guild_id/delete.ts 0 → 100644

Ignore Space Show notes View src/routes/guilds/#guild_id/index.ts

Show notes View src/routes/guilds/#guild_id/members.ts 100644 → 0

Ignore Space Show notes View src/routes/guilds/#guild_id/members/#member_id/index.ts 0 → 100644

Ignore Space Show notes View src/routes/guilds/#guild_id/members/#member_id/nick.ts 0 → 100644

Ignore Space Show notes View src/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts 0 → 100644

Ignore Space Show notes View src/routes/guilds/#guild_id/members/index.ts 0 → 100644

Ignore Space Show notes View src/routes/guilds/#guild_id/roles.ts

Ignore Space Show notes View src/routes/guilds/#guild_id/vanity-url.ts 0 → 100644

Ignore Space Show notes View src/routes/guilds/index.ts

Ignore Space Show notes View src/routes/invites/index.ts

Ignore Space Show notes View src/routes/users/@me/affinities/user.ts 0 → 100644

Ignore Space Show notes View src/schema/Invite.ts

Ignore Space Show notes View src/schema/Member.ts

Ignore Space Show notes View src/schema/Message.ts

Ignore Space Show notes View src/schema/Roles.ts

Ignore Space Show notes View src/test/test.ts

Ignore Space Show notes View src/util/Channel.ts 0 → 100644

Ignore Space Show notes View src/util/Member.ts

Ignore Space Show notes View src/util/Message.ts 0 → 100644

Ignore Space Show notes View src/util/instanceOf.ts

Ignore Space Show notes View tsconfig.json

Show line notes below