Commit ee1b120
committed
Merge upstream/feat/expo-wxt-companion into expo-one-off-links
Resolved conflicts by preserving logic from both branches:
- event-types.tsx: Kept one-off meeting modal with Clear button from upstream
- _layout.tsx: Combined both inline styles and Tailwind classes
- content.ts: Kept transparent full-width sidebar container with 400px iframe from HEAD, updated to use double quotes from upstream
- Deleted files removed by upstream: .output files, dev/entrypoints/content.ts, wxt.config.jsFile tree
79 files changed
+4251
-4063
lines changed- companion
- .husky
- .output/chrome-mv3
- content-scripts
- .wxt
- types
- app
- (tabs)
- event-type-detail
- tabs
- components
- contexts
- dev
- .output/chrome-mv3-dev
- content-scripts
- .wxt
- types
- entrypoints
- background
- extension
- entrypoints
- background
- public
- services
- types
- utils
- parsers
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
79 files changed
+4251
-4063
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| 30 | + | |
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
31 | 34 | | |
32 | 35 | | |
33 | 36 | | |
34 | 37 | | |
| 38 | + | |
35 | 39 | | |
36 | 40 | | |
37 | 41 | | |
38 | 42 | | |
39 | 43 | | |
40 | 44 | | |
41 | 45 | | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
This file was deleted.
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
0 commit comments