scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
17195 commits 69 branches 179 tags 165 MiB
Commit graph

17195 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andrej 121a30ede6 Remove add columns to the repository column management [SCI-10930] 2024-07-30 17:36:45 +02:00
ajugo efd7dd8b0b
Merge pull request #7766 from rekonder/aj_SCI_10929 
Change step/result toolbar interaction [SCI-10929]
 2024-07-30 17:27:45 +02:00
Andrej 5714e684ef Change step/result toolbar interaction [SCI-10929] 2024-07-30 15:48:12 +02:00
ajugo 9277e89b5e
Merge pull request #7752 from rekonder/aj_SCI_10918 
Fix sharing permission for task sharing [SCI-10918]
 2024-07-30 14:02:28 +02:00
ajugo 17bf51dac8
Merge pull request #7751 from rekonder/aj_SCI_10905 
Improve handling of auto mapping and clearing [SCI-10905]
 2024-07-30 14:02:12 +02:00
ajugo 9a18c70eb4
Merge pull request #7746 from rekonder/aj_SCI_10911 
Add disabled tag to repository columns [SCI-10911]
 2024-07-30 14:01:58 +02:00
ajugo 189b609fc8
Merge pull request #7753 from rekonder/aj_SCI_10910 
Fix space for add step button in protocols [SCI-10910]
 2024-07-30 13:56:49 +02:00
Martin Artnik cc24e22a1b
Merge pull request #7763 from artoscinote/ma_SCI_10931 
Force ActiveStorage variant recreation when generating reports [SCI-10931]
 2024-07-30 13:55:56 +02:00
KlemenSciNote a2cbd28f2d
Merge pull request #7755 from KlemenSciNote/kb_SCI-10920_data-e2e-protocol-templates 
Add data-e2e to protocol versions modal [SCI-10920]
 2024-07-30 13:48:49 +02:00
Martin Artnik cb619cb3fa Force ActiveStorage variant recreation when generating reports [SCI-10931] 2024-07-30 13:45:03 +02:00
Klemen Benedicic 0cac65063c Update step text title and content data-e2e [SCI-10920] 2024-07-30 13:24:43 +02:00
Klemen Benedicic 788c11f06e Merge branch 'develop' into kb_SCI-10920_data-e2e-protocol-templates 2024-07-30 12:56:51 +02:00
ajugo 5695150e98
Merge pull request #7762 from rekonder/aj_SCI_10930 
Remove edit ability for read-only inventories [SCI-10930]
 2024-07-30 12:45:44 +02:00
Andrej a00708ea5b Remove edit ability for read only inventories [SCI-10930] 2024-07-30 12:09:44 +02:00
Martin Artnik ab2f5c16b4
Merge pull request #7758 from scinote-eln/features/ui-tweaks 
Features/UI tweaks
 2024-07-29 10:38:30 +02:00
Klemen Benedicic bb7e85b19d Add data-e2e to protocol versions modal [SCI-10920] 2024-07-25 13:52:31 +02:00
Andrej 10e3790566 Fix space for add step button in protocols [SCI-10910] 2024-07-24 17:08:34 +02:00
Andrej 0efa1b96be Fix sharing permission for task sharing [SCI-10918] 2024-07-24 16:38:29 +02:00
ajugo 5ee4308448
Merge pull request #7748 from rekonder/aj_SCI_10909 
Fix rendering of the title on the left menu [SCI-10909]
 2024-07-24 15:00:29 +02:00
Andrej 662d47caf6 Improve handling of auto mapping and clearing [SCI-10905] 2024-07-24 14:51:19 +02:00
aignatov-bio 05d35bfee5
Merge pull request #7750 from aignatov-bio/ai-sci-10914-update-icon-font 
Update font icons [SCI-10914]
 2024-07-24 14:47:42 +02:00
Anton 3a09459595 Update font icons 2024-07-24 14:46:51 +02:00
Andrej ae4b5cffe6 Fix rendering of title on left menu [SCI-10909] 2024-07-24 11:05:00 +02:00
Martin Artnik c7d3fdf97b
Bump version to 1.36.0 2024-07-24 10:59:49 +02:00
Andrej 58a8535d33 Add disabled tag to repository colums [SCI-10911] 2024-07-24 10:29:02 +02:00
Martin Artnik e684e25b10
Merge pull request #7745 from artoscinote/ma_SCI_10912 
Improve blank stock importing [SCI-10912]
 2024-07-23 16:00:45 +02:00
Martin Artnik bfcf8208c8 Improve blank stock importing [SCI-10912] 2024-07-23 15:55:39 +02:00
Martin Artnik aad78294da
Merge pull request #7742 from artoscinote/ma_SCI_10912 
On import, set blank stock values to zero instead of destroying [SCI-10912]
 2024-07-23 12:56:24 +02:00