Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Merge remote-tracking branch 'origin/develop' into devnext

Stanimirfe0c6bd2702a
diff --cc app/components/Search.tsx
index 843d79716,bc0a290fb..898c58ee2
--- a/app/components/Search.tsx
+++ b/app/components/Search.tsx
@@@ -73,8 -72,8 +72,8 @@@ import { FileTypeGroups } from '-/servi
import { Pro } from '../pro';
import SearchMenu from './menus/SearchMenu';
import { formatDateTime, extractTimePeriod } from '-/utils/dates';
- import { isPlusCode, parseLatLon } from '-/utils/misc';
+ import { parseGeoLocation, parseLatLon } from '-/utils/misc';
-import { AppConfig } from '-/config';
+import AppConfig from '-/config';
import { actions as SearchActions, getSearches } from '-/reducers/searches';
import { TS } from '-/tagspaces.namespace';
import { ProLabel, BetaLabel, ProTooltip } from '-/components/HelperComponents';
diff --cc app/components/dialogs/EditEntryTagDialog.tsx
index 51814728f,1499129bd..58117d804
--- a/app/components/dialogs/EditEntryTagDialog.tsx
+++ b/app/components/dialogs/EditEntryTagDialog.tsx
@@@ -30,12 -30,12 +30,12 @@@ import FormControl from '@material-ui/c
import FormHelperText from '@material-ui/core/FormHelperText';
import Dialog from '@material-ui/core/Dialog';
import i18n from '-/services/i18n';
- import { isPlusCode } from '-/utils/misc';
+ import { isGeoTag } from '-/utils/misc';
import { Pro } from '-/pro';
import { getSelectedEntries, getSelectedTag } from '-/reducers/app';
- import TaggingActions, { defaultTagLocation } from '-/reducers/tagging-actions';
+ import TaggingActions from '-/reducers/tagging-actions';
import { isDateTimeTag } from '-/utils/dates';
-import { AppConfig } from '-/config';
+import AppConfig from '-/config';
import { TS } from '-/tagspaces.namespace';
import useValidation from '-/utils/useValidation';
import { getMapTileServer } from '-/reducers/settings';
diff --cc package.json
index 31aa0fcd3,8e2f43579..e96259045
--- a/package.json
+++ b/package.json
@@@ -292,6 -277,8 +292,7 @@@
"jszip": "^3.1.5",
"leaflet": "^1.7.1",
"marked": "^2.0.1",
+ "mgrs": "^1.0.0",
- "micromatch": "^4.0.4",
"open-location-code": "^1.0.3",
"open-location-code-typescript": "^1.5.0",
"path": "^0.12.7",