Skip to content

Commit

Permalink
Merge branch 'main' into add-zoom-office365-video-as-valid-event-type…
Browse files Browse the repository at this point in the history
…-locations
  • Loading branch information
SomayChauhan authored Jan 21, 2025
2 parents 82629d7 + 0f7ecb3 commit e5f784c
Show file tree
Hide file tree
Showing 9 changed files with 153 additions and 179 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Page from "~/auth/oauth2/authorize-view";

export const generateMetadata = async () => {
return await _generateMetadata(
() => "Authorize",
(t) => t("authorize"),
() => ""
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Page from "~/auth/platform/authorize-view";

export const generateMetadata = async () => {
return await _generateMetadata(
() => "Authorize",
(t) => t("authorize"),
() => ""
);
};
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions apps/web/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,9 @@ export const config = {
"/login",
"/auth/login",
"/auth/error",
"/auth/signin",
"/auth/oauth2/authorize",
"/auth/platform/authorize",
/**
* Paths required by routingForms.handle
*/
Expand Down
7 changes: 0 additions & 7 deletions apps/web/pages/auth/oauth2/authorize.tsx

This file was deleted.

7 changes: 0 additions & 7 deletions apps/web/pages/auth/platform/authorize.tsx

This file was deleted.

14 changes: 0 additions & 14 deletions apps/web/pages/auth/signin.tsx

This file was deleted.

1 change: 1 addition & 0 deletions apps/web/public/static/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -2928,6 +2928,7 @@
"managed_users_description": "See all the managed users created by your OAuth client",
"select_oAuth_client": "Select Oauth Client",
"on_every_instance": "On every instance",
"authorize": "Authorize",
"next": "Next",
"ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
}
296 changes: 147 additions & 149 deletions packages/app-store/routing-forms/pages/forms/[...appPages].tsx

Large diffs are not rendered by default.

0 comments on commit e5f784c

Please sign in to comment.