diff options
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 181 |
1 files changed, 55 insertions, 126 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index eabc36013..5df55fbe0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,129 +1,58 @@ | |||
1 | # [5.4.0](https://github.com/meetfranz/franz/compare/v5.4.0-beta.3...v5.4.0) (2019-10-23) | 1 | # [5.4.0](https://github.com/getferdi/ferdi/compare/v5.3.4...v5.4.0) |
2 | 2 | - Merge Franz v5.4.0 | |
3 | ### Features | 3 | - Add option to always show service navigation bar |
4 | 4 | - Minifying build files to improve app size | |
5 | * **Custom Websites:** Added navigation bar for "Custom Website" service ([f8fbaad](https://github.com/meetfranz/franz/commit/f8fbaad)) | 5 | - Sorting applications in QuickSwitch by last used |
6 | * **Mac:** Open Franz window with `Cmd+1` ([71831ec](https://github.com/meetfranz/franz/commit/71831ec)) | 6 | - Add service hibernation |
7 | * **Todos:** Allow Franz Todos to open links in browser ([5ba6723](https://github.com/meetfranz/franz/commit/5ba6723)) | 7 | - Fix universal darkmode for WhatsApp and Threema |
8 | * **Service API:** Share `team`, `url` and `hasCustomIcon` with service ([9f4f3e7](https://github.com/meetfranz/franz/commit/9f4f3e7)) | 8 | - Add button to open darkmode.css for a service |
9 | * **App Start:** Only load workspace related services ([ad7fb84](https://github.com/meetfranz/franz/commit/ad7fb84)) | 9 | - Add option to change accent color |
10 | 10 | ||
11 | 11 | # [5.3.4](https://github.com/getferdi/ferdi/compare/v5.3.3...v5.3.4) (2019-09-25) | |
12 | ### Bug Fixes | 12 | - Fix continuous releases/assets delivery on tags builds #53 |
13 | 13 | - Attempt at making menubar hiding feature cross-platform #7 (comment) | |
14 | * **Services:** Restore services after 10 minutes system suspension ([7f11dff](https://github.com/meetfranz/franz/commit/7f11dff)) | 14 | - Attempt at making "About Ferdi" consistent across platforms #47 (comment) |
15 | * **Workspaces:** Allow scrolling in Workspaces drawer ([5c1c0db](https://github.com/meetfranz/franz/commit/5c1c0db)) | 15 | - Attempt at fixing "Launch on start" feature on Linux #63 |
16 | * **Spell check:** fix(Spell checker): Fix disable spell checker ([@vantezzen](https://github.com/vantezzen)) | 16 | - Add "Quick Switch" feature |
17 | ([691e0cf](https://github.com/meetfranz/franz/commit/691e0cf)) | 17 | - Add universal Dark-Mode via the [DarkReader extension](https://github.com/darkreader/darkreader) |
18 | * **App:** Fix "Paste And Match Style" ([490a988](https://github.com/meetfranz/franz/commit/490a988)) | 18 | - Add "Scheduled Do-not-Disturb" feature |
19 | * **macOS:** Only show services in Touch Bar that should be visible ([077ad22](https://github.com/meetfranz/franz/commit/077ad22)) | 19 | |
20 | * **Service Proxies:** Fix proxy setting rehydration ([e2126a6](https://github.com/meetfranz/franz/commit/e2126a6)) | 20 | # [5.3.3](https://github.com/getferdi/ferdi/compare/v5.3.2...v5.3.3) (2019-09-18) |
21 | * **Settings:** Fix cache size calculation after clearing cache ([a31566d](https://github.com/meetfranz/franz/commit/a31566d)) | 21 | - Merged Franz v5.3.3 into Ferdi |
22 | * **Spell check:** Fix spell checker to initialize without loaded dictionary ([734732f](https://github.com/meetfranz/franz/commit/734732f)) | 22 | - Allow hiding menubar (#7) |
23 | * **Spell check:** Fix "undefined" language in context menu ([cc03883](https://github.com/meetfranz/franz/commit/cc03883)) | 23 | - Add "back" and "forward" options for browsing history inside services (#39) |
24 | * **App:** Fix Basic Auth overlay background in Dark Mode ([027e50d](https://github.com/meetfranz/franz/commit/027e50d)) | 24 | - Add password protection feature (#41) |
25 | 25 | - Add keep workspace loaded option per workspace (#37) | |
26 | 26 | ||
27 | ### General | 27 | # [5.3.2](https://github.com/getferdi/ferdi/compare/v5.3.1...v5.3.2) (2019-09-13) |
28 | 28 | Merged Franz v5.3.2 into Ferdi | |
29 | * **App:** Updated electron to 6.0.11 ([34aab68](https://github.com/meetfranz/franz/commit/34aab68)) | 29 | |
30 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | 30 | ## [5.3.1](https://github.com/getferdi/ferdi/compare/v5.3.0...v5.3.1) (2019-09-09) |
31 | 31 | Merge Franz v5.3.1 into Ferdi. | |
32 | 32 | ||
33 | # [5.4.0-beta.3](https://github.com/meetfranz/franz/compare/v5.4.0-beta.2...v5.4.0-beta.3) (2019-10-22) | 33 | - Enable todos for all users |
34 | 34 | - Fix WhatsApp recipe not working (#19 and #21) | |
35 | ### Features | ||
36 | |||
37 | * **App Start:** Only load workspace related services ([ad7fb84](https://github.com/meetfranz/franz/commit/ad7fb84)) | ||
38 | |||
39 | |||
40 | ### Bug Fixes | ||
41 | |||
42 | * **Services:** Restore services after 10 minutes system suspension ([7f11dff](https://github.com/meetfranz/franz/commit/7f11dff)) | ||
43 | * **Workspaces:** Allow scrolling in Workspaces drawer ([5c1c0db](https://github.com/meetfranz/franz/commit/5c1c0db)) | ||
44 | * **Spell check:** fix(Spell checker): Fix disable spell checker ([@vantezzen](https://github.com/vantezzen)) | ||
45 | ([691e0cf](https://github.com/meetfranz/franz/commit/691e0cf)) | ||
46 | |||
47 | ### General | ||
48 | |||
49 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | ||
50 | |||
51 | |||
52 | |||
53 | # [5.4.0-beta.2](https://github.com/meetfranz/franz/compare/v5.4.0-beta.1...v5.4.0-beta.2) (2019-10-04) | ||
54 | |||
55 | |||
56 | ### Bug Fixes | ||
57 | |||
58 | * **App:** Fix service issue that crashes the app | ||
59 | |||
60 | |||
61 | # [5.4.0-beta.1](https://github.com/meetfranz/franz/compare/v5.3.3...v5.4.0-beta.1) (2019-10-04) | ||
62 | |||
63 | ### Features | ||
64 | |||
65 | * **Custom Websites:** Added navigation bar for "Custom Website" service ([f8fbaad](https://github.com/meetfranz/franz/commit/f8fbaad)) | ||
66 | * **Mac:** Open Franz window with `Cmd+1` ([71831ec](https://github.com/meetfranz/franz/commit/71831ec)) | ||
67 | * **Todos:** Allow Franz Todos to open links in browser ([5ba6723](https://github.com/meetfranz/franz/commit/5ba6723)) | ||
68 | * **Service API:** Share `team`, `url` and `hasCustomIcon` with service ([9f4f3e7](https://github.com/meetfranz/franz/commit/9f4f3e7)) | ||
69 | |||
70 | |||
71 | |||
72 | ### Bug Fixes | ||
73 | |||
74 | * **App:** Fix "Paste And Match Style" ([490a988](https://github.com/meetfranz/franz/commit/490a988)) | ||
75 | * **macOS:** Only show services in Touch Bar that should be visible ([077ad22](https://github.com/meetfranz/franz/commit/077ad22)) | ||
76 | * **Service Proxies:** Fix proxy setting rehydration ([e2126a6](https://github.com/meetfranz/franz/commit/e2126a6)) | ||
77 | * **Settings:** Fix cache size calculation after clearing cache ([a31566d](https://github.com/meetfranz/franz/commit/a31566d)) | ||
78 | * **Spell check:** Fix spell checker to initialize without loaded dictionary ([734732f](https://github.com/meetfranz/franz/commit/734732f)) | ||
79 | * **Spell check:** Fix "undefined" language in context menu ([cc03883](https://github.com/meetfranz/franz/commit/cc03883)) | ||
80 | * **App:** Fix Basic Auth overlay background in Dark Mode ([027e50d](https://github.com/meetfranz/franz/commit/027e50d)) | ||
81 | |||
82 | ### General | ||
83 | |||
84 | * **App:** Updated electron to 6.0.11 ([34aab68](https://github.com/meetfranz/franz/commit/34aab68)) | ||
85 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | ||
86 | |||
87 | |||
88 | |||
89 | # [5.3.3](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.3) (2019-09-17) | ||
90 | |||
91 | ### Features | ||
92 | * **Todos:** Highlight Franz Todos icon in sidebar when the Franz Todos panel is opened ([7431ba3](https://github.com/meetfranz/franz/commit/7431ba3)) | ||
93 | |||
94 | 35 | ||
95 | ### Bug Fixes | 36 | ### Bug Fixes |
96 | 37 | ||
97 | * **Spellchecker:** Fix disabling spellchecker after app start ([4035043](https://github.com/meetfranz/franz/commit/4035043)) | 38 | * **Windows:** Fix app size in fullscreen ([e210701](https://github.com/getferdi/ferdi/commit/e210701)) |
98 | * **Windows:** Fix window menu to get overwritten by Todos menu ([aa33ac7](https://github.com/meetfranz/franz/commit/aa33ac7)) | 39 | * **Windows:** Fix app to be cropped at the bottom on Windows ([42f97b4](https://github.com/getferdi/ferdi/commit/42f97b4)) |
99 | |||
100 | |||
101 | ### General | ||
102 | |||
103 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | ||
104 | |||
105 | |||
106 | # [5.3.2](https://github.com/meetfranz/franz/compare/v5.3.1...v5.3.2) (2019-09-12) | ||
107 | 40 | ||
108 | 41 | ||
109 | ### Features | 42 | ### Features |
110 | 43 | ||
111 | * **Todos:** Move Franz Todos to sidebar ([7ffcf8c](https://github.com/meetfranz/franz/commit/7ffcf8c)) | 44 | * **Todos:** Add option to disable todos ([5d03b91](https://github.com/getferdi/ferdi/commit/5d03b91)) |
112 | * **Workspaces:** Add setting to keep all services in workspaces in background (avoid reload) ([@Wouter0100](https://github.com/Wouter0100)) ([ddab3a8](https://github.com/meetfranz/franz/commit/ddab3a8)) | ||
113 | |||
114 | |||
115 | ### Bug Fixes | ||
116 | |||
117 | * **Settings:** Don't toggle Franz Todos on general settings changes ([@vantezzen](https://github.com/vantezzen)) ([a99371b](https://github.com/meetfranz/franz/commit/a99371b)) | ||
118 | |||
119 | |||
120 | ### General | ||
121 | |||
122 | * **Translations:** Improved translations. **[A million thanks to the amazing community. 🎉](http://i18n.meetfranz.com/)** | ||
123 | 45 | ||
124 | 46 | ||
47 | ## [5.3.0](https://github.com/getferdi/ferdi/compare/v5.2.1-beta.1...v5.3.0) (2019-09-06) | ||
48 | - Removes pages begging you to donate after registration | ||
49 | - Makes all users Premium by default | ||
50 | - [Add option to change server to a custom](https://github.com/getferdi/ferdi#servers) [ferdi-server](https://github.com/getferdi/server) | ||
51 | - Remove "Franz is better together" popup | ||
52 | - Makes RocketChat self-hosted generally available | ||
53 | - Comes with a custom branding proper to Ferdi | ||
125 | 54 | ||
126 | # [5.3.1](https://github.com/meetfranz/franz/compare/v5.3.0...v5.3.1) (2019-09-06) | 55 | ## [5.2.1-beta.1](https://github.com/meetfranz/franz/compare/v5.2.0...v5.2.1-beta.1) (2019-07-30) |
127 | 56 | ||
128 | ### Features | 57 | ### Features |
129 | 58 | ||
@@ -252,7 +181,7 @@ | |||
252 | * **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a)) | 181 | * **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a)) |
253 | * **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e)) | 182 | * **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e)) |
254 | * **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325)) | 183 | * **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325)) |
255 | * **Windows:** Add option to quit Franz from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b)) | 184 | * **Windows:** Add option to quit Ferdi from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b)) |
256 | 185 | ||
257 | ### Bug Fixes | 186 | ### Bug Fixes |
258 | 187 | ||
@@ -261,7 +190,7 @@ | |||
261 | * **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59)) | 190 | * **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59)) |
262 | * **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342)) | 191 | * **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342)) |
263 | * **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316) | 192 | * **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316) |
264 | * **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) | 193 | * **Windows:** Fix losing window when "Keep Ferdi in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) |
265 | 194 | ||
266 | ### General | 195 | ### General |
267 | 196 | ||
@@ -278,7 +207,7 @@ | |||
278 | ### Features | 207 | ### Features |
279 | 208 | ||
280 | * **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171)) | 209 | * **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171)) |
281 | * **Windows:** Add option to quit Franz from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601)) | 210 | * **Windows:** Add option to quit Ferdi from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601)) |
282 | 211 | ||
283 | ### Bug Fixes | 212 | ### Bug Fixes |
284 | 213 | ||
@@ -360,7 +289,7 @@ | |||
360 | 289 | ||
361 | ### Features | 290 | ### Features |
362 | 291 | ||
363 | * **Windows:** Add taskbar action to reset Franz window ([08fa75a](https://github.com/meetfranz/franz/commit/08fa75a)) | 292 | * **Windows:** Add taskbar action to reset Ferdi window ([08fa75a](https://github.com/meetfranz/franz/commit/08fa75a)) |
364 | * **Context Menu:** Add "Go Back" and "Go Forward" ([5c18595](https://github.com/meetfranz/franz/commit/5c18595)) | 293 | * **Context Menu:** Add "Go Back" and "Go Forward" ([5c18595](https://github.com/meetfranz/franz/commit/5c18595)) |
365 | * **Context Menu:** Add Lookup, Search Google for ([5d5aa0c](https://github.com/meetfranz/franz/commit/5d5aa0c)) | 294 | * **Context Menu:** Add Lookup, Search Google for ([5d5aa0c](https://github.com/meetfranz/franz/commit/5d5aa0c)) |
366 | * **App:** Add `--devtools` command line arg to automatically open Dev Tools ([84fc3a0](https://github.com/meetfranz/franz/commit/84fc3a0)) | 295 | * **App:** Add `--devtools` command line arg to automatically open Dev Tools ([84fc3a0](https://github.com/meetfranz/franz/commit/84fc3a0)) |
@@ -455,7 +384,7 @@ | |||
455 | 384 | ||
456 | * **App:** Fix memory leak in recipe polling loop ([c99848f](https://github.com/meetfranz/franz/commit/c99848f)) | 385 | * **App:** Fix memory leak in recipe polling loop ([c99848f](https://github.com/meetfranz/franz/commit/c99848f)) |
457 | * **App:** Fix validation for side-by-side teamId & customURL ([bd51150](https://github.com/meetfranz/franz/commit/bd51150)) | 386 | * **App:** Fix validation for side-by-side teamId & customURL ([bd51150](https://github.com/meetfranz/franz/commit/bd51150)) |
458 | * **App:** Reload Franz instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af)) | 387 | * **App:** Reload Ferdi instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af)) |
459 | * **App:** Fix toggle buttons shown during import ([1220e2c](https://github.com/meetfranz/franz/commit/1220e2c)) | 388 | * **App:** Fix toggle buttons shown during import ([1220e2c](https://github.com/meetfranz/franz/commit/1220e2c)) |
460 | fix(App): Bugfix Fix memory leak in recipe polling loop | 389 | fix(App): Bugfix Fix memory leak in recipe polling loop |
461 | * **App:** Fix invite screen [object Object] values ([81c4e99](https://github.com/meetfranz/franz/commit/81c4e99)) | 390 | * **App:** Fix invite screen [object Object] values ([81c4e99](https://github.com/meetfranz/franz/commit/81c4e99)) |
@@ -546,7 +475,7 @@ fix(App): Bugfix Fix memory leak in recipe polling loop | |||
546 | 475 | ||
547 | ### Features | 476 | ### Features |
548 | 477 | ||
549 | * **Menu:** Add "About Franz" Menu item to Windows/Linux ([a21b770](https://github.com/meetfranz/franz/commit/a21b770)) | 478 | * **Menu:** Add "About Ferdi" Menu item to Windows/Linux ([a21b770](https://github.com/meetfranz/franz/commit/a21b770)) |
550 | * **Menu:** Add menu item to toggle (service) dev tools ([e8da383](https://github.com/meetfranz/franz/commit/e8da383)) | 479 | * **Menu:** Add menu item to toggle (service) dev tools ([e8da383](https://github.com/meetfranz/franz/commit/e8da383)) |
551 | * **Translation:** Add italian translation ([ab348cc](https://github.com/meetfranz/franz/commit/ab348cc)) ([dnlup](https://github.com/dnlup)) | 480 | * **Translation:** Add italian translation ([ab348cc](https://github.com/meetfranz/franz/commit/ab348cc)) ([dnlup](https://github.com/dnlup)) |
552 | 481 | ||
@@ -554,8 +483,8 @@ fix(App): Bugfix Fix memory leak in recipe polling loop | |||
554 | ### Bug Fixes | 483 | ### Bug Fixes |
555 | 484 | ||
556 | * **App:** Add checks to service url validation to prevent app freeze ([db8515f](https://github.com/meetfranz/franz/commit/db8515f)) | 485 | * **App:** Add checks to service url validation to prevent app freeze ([db8515f](https://github.com/meetfranz/franz/commit/db8515f)) |
557 | * **macOS:** Fix disable launch Franz on start ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) | 486 | * **macOS:** Fix disable launch Ferdi on start ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) |
558 | * **Windows:** Launch Franz on start when selected ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) | 487 | * **Windows:** Launch Ferdi on start when selected ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) |
559 | * **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d)) | 488 | * **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d)) |
560 | * **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923)) | 489 | * **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923)) |
561 | * **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a)) | 490 | * **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a)) |
@@ -585,10 +514,10 @@ e58f558)) ([GustavoKatel](https://github.com/GustavoKatel)) | |||
585 | 514 | ||
586 | ### Bug Fixes | 515 | ### Bug Fixes |
587 | 516 | ||
588 | * **App:** Force Franz to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)) | 517 | * **App:** Force Ferdi to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)) |
589 | * **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9)) | 518 | * **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9)) |
590 | * **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01)) | 519 | * **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01)) |
591 | * **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614)) | 520 | * **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614)) |
592 | * **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1)) | 521 | * **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1)) |
593 | * **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b)) | 522 | * **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b)) |
594 | * **Windows:** Fix multiple system tray icons when opening/closing Franz ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7)) | 523 | * **Windows:** Fix multiple system tray icons when opening/closing Ferdi ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7)) |