Commit graph

17361 commits

Author SHA1 Message Date
Martin Artnik
f64ea95989 Force ActiveStorage variant recreation when generating reports [SCI-10931] 2024-08-06 17:41:04 +02:00
aignatov-bio
76269a096c
Merge pull request #7785 from aignatov-bio/ai-sci-10959-fix-css-for-storage-locations
Fix css for storage locations [SCI-10959]
2024-08-06 15:40:18 +02:00
Anton
3c9d2b9a39 Fix shared task tooltip [SCI-10960] 2024-08-06 15:39:58 +02:00
aignatov-bio
f2ed356f85
Merge branch 'features/storage-locations' into ai-sci-10959-fix-css-for-storage-locations 2024-08-06 15:16:03 +02:00
Anton
0dd371abea Fix css for stroge locations [SCI-10959] 2024-08-06 15:13:21 +02:00
KlemenSciNote
3f508d325f
Merge pull request #7784 from KlemenSciNote/kb_SCI-10963_e2e-fix-protocol-status-button-attribute
Fix task protocol status button data-e2e [SCI-10963]
2024-08-06 14:20:24 +02:00
Klemen Benedicic
df81db30a8 Fix task protocol status button data-e2e [SCI-10963] 2024-08-06 14:00:17 +02:00
Alex Kriuchykhin
bc4b010fa2
Optimize repository export jobs [SCI-10940] (#7783) 2024-08-06 13:26:14 +02:00
Martin Artnik
4f7000a68f
Merge pull request #7782 from scinote-eln/revert-7678-ma_SCI_10809
Revert "Timeout slow libreoffice preview generation [SCI-10809]"
2024-08-06 10:59:03 +02:00
Martin Artnik
b6af1031f5
Revert "Timeout slow libreoffice preview generation [SCI-10809] (#7678)"
This reverts commit 1265f29a9e.
2024-08-06 10:58:50 +02:00
KlemenSciNote
05948ff9ec
Merge pull request #7781 from KlemenSciNote/kb_SCI-10943_data-e2e-storage-locations
Add data-e2e to storage locations for Pendo [SCI-10943]
2024-08-06 10:54:32 +02:00
KlemenSciNote
83eee9c72b
Merge pull request #7777 from KlemenSciNote/kb_SCI-10956_data-e2e-protocol-templates
Add data-e2e to publish, delete draft and linked tasks modals [SCI-10956]
2024-08-06 10:53:51 +02:00
Klemen Benedicic
b964a41e88 Merge branch 'features/storage-locations' into kb_SCI-10943_data-e2e-storage-locations 2024-08-06 09:22:12 +02:00
Klemen Benedicic
666b8badcf Add data-e2e on storage locations for Pendo [SCI-10943] 2024-08-06 09:03:00 +02:00
Martin Artnik
85c5da7c7a
Bump version to 1.36.0.1 2024-08-05 13:48:23 +02:00
aignatov-bio
3c1691ab2c
Merge pull request #7780 from aignatov-bio/ai-sci-10946-add-private-rows-to-storage-locations
Add private items to storage location [SCI-10946]
2024-08-05 12:44:33 +02:00
aignatov-bio
4ae36871c6
Merge pull request #7779 from aignatov-bio/ai-sci-10924-add-actions-to-item-cards-locations
Add assign action to item cards locations [SCI-10924]
2024-08-05 12:44:23 +02:00
Anton
f7e66f6190 Add private items to storage location [SCI-10946] 2024-08-05 12:36:22 +02:00
Anton
74a0afca6c Add assign action to item cards locations [SCI-10924] 2024-08-05 11:23:35 +02:00
Martin Artnik
d470a3a5ac
Merge pull request #7729 from artoscinote/ma_SCI_10859
Implement sub-location count column [SCI-10859]
2024-08-05 10:34:34 +02:00
Martin Artnik
10290d82d4
Merge branch 'features/storage-locations' into ma_SCI_10859 2024-08-05 10:34:18 +02:00
aignatov-bio
d53d198ac5
Merge pull request #7778 from rekonder/aj_SCI_10950
Make storage locations toggleable [SCI-10950]
2024-08-02 16:58:39 +02:00
Andrej
333d62bfde Make storage locations toggleable [SCI-10950] 2024-08-02 14:40:02 +02:00
aignatov-bio
838bce9ac1
Merge pull request #7776 from aignatov-bio/ai-sci-10927-add-storage-locations-filter-search
Add filters to storage locations [SCI-10927]
2024-08-02 14:04:33 +02:00
Klemen Benedicic
d41ee987f5 Add data-e2e to publish protocol, delete draft and linked tasks modals [SCI-10956] 2024-08-02 14:03:21 +02:00
Anton
83d9c88546 Add filters to storage locations [SCI-10927] 2024-08-02 14:01:41 +02:00
ajugo
7a84083a6c
Merge pull request #7759 from rekonder/aj_SCI_10816
Fix searching through tree for location and folders [SCI-10816]
2024-08-02 11:00:47 +02:00
aignatov-bio
2892bb5f1f
Merge pull request #7775 from aignatov-bio/ai-sci-10953-fix-sticky-toolbar-tinymce
Fix sticky header tinymce [SCI-10953]
2024-08-02 10:57:22 +02:00
Anton
35b2d215f7 Fix sticky header tinymce [SCI-10953] 2024-08-02 10:55:16 +02:00
Martin Artnik
1265f29a9e
Timeout slow libreoffice preview generation [SCI-10809] (#7678) 2024-08-02 10:24:03 +02:00
dependabot[bot]
87357923b3
Bump rexml from 3.2.8 to 3.3.3 (#7774)
Bumps [rexml](https://github.com/ruby/rexml) from 3.2.8 to 3.3.3.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.2.8...v3.3.3)

---
updated-dependencies:
- dependency-name: rexml
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-08-02 10:05:44 +02:00
ajugo
e3f7bef039
Merge pull request #7773 from rekonder/aj_SCI_10945
Fix toolbar buttons on archived task canvas page [SCI-10945]
2024-08-01 16:46:01 +02:00
Andrej
351aed9520 Fix searching through tree for location and folders [SCI-10816] 2024-08-01 16:42:33 +02:00
Andrej
b3da5cf8c3 Fix toolbar buttons on archived task canvas page [SCI-10945] 2024-08-01 15:55:30 +02:00
Martin Artnik
52f9a8411c Merge branch 'release/1.35.0' into develop 2024-08-01 15:40:09 +02:00
aignatov-bio
c544168115
Merge pull request #7772 from aignatov-bio/ai-sci-10923-add-storage-locations-to-item-card
Add locations to item card [SCI-10923]
2024-08-01 15:12:34 +02:00
Anton
124810e07e Add locations to item card [SCI-10923] 2024-08-01 15:07:43 +02:00
ajugo
ec28d0b24c
Merge pull request #7771 from rekonder/aj_SCI_10936
Fix handling of subject class for notifications [SCI-10936]
2024-08-01 12:35:38 +02:00
Andrej
52bd8c933b Fix handling of subject class for notifications [SCI-10936] 2024-08-01 11:39:51 +02:00
Martin Artnik
8748711d5d Fix repository row touch for checklist values [SCI-10890] 2024-07-31 15:40:29 +02:00
Martin Artnik
461075a720
Merge pull request #7770 from artoscinote/ma_SCI_10939
Fix result filtering [SCI-10939]
2024-07-31 14:52:02 +02:00
Martin Artnik
cf1aef21a9 Fix result filtering [SCI-10939] 2024-07-31 14:49:05 +02:00
Martin Artnik
fbb2859da9
Merge pull request #7769 from rekonder/aj_SCI_10935
Fix number display for viewers on repository card [SCI-10935]
2024-07-31 13:18:39 +02:00
Andrej
18cabfbde8 Fix number display for viewers on repository card [SCI-10935] 2024-07-31 12:53:30 +02:00
Anton
09e5d3399e Merge branch 'features/storage-locations' of github.com:scinote-eln/scinote-web into features/storage-locations 2024-07-31 12:20:10 +02:00
Anton
49ddeb7403 Merge branch 'develop' into features/storage-locations 2024-07-31 12:19:31 +02:00
aignatov-bio
cdc5e66e4a
Merge pull request #7768 from aignatov-bio/ai-sci-10921-add-stock-column-to-storage-locations
Add stock to storage locations [SCI-10921]
2024-07-31 11:38:16 +02:00
Anton
b774c04f5b Add stock to storage locations [SCI-10921] 2024-07-31 11:36:16 +02:00
aignatov-bio
6ad8120e0d
Merge pull request #7765 from aignatov-bio/ai-sci-10922-add-grid-interactions
Add storage grid interactions [SCI-10922]
2024-07-31 11:11:24 +02:00
Martin Artnik
d778e129a3
Merge pull request #7767 from rekonder/aj_SCI_10930
Remove add columns to the repository column management [SCI-10930]
2024-07-31 09:45:32 +02:00