hluk / CopyQ

74%

master: 78%

LAST BUILD ON BRANCH fix-sync-notes-conflict

branch: fix-sync-notes-conflict

CHANGE BRANCH

x

Reset

• fix-sync-notes-conflict
• ''
• HEAD
• QKeySequenceEdit
• accept-reject-drop
• access-selection-in-all-commands
• add-load-theme
• add-menu-items-function
• add-move-function
• add-pointer-position
• add-tests
• add-unofficial-language-to-inno-setup
• allow-processing-secret-clipboard
• always-show-advanced
• android
• animated-images
• app-icon
• appveyor-mingw
• appveyor-setup-file
• appveyor-tests
• appveyor-update
• appveyor-upgrade
• auto-update-internal-commands
• autostart-switch
• avoid-modifying-data-in-display-commands
• avoid-pasting-internal-formats
• avoid-reading-all-files
• avoid-repeated-onExit
• avoid-waiting-onItemsLoaded
• bump_kf5
• cache-app-icons
• callbacks
• cancel-item-removal-from-script
• clang-fixes
• clazy
• clazy-fixes
• clean-tag-commands
• client-executable
• client-side-scripts
• clipboard-about-to-change-callback
• clipboard-access
• clipboard-owner-script
• clipboard_manager
• cmake-build-dir
• command-shortcuts-in-preferences
• command-widget-layout
• command_scriptables
• common-library
• compile-fixes
• consistent-ci
• convert-uri-to-text
• copyq-core-lib
• coverity
• css-files
• ctrl-space-selection
• custom-menu-icon-color
• custom-settings-path
• cxx11
• debian-12
• debian-qt4
• decouple_configuration
• default-icon
• delay-tray-icon
• deserialize-errors
• dialog-question-return-value
• disable-auto-run-sel
• disabled-plugin-commands
• display-commands-for-menu-items
• docs-update
• drop-qt-private-headers
• drop-tray-timer
• drop-version-prefix
• edit-other-formats
• edit-text-formats
• edit-valid-formats
• editor-custom-shortucts
• effective-preload
• encrypt-empty-tab
• encrypt-key-size
• event-handlers
• exceptions
• export-import-in-script
• extend-selection-start-or-end-only
• fakevim-osx-fix
• fakevim-update
• fast-add-many-items
• fast-change-many-items
• fast-move-items
• faster-clients
• faster-tests
• faster_tests
• filter-command-return-value
• find-gpg
• fix-about-dialog-icons
• fix-action
• fix-autoclose-notifications
• fix-base64-tab-file-load
• fix-buggy-frame-size
• fix-bytearray-convertion
• fix-clipboard-storing-menu-item
• fix-command
• fix-command-big-data
• fix-confirm-exit
• fix-content-dialog
• fix-copy-synced-image
• fix-copy-utf8-text
• fix-coveralls
• fix-creating-browser-at-start
• fix-crlf-command-indentation
• fix-data-size-label
• fix-decrypting-tabs
• fix-deleting-global
• fix-dialog-leak
• fix-disabling-default-shortcuts
• fix-doc-requirements
• fix-drag-move-items
• fix-editing-multiple-items
• fix-editor-text-color
• fix-execute
• fix-failing-osx
• fix-fakevim
• fix-filter-after-esc
• fix-flatpak
• fix-flatpak-autostart
• fix-font-selection
• fix-font-width
• fix-geometry
• fix-handling-internal-exceptions
• fix-hash
• fix-hash-compare
• fix-icon-color
• fix-icon-resolution
• fix-import-old
• fix-import-regex
• fix-importing-command-regex-values
• fix-inf-recursion
• fix-initial-item-size
• fix-inno-setup-install-dlls
• fix-install-paths
• fix-installer-lang
• fix-item-hover-css
• fix-item-order-lists
• fix-item-preview
• fix-item-sizes
• fix-itemencrypt
• fix-layout-direction
• fix-lists-properties
• fix-mac-bundle
• fix-mac-open-nonnative-tray-menu
• fix-mac-sleep
• fix-macos
• fix-macos-build
• fix-macos-paste
• fix-macos-tests
• fix-main-window-position
• fix-man-page-install-path
• fix-menu-filter
• fix-menu-filter-rerun
• fix-menu-theme
• fix-menu-trigger-row-number
• fix-minimum-dialog-size
• fix-monitor-scripts
• fix-move-test
• fix-move-to-tab
• fix-move-to-top
• fix-native-notifications
• fix-notification-font
• fix-notification-text-wrapping
• fix-notifyrc-config-path
• fix-onItemsLoaded-call
• fix-osx-app-activation-policy
• fix-osx-tests
• fix-passing-captures
• fix-preview-render
• fix-qpointer-to-qmimedata
• fix-qt-5.11
• fix-qt-5.11-build
• fix-qt6-qtwaylandscanner
• fix-qt6.5-build
• fix-qt6.5-generic-args
• fix-readthedocs
• fix-reget-x11-clipboard
• fix-remove-trailing-null
• fix-removing-actions
• fix-removing-commands-bakup
• fix-rendering
• fix-restore-geometry
• fix-restoring-search
• fix-scaling
• fix-screen-move
• fix-scrolling
• fix-search-closing
• fix-select-order
• fix-selected-row-number-color
• fix-selecting-search-row
• fix-set-tab-name
• fix-shortcut-button-list-width
• fix-shortcut-button-style
• fix-show-after-edit
• fix-showing-tray-shortcuts
• fix-socket-ids
• fix-sorting
• fix-storing-selection
• fix-storing-sync-clipboard
• fix-sync
• fix-sync-new-item
• fix-sync-update-item
• fix-sync-updates
• fix-synced-move-to-top
• fix-syntax-hl
• fix-tag-sync
• fix-test-automatic-commands
• fix-tests
• fix-tests-clipboard-monitoring
• fix-theme-change
• fix-theme-preview-crash
• fix-translation
• fix-tray-icon
• fix-tray-menu-appearance
• fix-tray-menu-duplicate-commands
• fix-tray-menu-initial-size
• fix-tray-search
• fix-tray-submenus
• fix-ubuntu
• fix-updates
• fix-updating-item-menu
• fix-vi-search
• fix-warnings
• fix-wayland-clipboard-crash
• fix-wayland-copy
• fix-wayland-nonown-clipboard
• fix-wayland-own-clipboard
• fix-wayland-selection-sync
• fix-wide-screen
• fix-win-gpg
• fix-win-install-path
• fix-win-tray-tooltip
• fix-window-geometry
• fix-window-geometry-restore
• fix-window-move
• fix-windows-paths
• fix-windows-style
• fix-windows-tray
• fix-windows-tray-icon
• fix-x11-global-shortcuts
• fix-x11-paste-delay
• fix-x11-paste-delay-2
• fix-x11-sync
• fix_capture_shortcut
• fix_osx
• fix_restore_window_geometry
• fix_shortcuts
• fix_tests
• fixes
• flatpak-colors
• focus-previous
• fontawesome5
• fosshub-script
• function-call-serialize
• generate-version-header
• geometry-fixes
• get-window-class-name
• github-actions
• github-issue-templates
• gitlab-ci-fixes
• global-application-shortcut
• hard-limit-notification-text-length
• hide-in-task-bar
• icon-cache
• ignore-password-manager-data
• ignore-password-manager-data-2
• images
• images_in_editor
• import-export
• import-key-before-decrypt
• improve-action-dialog
• improve-export
• improve-margins
• improve-messages
• improve-plugins
• improve-x11-clipboard-monitoring
• improvements
• increase-change_clipboard_owner_delay_ms
• increment-hide-unfocused-window-timer
• index-from-one
• inno-fix-close-app-2
• item-menus
• item-preload-2
• item_preview
• itemencrypted-tests
• itemsync-drop-duplicates
• itemsync-refactor
• kf5.81
• kf6-support
• knotifications
• larger-item-limit
• lazy-filtering
• limit-process-manager-rows
• list-config-with-values
• lock-file
• log
• logging
• m4r71n-patch-1
• m4r71n-patch-2
• mac-fix-getting-keyboard-layout
• mac-utf-bom
• macos-10.15-compat
• macos-build-time
• macos-fix-key-codes
• macos-fix-keyboard-layout-access
• macos-fix-tests
• macos-fix-version
• macos-install-step
• macos-m1
• macos-optional-native-tray-menu
• macos-support-lower-versions
• macos-window
• master
• merge-top-item
• meson
• mingw
• modify-menu-items
• monitor_rewrite
• monochrome-icon
• native-tray
• network-async
• new-signal-slots
• no_steal_focus
• non-editable-combo-in-dialog
• normalize-item-arguments
• normalize-tab-size
• normalized-search
• notes-beside-item
• number-search
• omit-restoring-geometry
• omit-saving-empty-data
• open-image-editor-if-needed
• optional-geometry-handling
• osx-add-global-shortcuts
• osx-build-fix
• osx-fix-build
• osx-fix-bundle-info
• osx-fix-clipboard-owner
• osx-fix-clipboard-provider
• osx-fix-close-button
• osx-fix-open-in-fullscreen
• osx-fix-paste-url
• osx-fix-search-up-down
• osx-leaks
• osx-menu-icons
• osx-omit-font-download
• osx-qt6
• osx-remove-unused
• osx-show-tray-menu
• osx-test
• osx-test-release
• osx-tests
• osx-tray-menu
• osx_deploy_always
• paste-fixes
• performance
• persistent-search
• pinned-items
• plugin-fixes
• portable-log
• pre-commit
• preview-scriptable
• qobject-leaks
• qpointer-workaround
• qt5
• qt5-scripting-3
• qt6
• qt6-text-encoding
• qtcurve-fix
• queue-input
• quicker-cache-update
• qxtglobalshortcut-update
• read-log-bytes
• refactor
• refactor-action-handler
• refactor-common
• refactor-creating-mime-data
• refactor-delegate
• refactor-item-editor
• refactor-item-matching
• refactor-perf
• refactor-sockets
• refactoring
• remove-command-testers
• remove-empty-actions-from-history
• remove-qmake
• remove-qt4
• remove-save-command-from-action-dialog
• remove-unuserd-arg
• remove_window_management
• rename-clipboard-tab
• repology-badge
• reset-state-on-hide
• restore-dialog-geometry
• restore-geometry-option
• safe-delete-menus
• safer-save-load-tab
• safer-save-load-tab-2
• safer-tab-save-load
• sanitize-html
• save-delays
• scaling-fixes
• script-2
• script-clipboard-changes
• script-console
• scriptable-clipboard-handling
• scriptable-item-selection
• scriptable-settings
• scripts
• scroll-completion
• search-and-copy
• search-browse
• search-history
• search-menu-notes
• search_tray
• separate-commands-config
• separate-shortcut-lists
• session-management
• session_management
• set-application-display-name
• set-precise-window-position
• set-tab-order-in-preferences
• shift-pastes-plain-text
• show-again-after-editor-closed
• show-global-shortcuts-in-menu
• simple-item-notes
• simple_geometry
• simple_window_management
• simpler-clipboard-set
• simpler-icons
• simpler-menu-filter-data
• simpler-settings-handling
• simplify-rendering
• single-click-with-selection
• single-or-double-click-activate
• small-fixes
• smarter-notifications
• snip-sometimes
• socket_refactor
• sonarcloud-fixes
• sort
• sphinx-docs
• stacktrace
• start-server
• store-automatic-command-input-format
• string-allocations
• sub-scripts
• sync-faster
• sync-move-to-top
• sync-order
• sync-performance
• sync-update-batch
• sync-watcher
• syntax-highlight-backticks
• tab-settings
• tabs-perf
• tags
• tags-improved
• test-copy-paste-commands
• test-executable
• test-log
• test-notification
• test-qt6
• testing
• text-item-margins
• text-item-style-sheet
• travis-fix-tags
• travis-tests
• tray-icon-snip
• tray-menu-commands-global
• ubuntu-latest
• unchanged-clipboard-callback
• unload-script-function
• untagged-ecd4b0d73ac9170ef5cf
• update
• update-appveyor
• update-certifi
• update-cmake
• update-fakevim
• update-icon-font
• update-kde-frameworks
• update-kframeworks
• update-preview-interval
• update-readme
• update-snoretoast
• update-wayland-clipboard
• updates
• use-spdx-license-headers
• utf8
• v2.1.0
• v2.2.0
• v2.3.0
• v2.4.0
• v2.4.1
• v2.4.2
• v2.4.3
• v2.4.4
• v2.4.5
• v2.4.6
• v2.4.7
• v2.4.8
• v2.4.9
• v2.5.0
• v2.6.0
• v2.6.1
• v2.7.0
• v2.7.1
• v2.8.0
• v2.8.1
• v2.8.1-beta-2-osx
• v2.8.1-beta-3-osx
• v2.8.1-beta-osx
• v2.8.2-beta-1
• v2.8.2-beta-2
• v2.8.2-beta-osx-global-shortcuts
• v2.8.3
• v2.9.0
• v3.0.0
• v3.0.1
• v3.0.2
• v3.0.3
• v3.1.0
• v3.1.1
• v3.1.2
• v3.10.0
• v3.11.0
• v3.11.1
• v3.12.0
• v3.13.0
• v3.2.0
• v3.3.0
• v3.3.1
• v3.4.0
• v3.5.0
• v3.6.0
• v3.6.1
• v3.7.0
• v3.7.1
• v3.7.2
• v3.7.2-beta-scroll-update-fix
• v3.7.3
• v3.7.3-beta-osx-fix-open-in-fullscreen
• v3.8.0
• v3.8.0-osx
• v3.9.0
• v3.9.1
• v3.9.2
• v3.9.3
• version-recompile-time
• version-sysinfo
• vertical-config-tabs
• wayland
• wayland-async-read-write
• wayland-clipboard
• wayland-clipboard-threaded
• wayland-clipboard-update
• wayland-fallback-clipboard
• wayland-fix-icon
• wayland-fix-sync
• wayland-refactor
• wayland-sync-clipboard
• wayland-update
• web-engine
• win-install-close-app
• win-install-close-app-force
• win-no-debug-symbols
• win-screenshots
• win-wait-for-mod-release
• win8-fixes
• window-focus-fixes
• window_position
• windows-32bit
• windows-clipboard-emit-interval
• windows-close-handler
• windows-delay-options
• windows-fix-blocked-modifiers
• windows-fix-terminate
• windows-fixes
• windows-focus-fix
• windows-install-pinned-items
• windows-no-kf5
• windows-older-qt
• windows-packaging
• windows-qt-5.12
• windows-qt-5.12.5
• windows-qt-5.15
• windows-qt-5.6
• windows-qt5.9
• windows-qt6
• windows-ssl
• windows-ssl-2
• windows-tls
• windows-translations
• windows-update-dependencies
• windows_command_fixes
• windows_fix_screen_number
• x11-clipboard-selection-improvements
• x11-disable-flag
• x11-fix-monitor-cpu
• x11-fix-numpad-shortcuts
• x11-fix-stuck-clipboard-access-2
• x11-fix-sync-check
• x11-refactor-clipboard-checks
• x11-simpler-sync
• x11-synchronous-clipboard-access
• x11-wayland-fix
• xwayland-fix-paste

Build # #3962

Build Type

Pull #2457

travis-ci

Committed by hluk

Commit Message

itemsync: Avoid conflicting notes and text

Fixes #2355

Pull Request Pull Request #2457: itemsync: Avoid conflicting notes and text

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

18366 of 24734 relevant lines covered (74.25%)

23030.62 hits per line