Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#1522, #1518 #455

Merged
merged 20 commits into from
Oct 14, 2024
Merged

#1522, #1518 #455

merged 20 commits into from
Oct 14, 2024

Conversation

matej-vavrek
Copy link
Contributor

No description provided.

boriskovar-m2ms and others added 19 commits July 31, 2024 13:59
@boriskovar-m2ms
Squashed commit of the following:
d651036 
commit e613216
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jul 31 13:57:02 2024 +0200

    - implemented #1251
@matej-vavrek
#1482 added TagName and CentroidRes columns for expanded view of obse…
8817d77 
…rvation dialog
@matej-vavrek
#1489 show warning toast message if is defined on target load
6af83d0
@matej-vavrek
#1322 added longcode column
5db8ab0
@matej-vavrek
updated general function for tag comparison
c7c010d
@boriskovar-m2ms
Merge branch 'staging' into stagingcandidate
63d44d6
@matej-vavrek
#1505 adjusted getting of centroid_res
1b24e2a
@matej-vavrek
#1458 allow to tag XCA sites, temp commit
fc9cd3e 
# Conflicts:
#	js/components/preview/molecule/observationsDialog.js
@matej-vavrek
#1458 adjusted functionality and styling to proper change tag
449eaa6
@matej-vavrek
#1508 removed TagName column in expanded observation dialog, changed …
7193616 
…order of columns, adjusted labels and tooltips, show observation dialog in its full height
@matej-vavrek
Merge branch 'staging' into stagingcandidate
da9ea84
@matej-vavrek
#1508 adjusted column order and width calculation
12f8391
@matej-vavrek
Merge branch 'staging' into stagingcandidate
f812106
@matej-vavrek
#1501 added upload links to menu
e6b563b
@matej-vavrek
#1520 show tag alias instead of upload_name on hit navigator CanonSit…
b24340d 
…es & ConformerSites box tooltip
@matej-vavrek
#1519 keep tag in edit window after save
dedd836
@matej-vavrek
#1497 added Path column for extended view of observations
238b5c2
@matej-vavrek
#1518 properly remove tag from list after updating its object
cdbb897
@matej-vavrek
#1522 allow to change XCA tags for selections but not for CanonSite
37b885d
@mwinokan mwinokan self-requested a review October 10, 2024 11:15
@mwinokan mwinokan merged commit 63fa397 into xchem:staging Oct 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwinokan mwinokan mwinokan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@matej-vavrek @mwinokan @boriskovar-m2ms