Commit graph

18476 commits

Author SHA1 Message Date
Martin Artnik
7ec6595ac9
Bump version to 1.40.1 2025-03-26 09:51:33 +01:00
andrej-scinote
a22bcdd5b7
Merge pull request #8360 from andrej-scinote/aj_SCI_11470
Fix the disabling of the publish button [SCI-11470]
2025-03-25 14:42:15 +01:00
Andrej
f68c1b5651 Fix disabling publish button [SCI-11470] 2025-03-25 14:39:37 +01:00
andrej-scinote
c25ae031ce
Merge pull request #8331 from andrej-scinote/aj_SCI_11470
Improve validation at publishing forms [SCI-11470]
2025-03-25 12:26:16 +01:00
andrej-scinote
a2c2afde5e
Merge pull request #8358 from andrej-scinote/aj_SCI_11725
Fix long file names in project export [SCI-11725]
2025-03-25 12:12:11 +01:00
Andrej
f07fbc363c Fix long file names in project export [SCI-11725] 2025-03-25 11:49:52 +01:00
andrej-scinote
0cda725d93
Merge pull request #8356 from andrej-scinote/aj_SCI_11731
Update password change flash message [SCI-11731]
2025-03-25 11:42:11 +01:00
Anton
077dbfb7d3 Fix forms table sorting and wording for multiple dropdown options [SCI-11687][SCI-11713] 2025-03-25 11:24:22 +01:00
Andrej
6ac62e550d Update password change flash message [SCI-11731] 2025-03-25 10:54:58 +01:00
andrej-scinote
83c1e4a81c
Merge pull request #8345 from andrej-scinote/aj_SCI_11712
Add unpublished activity [SCI-11712]
2025-03-25 09:38:02 +01:00
andrej-scinote
b1842c94f8
Merge pull request #8355 from andrej-scinote/aj_SCI_11648
Add forms to print protocol [SCI-11648]
2025-03-25 09:36:34 +01:00
andrej-scinote
ea515731b9
Merge pull request #8338 from andrej-scinote/aj_SCI_11686
Add action to forms [SCI-11686]
2025-03-25 09:36:19 +01:00
Andrej
a377624aee Add forms to print protocol [SCI-11648] 2025-03-25 08:13:06 +01:00
aignatov-bio
cc79bad19e
Merge pull request #8353 from aignatov-bio/ai-sci-11646-add-sa-to-text-form-field
Add SA to text form field [SCI-11646]
2025-03-24 15:30:14 +01:00
Anton
423c0c19a1 Add SA to text form field [SCI-11646] 2025-03-24 15:14:16 +01:00
Martin Artnik
bf01e06a86
Merge pull request #8351 from artoscinote/ma_SCI_11513
Replace spaces in rendered smart annotation tags with underscores [SCI-11513]
2025-03-24 13:49:32 +01:00
Martin Artnik
e575d021d1 Replace spaces in rendered smart annotation tags with underscores [SCI-11513] 2025-03-24 13:46:11 +01:00
dependabot[bot]
82da3ae580
Bump nokogiri from 1.18.3 to 1.18.4 (#8346)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.18.3 to 1.18.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.18.3...v1.18.4)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-03-24 13:10:04 +01:00
aignatov-bio
2b3affe2da
Merge pull request #8348 from aignatov-bio/ai-sci-11727-fix-permission-on-assigned-task
Fix permission on assigned tasks [SCI-11727]
2025-03-24 12:32:39 +01:00
aignatov-bio
f1d1551175
Merge pull request #8336 from andrej-scinote/aj_SCI_11554
Add forms to reports [SCI-11554]
2025-03-24 11:45:53 +01:00
Anton
0b69db7ce8 Fix permission on assigned tasks [SCI-11727] 2025-03-24 11:37:19 +01:00
Andrej
869705f338 Add unpublished activity [SCI-11712] 2025-03-21 17:04:03 +01:00
Martin Artnik
5a8f65d4b7
Merge pull request #8344 from artoscinote/ma_SCI_11714
Filter Form activities based on permissions [SCI-11714]
2025-03-21 16:10:38 +01:00
Martin Artnik
62fd211ce3 Filter Form activities based on permissions [SCI-11714] 2025-03-21 16:08:21 +01:00
Martin Artnik
b3e71a0dd9
Merge pull request #8343 from artoscinote/ma_SCI_11513
Fixes for inventory smart annotations [SCI-11513]
2025-03-21 15:02:04 +01:00
Martin Artnik
fc870eaa3e Fixes for inventory smart annotations [SCI-11513] 2025-03-21 14:57:49 +01:00
aignatov-bio
91707d4cb4
Merge pull request #8342 from aignatov-bio/ai-sci-11727-fix-assign-items-on-archived-task
Add permission checks for assign items button [SCI-11727]
2025-03-21 14:43:42 +01:00
Anton
ecbb48fe24 Add permission checks for assign items button [SCI-11727] 2025-03-21 13:46:44 +01:00
aignatov-bio
dfa26c7698
Merge pull request #8341 from aignatov-bio/ai-sci-11645-add-smart-annotations-to-form-descritpio
Add smart annotations to form description [SCI-11645]
2025-03-21 13:35:34 +01:00
Anton
cfc18f8b41 Add smart annotations to form description [SCI-11645] 2025-03-21 13:17:37 +01:00
Martin Artnik
4319caa83f
Merge pull request #8340 from artoscinote/ma_SCI_11695
Handle non-existant smart anotation records [SCI-11695]
2025-03-21 12:58:44 +01:00
Martin Artnik
2e5c358af8 Handle non-existant smart anotation records [SCI-11695] 2025-03-21 12:56:51 +01:00
aignatov-bio
affda5f1d6
Merge pull request #8339 from aignatov-bio/ai-sci-11566-fix-redesign-tags
Fix tags and description in reports [SCI-11566]
2025-03-21 12:30:49 +01:00
aignatov-bio
8270b101b0
Merge pull request #8337 from aignatov-bio/ai-sci-11658-fix-shared-inventories-assigned-items
Fix shared inventories in assigning items modal [SCI-11658]
2025-03-21 11:31:51 +01:00
Anton
d1fb9b8611 Fix tags and description in reports [SCI-11566] 2025-03-21 11:29:24 +01:00
Andrej
4ed68934db Add action to forms [SCI-11686] 2025-03-21 10:43:05 +01:00
Anton
560112ae39 Fix shared inventories in assigning items modal [SCI-11658] 2025-03-21 10:18:15 +01:00
Andrej
788ec7d1e7 Add forms to reports [SCI-11554] 2025-03-20 15:08:31 +01:00
Anton
ac6684d76c Add new field component to number form [SCI-11494] 2025-03-20 15:03:53 +01:00
Anton
06e85947f3 Merge branch 'develop' into features/forms-v2 2025-03-20 14:19:53 +01:00
Martin Artnik
77772d873f
Merge pull request #8334 from artoscinote/ma_SCI_11698
Fix smart annotation rendering [SCI-11698]
2025-03-20 13:24:52 +01:00
Martin Artnik
520fe56079 Fix smart annotation rendering [SCI-11698] 2025-03-20 13:21:10 +01:00
Alex Kriuchykhin
b5fd3ef398
Fix editing of empty files by WOPI client [SCI-11682] (#8330) 2025-03-20 12:01:07 +01:00
Martin Artnik
6bd9140597
Merge pull request #8333 from aignatov-bio/ai-sci-11697-add-inline-edit-for-box-locations
Add title inline edit to storage locations [SCI-11697]
2025-03-20 11:59:36 +01:00
Anton
4597c1e4b4 Add title inline edit to storage locations [SCI-11697] 2025-03-20 11:58:49 +01:00
aignatov-bio
e1d6714cc5
Merge pull request #8318 from aignatov-bio/ai-sci-11690-update-mark-as-na-position
Add timestamps and update n/a position on form field [SCI-11690][SCI-11652]
2025-03-20 11:50:18 +01:00
aignatov-bio
69dfc45910
Merge pull request #8311 from aignatov-bio/ai-sci-11566-fix-tags-in-export-project
Fix tags design [SCI-11566]
2025-03-20 11:50:09 +01:00
aignatov-bio
d78aaf5b60
Merge pull request #8306 from aignatov-bio/ai-sci-11658-fix-shared-inventories-in-assigned-inventories
Fix shared inventories in assigned inventories [SCI-11658]
2025-03-20 11:49:57 +01:00
andrej-scinote
b8c667e361
Merge pull request #8332 from andrej-scinote/aj_SCI_11533
Add basic serializer for form response to api [SCI-11533]
2025-03-20 09:53:39 +01:00
Andrej
f77ad7d56d Add basic serializer for form response to api [SCI-11533] 2025-03-20 06:46:47 +01:00