Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve multilingualism and fix search routes #5334

Merged
merged 92 commits into from
Dec 7, 2022
+1,171 −366
Merged

Improve multilingualism and fix search routes #5334

Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
84db331
fixed search routes
Nov 2, 2022
5c93f24
made static text multilingual and fixed german translations
Nov 2, 2022
8959ce9
delete empty file created by fixing merge conflicts
Nov 2, 2022
3620f25
fixing TextField placeholder by passing attendeeName and fixed json v…
Nov 2, 2022
68f75a3
Using useLocal to modify static text to make it multilingual, and pas…
Nov 2, 2022
dc247aa
seperated whitelabel and improved translations
Nov 2, 2022
72360c3
added missing translation
Nov 2, 2022
07776d9
added missing translation for webhooks
Nov 2, 2022
ac0804b
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 3, 2022
8fe2972
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 3, 2022
58e2c98
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Nov 3, 2022
030083b
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 3, 2022
81eddd7
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 3, 2022
5b4b680
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 4, 2022
5c76e4b
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 4, 2022
9ee6d90
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 4, 2022
f0a5d38
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 7, 2022
7db6fcd
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 7, 2022
72cfe7c
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 8, 2022
65725d3
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 9, 2022
3f9a14e
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 10, 2022
cfd7ef1
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Nov 11, 2022
113216b
Updated AdminAppsView with dynamic translations.
Nov 14, 2022
ac373a6
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Nov 14, 2022
eda2199
changed back to one liner
Nov 14, 2022
394685a
updated german and english translations for impersonation.tsx
Nov 14, 2022
f062a16
updated german and english translations for impersonation.tsx and use…
Nov 14, 2022
f2d6068
updated german and english translations for team-billing-view.tsx
Nov 14, 2022
d914bb2
updated german and english translations for LicenseRequired.tsx
Nov 14, 2022
378390c
updated routes for profile and avatar
Nov 14, 2022
efd9a90
yarn.lock updated from newer changes
Nov 14, 2022
2a3d1f4
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 14, 2022
437e6b3
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 14, 2022
f93c06c
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 14, 2022
4575085
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 14, 2022
dd8a7a7
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 14, 2022
acfc5cb
Revert " yarn.lock updated from newer changes"
Nov 15, 2022
bab948a
Merge remote-tracking branch 'origin/improve-multilingualism' into im…
Nov 15, 2022
3216b10
sanitize dangerouslySetInnerHTML to prevent xss attacks
Nov 15, 2022
22cb8d9
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 15, 2022
fa13d3c
tried to fix window title flicker
Nov 16, 2022
f6db4c7
Merge remote-tracking branch 'origin/improve-multilingualism' into im…
Nov 16, 2022
8216515
changed ssdInit to ssrInit for getServerSideProps. Serverside transla…
Nov 17, 2022
83ac687
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 17, 2022
4a6b71a
flicker with route in window title is caused here. It is not necessar…
Nov 17, 2022
e2cd207
fixed window title translation flicker for availability page
Nov 17, 2022
365ed57
fixed window title translation flicker for teams page
Nov 17, 2022
dc61584
fixed window title translation flicker for workflow page
Nov 17, 2022
1f0931f
fixed error that div may not be rendered within p element
Nov 17, 2022
2828168
fixed window title translation flicker for booking page
Nov 17, 2022
aff9109
fixed window title translation flicker by adding getServerSideProps
Nov 17, 2022
23e8054
Only set HeadSeo if an page title exists. If window title is set by t…
Nov 17, 2022
749c155
fixed window title translation flicker by adding the Meta component t…
Nov 17, 2022
efd6017
fixed condition
Nov 17, 2022
586b80c
removed condition and added withoutSeo for settings pages
Nov 18, 2022
e09cd25
using translations for create team page further fixed flicker for win…
Nov 18, 2022
ac71db9
fixed flicker for window title for event-type creation page
Nov 18, 2022
baeedac
fixed flicker for window title for availability creation page
Nov 18, 2022
5d9d46a
fixed flicker for window title for sso page
Nov 18, 2022
4ccdd18
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 18, 2022
1ad792e
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 20, 2022
d2717f0
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 21, 2022
38cabeb
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 21, 2022
5bfe382
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 21, 2022
5f0a30b
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 22, 2022
87ad2b2
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 22, 2022
8517abe
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 22, 2022
aa1f915
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 23, 2022
6dbb7d6
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Nov 23, 2022
98fafde
updated conferencing en translation
Nov 23, 2022
e2a15f6
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 23, 2022
ca42fb3
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Nov 24, 2022
04e66f1
added meta.CTA back it was mistakenly removed
Nov 24, 2022
ca0a1c0
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 24, 2022
4b38162
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 25, 2022
612d366
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 25, 2022
aca029c
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 25, 2022
616abfa
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Nov 28, 2022
5e16ef1
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 28, 2022
e14b4dd
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 29, 2022
752b977
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 30, 2022
a2f1ad2
Merge branch 'main' into improve-multilingualism
OMaxOe Nov 30, 2022
5eb4e91
Merge remote-tracking branch 'upstream/main' into improve-multilingua…
Dec 1, 2022
72debe9
fixed flicker for workflows page
Dec 1, 2022
78c5784
fixed missing variable
Dec 1, 2022
28359b5
Merge branch 'main' into improve-multilingualism
PeerRich Dec 2, 2022
9cc0c1b
Merge branch 'main' into improve-multilingualism
OMaxOe Dec 5, 2022
f0817ff
Merge branch 'main' into improve-multilingualism
zomars Dec 7, 2022
6fb3a47
Update packages/ui/v2/core/Shell.tsx
zomars Dec 7, 2022
37853a3
Delete index.tsx
zomars Dec 7, 2022
3dc00b7
Update sso.tsx
zomars Dec 7, 2022
57c211a
Updates subdmoules
zomars Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into improve-multilingualism
  • Loading branch information
@OMaxOe
OMaxOe authored Nov 9, 2022
commit 65725d3f1569d758c684379333694e86bb9a0480

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.