diff --git a/commafeed-client/src/app/slices/user.ts b/commafeed-client/src/app/slices/user.ts index dacb5fc4..b495135b 100644 --- a/commafeed-client/src/app/slices/user.ts +++ b/commafeed-client/src/app/slices/user.ts @@ -102,6 +102,17 @@ export const changeMarkAllAsReadConfirmation = createAsyncThunk< if (!settings) return client.user.saveSettings({ ...settings, markAllAsReadConfirmation }) }) +export const changeCustomContextMenu = createAsyncThunk< + void, + boolean, + { + state: RootState + } +>("settings/customContextMenu", (customContextMenu, thunkApi) => { + const { settings } = thunkApi.getState().user + if (!settings) return + client.user.saveSettings({ ...settings, customContextMenu }) +}) export const changeSharingSetting = createAsyncThunk< void, { site: keyof SharingSettings; value: boolean }, @@ -166,6 +177,10 @@ export const userSlice = createSlice({ if (!state.settings) return state.settings.markAllAsReadConfirmation = action.meta.arg }) + builder.addCase(changeCustomContextMenu.pending, (state, action) => { + if (!state.settings) return + state.settings.customContextMenu = action.meta.arg + }) builder.addCase(changeSharingSetting.pending, (state, action) => { if (!state.settings) return state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value @@ -178,6 +193,7 @@ export const userSlice = createSlice({ changeScrollMarks.fulfilled, changeAlwaysScrollToEntry.fulfilled, changeMarkAllAsReadConfirmation.fulfilled, + changeCustomContextMenu.fulfilled, changeSharingSetting.fulfilled ), () => { diff --git a/commafeed-client/src/app/types.ts b/commafeed-client/src/app/types.ts index 8b134bf2..c4900b0a 100644 --- a/commafeed-client/src/app/types.ts +++ b/commafeed-client/src/app/types.ts @@ -203,6 +203,7 @@ export interface Settings { scrollSpeed: number alwaysScrollToEntry: boolean markAllAsReadConfirmation: boolean + customContextMenu: boolean sharingSettings: SharingSettings } diff --git a/commafeed-client/src/components/content/FeedEntries.tsx b/commafeed-client/src/components/content/FeedEntries.tsx index 0a001ce8..ed4e580f 100644 --- a/commafeed-client/src/components/content/FeedEntries.tsx +++ b/commafeed-client/src/components/content/FeedEntries.tsx @@ -34,6 +34,7 @@ export function FeedEntries() { const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks) const scrollingToEntry = useAppSelector(state => state.entries.scrollingToEntry) const sidebarVisible = useAppSelector(state => state.tree.sidebarVisible) + const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu) const { viewMode } = useViewMode() const dispatch = useAppDispatch() const { openLinkInBackgroundTab } = useBrowserExtension() @@ -62,7 +63,7 @@ export function FeedEntries() { const contextMenu = useContextMenu() const headerRightClicked = (entry: ExpendableEntry, event: React.MouseEvent) => { - if (event.shiftKey) return + if (event.shiftKey || !customContextMenu) return event.preventDefault() contextMenu.show({ diff --git a/commafeed-client/src/components/settings/DisplaySettings.tsx b/commafeed-client/src/components/settings/DisplaySettings.tsx index 0cf529af..8d0746fe 100644 --- a/commafeed-client/src/components/settings/DisplaySettings.tsx +++ b/commafeed-client/src/components/settings/DisplaySettings.tsx @@ -3,6 +3,7 @@ import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core" import { Constants } from "app/constants" import { changeAlwaysScrollToEntry, + changeCustomContextMenu, changeLanguage, changeMarkAllAsReadConfirmation, changeScrollMarks, @@ -21,6 +22,7 @@ export function DisplaySettings() { const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks) const alwaysScrollToEntry = useAppSelector(state => state.user.settings?.alwaysScrollToEntry) const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation) + const customContextMenu = useAppSelector(state => state.user.settings?.customContextMenu) const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings) const dispatch = useAppDispatch() @@ -66,6 +68,12 @@ export function DisplaySettings() { onChange={e => dispatch(changeMarkAllAsReadConfirmation(e.currentTarget.checked))} /> + Show CommaFeed's own context menu on right click} + checked={customContextMenu} + onChange={e => dispatch(changeCustomContextMenu(e.currentTarget.checked))} + /> + Sharing sites} labelPosition="center" /> diff --git a/commafeed-client/src/locales/ar/messages.po b/commafeed-client/src/locales/ar/messages.po index 4ea7e775..f60cb4c3 100644 --- a/commafeed-client/src/locales/ar/messages.po +++ b/commafeed-client/src/locales/ar/messages.po @@ -727,6 +727,10 @@ msgstr "مشاركة المواقع" msgid "Shift" msgstr "الحلقة" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/ca/messages.po b/commafeed-client/src/locales/ca/messages.po index 79e986ef..8be67ae6 100644 --- a/commafeed-client/src/locales/ca/messages.po +++ b/commafeed-client/src/locales/ca/messages.po @@ -727,6 +727,10 @@ msgstr "Compartir llocs" msgid "Shift" msgstr "canvi" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/cs/messages.po b/commafeed-client/src/locales/cs/messages.po index 1e72d23d..8cc08355 100644 --- a/commafeed-client/src/locales/cs/messages.po +++ b/commafeed-client/src/locales/cs/messages.po @@ -727,6 +727,10 @@ msgstr "Stránky pro sdílení" msgid "Shift" msgstr "Směna" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/cy/messages.po b/commafeed-client/src/locales/cy/messages.po index ff6a2cf4..06e0c18f 100644 --- a/commafeed-client/src/locales/cy/messages.po +++ b/commafeed-client/src/locales/cy/messages.po @@ -727,6 +727,10 @@ msgstr "Rhannu gwefannau" msgid "Shift" msgstr "shifft" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/da/messages.po b/commafeed-client/src/locales/da/messages.po index d525a290..028dc04d 100644 --- a/commafeed-client/src/locales/da/messages.po +++ b/commafeed-client/src/locales/da/messages.po @@ -727,6 +727,10 @@ msgstr "Delingssider" msgid "Shift" msgstr "Skift" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/de/messages.po b/commafeed-client/src/locales/de/messages.po index e2f3fc8a..8fe58078 100644 --- a/commafeed-client/src/locales/de/messages.po +++ b/commafeed-client/src/locales/de/messages.po @@ -727,6 +727,10 @@ msgstr "Seiten teilen" msgid "Shift" msgstr "Verschiebung" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/en/messages.po b/commafeed-client/src/locales/en/messages.po index fcaaee1e..4f7c0fb1 100644 --- a/commafeed-client/src/locales/en/messages.po +++ b/commafeed-client/src/locales/en/messages.po @@ -727,6 +727,10 @@ msgstr "Sharing sites" msgid "Shift" msgstr "Shift" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "Show CommaFeed's own context menu on right click" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "Show confirmation when marking all entries as read" diff --git a/commafeed-client/src/locales/es/messages.po b/commafeed-client/src/locales/es/messages.po index 5359ab70..8c270b16 100644 --- a/commafeed-client/src/locales/es/messages.po +++ b/commafeed-client/src/locales/es/messages.po @@ -727,6 +727,10 @@ msgstr "Compartir sitios" msgid "Shift" msgstr "Cambio" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/fa/messages.po b/commafeed-client/src/locales/fa/messages.po index 05a75d4a..733fe248 100644 --- a/commafeed-client/src/locales/fa/messages.po +++ b/commafeed-client/src/locales/fa/messages.po @@ -727,6 +727,10 @@ msgstr "اشتراک گذاری سایت ها" msgid "Shift" msgstr "شیفت" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/fi/messages.po b/commafeed-client/src/locales/fi/messages.po index 1bc85e34..2cf170bf 100644 --- a/commafeed-client/src/locales/fi/messages.po +++ b/commafeed-client/src/locales/fi/messages.po @@ -727,6 +727,10 @@ msgstr "Sivustojen jakaminen" msgid "Shift" msgstr "Vaihto" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/fr/messages.po b/commafeed-client/src/locales/fr/messages.po index f52b7f34..555b2210 100644 --- a/commafeed-client/src/locales/fr/messages.po +++ b/commafeed-client/src/locales/fr/messages.po @@ -727,6 +727,10 @@ msgstr "Sites de partage" msgid "Shift" msgstr "Maj" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/gl/messages.po b/commafeed-client/src/locales/gl/messages.po index 49471bf7..841559ed 100644 --- a/commafeed-client/src/locales/gl/messages.po +++ b/commafeed-client/src/locales/gl/messages.po @@ -727,6 +727,10 @@ msgstr "Compartir sitios" msgid "Shift" msgstr "quendas" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/hu/messages.po b/commafeed-client/src/locales/hu/messages.po index 7ff3eb7e..c50a619b 100644 --- a/commafeed-client/src/locales/hu/messages.po +++ b/commafeed-client/src/locales/hu/messages.po @@ -727,6 +727,10 @@ msgstr "Webhelyek megosztása" msgid "Shift" msgstr "" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/id/messages.po b/commafeed-client/src/locales/id/messages.po index 207c39d5..3a81ab27 100644 --- a/commafeed-client/src/locales/id/messages.po +++ b/commafeed-client/src/locales/id/messages.po @@ -727,6 +727,10 @@ msgstr "Berbagi situs" msgid "Shift" msgstr "Pergeseran" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/it/messages.po b/commafeed-client/src/locales/it/messages.po index 4547b6bf..069b5e26 100644 --- a/commafeed-client/src/locales/it/messages.po +++ b/commafeed-client/src/locales/it/messages.po @@ -727,6 +727,10 @@ msgstr "Condivisione di siti" msgid "Shift" msgstr "Cambio" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/ja/messages.po b/commafeed-client/src/locales/ja/messages.po index 33b51289..b7f53d0d 100644 --- a/commafeed-client/src/locales/ja/messages.po +++ b/commafeed-client/src/locales/ja/messages.po @@ -727,6 +727,10 @@ msgstr "共有サイト" msgid "Shift" msgstr "シフト" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/ko/messages.po b/commafeed-client/src/locales/ko/messages.po index bc4f1e40..29d6eee4 100644 --- a/commafeed-client/src/locales/ko/messages.po +++ b/commafeed-client/src/locales/ko/messages.po @@ -727,6 +727,10 @@ msgstr "사이트 공유" msgid "Shift" msgstr "시프트" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/ms/messages.po b/commafeed-client/src/locales/ms/messages.po index f3bedf9e..7a243a52 100644 --- a/commafeed-client/src/locales/ms/messages.po +++ b/commafeed-client/src/locales/ms/messages.po @@ -727,6 +727,10 @@ msgstr "Berkongsi tapak" msgid "Shift" msgstr "Anjakan" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/nb/messages.po b/commafeed-client/src/locales/nb/messages.po index 36fa20a9..68f0eaee 100644 --- a/commafeed-client/src/locales/nb/messages.po +++ b/commafeed-client/src/locales/nb/messages.po @@ -727,6 +727,10 @@ msgstr "Delingssider" msgid "Shift" msgstr "Skift" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/nl/messages.po b/commafeed-client/src/locales/nl/messages.po index 696e8710..b74b274b 100644 --- a/commafeed-client/src/locales/nl/messages.po +++ b/commafeed-client/src/locales/nl/messages.po @@ -727,6 +727,10 @@ msgstr "Sites delen" msgid "Shift" msgstr "" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/nn/messages.po b/commafeed-client/src/locales/nn/messages.po index 520cd667..5ce98ba8 100644 --- a/commafeed-client/src/locales/nn/messages.po +++ b/commafeed-client/src/locales/nn/messages.po @@ -727,6 +727,10 @@ msgstr "Delingssider" msgid "Shift" msgstr "Skift" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/pl/messages.po b/commafeed-client/src/locales/pl/messages.po index 207096ad..f7831058 100644 --- a/commafeed-client/src/locales/pl/messages.po +++ b/commafeed-client/src/locales/pl/messages.po @@ -727,6 +727,10 @@ msgstr "Udostępnianie witryn" msgid "Shift" msgstr "zmiana" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/pt/messages.po b/commafeed-client/src/locales/pt/messages.po index 515f4e08..a5338402 100644 --- a/commafeed-client/src/locales/pt/messages.po +++ b/commafeed-client/src/locales/pt/messages.po @@ -727,6 +727,10 @@ msgstr "Compartilhando sites" msgid "Shift" msgstr "Mudar" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/ru/messages.po b/commafeed-client/src/locales/ru/messages.po index a97fbd66..09c13fbb 100644 --- a/commafeed-client/src/locales/ru/messages.po +++ b/commafeed-client/src/locales/ru/messages.po @@ -727,6 +727,10 @@ msgstr "Обмен сайтами" msgid "Shift" msgstr "Сдвиг" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/sk/messages.po b/commafeed-client/src/locales/sk/messages.po index f14c2e9f..d7e8be3a 100644 --- a/commafeed-client/src/locales/sk/messages.po +++ b/commafeed-client/src/locales/sk/messages.po @@ -727,6 +727,10 @@ msgstr "Zdieľanie stránok" msgid "Shift" msgstr "Smena" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/sv/messages.po b/commafeed-client/src/locales/sv/messages.po index 5648f351..941142e5 100644 --- a/commafeed-client/src/locales/sv/messages.po +++ b/commafeed-client/src/locales/sv/messages.po @@ -727,6 +727,10 @@ msgstr "Delningssajter" msgid "Shift" msgstr "Skift" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/tr/messages.po b/commafeed-client/src/locales/tr/messages.po index 866db33b..e32e9607 100644 --- a/commafeed-client/src/locales/tr/messages.po +++ b/commafeed-client/src/locales/tr/messages.po @@ -727,6 +727,10 @@ msgstr "Siteleri paylaşma" msgid "Shift" msgstr "Vardiya" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-client/src/locales/zh/messages.po b/commafeed-client/src/locales/zh/messages.po index 67a95086..fa70f6cd 100644 --- a/commafeed-client/src/locales/zh/messages.po +++ b/commafeed-client/src/locales/zh/messages.po @@ -727,6 +727,10 @@ msgstr "共享站点" msgid "Shift" msgstr "换档" +#: src/components/settings/DisplaySettings.tsx +msgid "Show CommaFeed's own context menu on right click" +msgstr "" + #: src/components/settings/DisplaySettings.tsx msgid "Show confirmation when marking all entries as read" msgstr "" diff --git a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java index 1ee4e46a..04eb1fd3 100644 --- a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java +++ b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java @@ -67,6 +67,7 @@ public class UserSettings extends AbstractModel { private boolean alwaysScrollToEntry; private boolean markAllAsReadConfirmation; + private boolean customContextMenu; private boolean email; private boolean gmail; diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java index 3902e4f5..9b442d8a 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java @@ -41,6 +41,9 @@ public class Settings implements Serializable { @ApiModelProperty(value = "ask for confirmation when marking all entries as read", required = true) private boolean markAllAsReadConfirmation; + @ApiModelProperty(value = "show commafeed's own context menu on right click", required = true) + private boolean customContextMenu; + @ApiModelProperty(value = "sharing settings", required = true) private SharingSettings sharingSettings = new SharingSettings(); diff --git a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java index d2c738b7..89ebffa0 100644 --- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java +++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java @@ -105,6 +105,7 @@ public class UserREST { s.setScrollSpeed(settings.getScrollSpeed()); s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry()); s.setMarkAllAsReadConfirmation(settings.isMarkAllAsReadConfirmation()); + s.setCustomContextMenu(settings.isCustomContextMenu()); } else { s.setReadingMode(ReadingMode.unread.name()); s.setReadingOrder(ReadingOrder.desc.name()); @@ -124,6 +125,7 @@ public class UserREST { s.setScrollSpeed(400); s.setAlwaysScrollToEntry(false); s.setMarkAllAsReadConfirmation(true); + s.setCustomContextMenu(true); } return Response.ok(s).build(); } @@ -151,6 +153,7 @@ public class UserREST { s.setScrollSpeed(settings.getScrollSpeed()); s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry()); s.setMarkAllAsReadConfirmation(settings.isMarkAllAsReadConfirmation()); + s.setCustomContextMenu(settings.isCustomContextMenu()); s.setEmail(settings.getSharingSettings().isEmail()); s.setGmail(settings.getSharingSettings().isGmail()); diff --git a/commafeed-server/src/main/resources/changelogs/db.changelog-3.9.xml b/commafeed-server/src/main/resources/changelogs/db.changelog-3.9.xml index ddf05466..83ce42b0 100644 --- a/commafeed-server/src/main/resources/changelogs/db.changelog-3.9.xml +++ b/commafeed-server/src/main/resources/changelogs/db.changelog-3.9.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd"> @@ -11,4 +11,12 @@ + + + + + + + +