Commit graph

17224 commits

Author SHA1 Message Date
Andrej dd42485cd4 Fix inventory item counter on inventory page [SCI-10997] 2024-08-20 17:28:53 +02:00
Alex Kriuchykhin e561594a47
Fix permissions checking user assignments scopes [SCI-10991] (#7805) 2024-08-20 14:47:32 +02:00
Martin Artnik 3c877625ed
Merge pull request #7802 from okriuchykhin/ok_SCI_10991_v2
Fix listing of globally shared inventories [SCI-10991]
2024-08-20 12:15:51 +02:00
Oleksii Kriuchykhin 0cd2493f8b Fix listing of globally shared inventories [SCI-10991] 2024-08-20 11:26:57 +02:00
Martin Artnik 512b03a48b
Merge pull request #7800 from okriuchykhin/ok_SCI_10991
Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994]
2024-08-19 18:00:43 +02:00
Oleksii Kriuchykhin 9eee05f906 Fix inventory activities listing, fix inventory viewable_by_user scope, fix inventory fetching in reports [SCI-10991][SCI-10994] 2024-08-19 17:37:04 +02:00
Martin Artnik 495618abe4 Merge branch 'develop' into features/repository-permissions-rework 2024-08-14 15:06:18 +02:00
Martin Artnik ca4ecf4b97
Bump version to 1.36.1 2024-08-14 09:28:03 +02:00
Martin Artnik 257ae029b6
Lock version of puppeteer [SCI-10981] (#7797) 2024-08-13 13:46:08 +02:00
Martin Artnik f175c340ae
Merge pull request #7796 from artoscinote/ma_SCI_10980
Don't show content toolbar if no inserts are available [SCI-10980]
2024-08-13 13:37:41 +02:00
Martin Artnik 2370cfaf15 Don't show content toolbar if no inserts are available [SCI-10980] 2024-08-13 13:24:37 +02:00
Martin Artnik 82ebac9cc1
Merge pull request #7792 from okriuchykhin/ok_SCI_10972
Prevent repository access to users without repository READ permission on team level [SCI-10972]
2024-08-12 13:05:19 +02:00
Martin Artnik ce4f79e645
Merge pull request #7794 from artoscinote/ma_SCI_10975
Fix stock field in item card for disabled stock management [SCI-10975]
2024-08-12 12:51:34 +02:00
Martin Artnik 551c23e709 Fix stock field in item card for disabled stock management [SCI-10975] 2024-08-12 12:50:03 +02:00
Martin Artnik 0b059899b5
Merge pull request #7793 from artoscinote/ma_SCI_10970
Don't fail report if a TinyMCE image variant fails to generate [SCI-10970]
2024-08-12 12:31:57 +02:00
Martin Artnik 7f25e8e474 Don't fail report if a TinyMCE image variant fails to generate [SCI-10970] 2024-08-12 12:28:55 +02:00
Oleksii Kriuchykhin ac32b5b04a Prevent repository access to users without repository READ permission on team level [SCI-10972] 2024-08-12 10:54:35 +02:00
Martin Artnik 3a6888b276
Merge pull request #7788 from aignatov-bio/ai-sci-10968-fix-insert-content-toolbar
Hide action toolbar on collapsed result [SCI-10968]
2024-08-08 10:07:16 +02:00
Martin Artnik fa2ef02c3e
Merge pull request #7789 from scinote-eln/hotfix/1.36.0.1
Hotfix/1.36.0.1
2024-08-07 13:36:40 +02:00
aignatov-bio 62fde0fb47
Merge pull request #7787 from aignatov-bio/ai-sci-10965-archived-task-card-issue
Fix button style on archive cards [SCI-10965]
2024-08-07 12:04:13 +02:00
Anton 8d942d857f Hide action toolbar on collapsed result [SCI-10968] 2024-08-07 11:53:00 +02:00
Anton ee16df9014 Fix button style on archive cards [SCI-10965] 2024-08-07 11:39:43 +02:00
aignatov-bio 28333e94ed
Merge pull request #7786 from aignatov-bio/ai-sci-10960-fix-bold-tooltip
Fix shared task tooltip [SCI-10960]
2024-08-07 11:22:42 +02:00
Martin Artnik c43a730972 Fix Grover config [SCI-10931] 2024-08-06 17:42:58 +02:00
Martin Artnik f64ea95989 Force ActiveStorage variant recreation when generating reports [SCI-10931] 2024-08-06 17:41:04 +02:00
Anton 3c9d2b9a39 Fix shared task tooltip [SCI-10960] 2024-08-06 15:39:58 +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 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
Martin Artnik 85c5da7c7a
Bump version to 1.36.0.1 2024-08-05 13:48:23 +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
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 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
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
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
Martin Artnik 70a03db57a Fix creating RepositoryStockConsumptionValues in repository snapshots [SCI-10908] 2024-07-30 17:37:02 +02:00