scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 00:46:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
11399 commits 70 branches 179 tags 166 MiB
Commit graph

11399 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giga Chubinidze 8d97641110 Add IDs to pdf and docx reports [SCI-7200] 2022-11-29 11:38:08 +04:00
G-Chubinidze fdc8d8ef24
Merge pull request #4654 from G-Chubinidze/gc_SCI_7175 
Update sorting on Projects and Experiments pages [SCI-7175]
 2022-11-28 15:57:46 +04:00
Giga Chubinidze ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
artoscinote d71be092f5
Merge pull request #4639 from artoscinote/ma_SCI_7204 
Add protocol ID to linked protocol dropdown [SCI-7204]
 2022-11-23 16:49:21 +01:00
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
G-Chubinidze 415443a108
Merge pull request #4633 from G-Chubinidze/gc_SCI_7179 
add IDs to the protocol templates tables [SCI-7179]
 2022-11-22 14:50:57 +04:00
Giga Chubinidze 43f8370a08 add IDs to the protocol templates tables [SCI-7179] 2022-11-22 13:55:41 +04:00
G-Chubinidze 0dcc3e3c7f
Merge pull request #4610 from G-Chubinidze/gc_SCI_7203 
archived tasks updates [SCI-7203]
 2022-11-11 14:02:56 +04:00
G-Chubinidze e3b9314646
Update my_modules.scss 2022-11-11 12:48:22 +04:00
Giga Chubinidze 5a429549da archived tasks updates [SCI-7203] 2022-11-11 12:45:07 +04:00
G-Chubinidze f65c207e75
Merge pull request #4603 from G-Chubinidze/gc_SCI_7205 
update display of the current tasks with IDs [SCI-7205]
 2022-11-09 15:49:57 +04:00
G-Chubinidze 8e63bfb7c2
Update my_module.rb 2022-11-09 14:46:36 +04:00
G-Chubinidze 996cb68fdd
Update my_module.rb 2022-11-09 14:45:18 +04:00
G-Chubinidze 62b48ee59a
updated my_module rb, added searchable id attribute 2022-11-09 13:36:55 +04:00
G-Chubinidze 82d36ccc25
Update 20221108104529_add_my_module_code_index.rb 2022-11-08 17:10:22 +04:00
Giga Chubinidze 18fe2cd207 update display of the current tasks with IDs [SCI-7205] 2022-11-08 16:06:48 +04:00
artoscinote 5d40e0cafa
Bump version to 1.26.1 2022-10-26 13:19:00 +02:00
artoscinote 808efec410
Merge pull request #4580 from okriuchykhin/ok_SCI_7360_v2 
Fix update of shared inventories user assignments [SCI-7360]
 2022-10-26 08:49:13 +02:00
Oleksii Kriuchykhin c16d0cb7a6 Fix update of shared inventories user assignments [SCI-7360] 2022-10-25 23:26:20 +02:00
Alex Kriuchykhin d0f604f21e
Merge pull request #4576 from okriuchykhin/ok_SCI_7375 
Fix displaying of user access for E/T [SCI-7375]
 2022-10-25 16:14:51 +02:00
Oleksii Kriuchykhin 232f58dd30 Fix displaying of user access for E/T [SCI-7375] 2022-10-25 16:07:55 +02:00
artoscinote 938f2ce63b
Merge pull request #4573 from artoscinote/ma_SCI_7377 
Add ENV setting for max step text length [SCI-7377]
 2022-10-25 16:04:36 +02:00
artoscinote 78b3975759
Merge pull request #4575 from artoscinote/ma_SCI_7396 
Fix label preview double refresh and unit issues [SCI-7396]
 2022-10-25 15:55:57 +02:00
Martin Artnik 31b075ea8c Fix label preview double refresh and unit issues [SCI-7396] 2022-10-25 15:54:05 +02:00
Martin Artnik ebe0ffa286 Add ENV setting for max step text length [SCI-7377] 2022-10-25 13:08:33 +02:00
ajugo ea75eefd88
Change switching permission for label templates and zebra print to stock management [SCI-7305] (#4574) 2022-10-25 13:07:45 +02:00
artoscinote eec5fd9ab3
Merge pull request #4570 from artoscinote/ma_SCI_7357 
Only render last label in ZPL [SCI-7357]
 2022-10-25 11:53:52 +02:00
ajugo 58bca40632
Change zebra label instructions [SCI-7390] (#4572) 2022-10-25 11:44:50 +02:00
Martin Artnik 7f384f1964 Only render last label in ZPL [SCI-7357] 2022-10-24 15:50:10 +02:00
Alex Kriuchykhin 60dc26a42b
Merge pull request #4567 from okriuchykhin/ok_SCI_7375 
Fix display of user access for experiments and tasks [SCI-7375]
 2022-10-24 13:05:02 +02:00
Oleksii Kriuchykhin 09440d4f83 Fix display of user access for experiments and tasks [SCI-7375] 2022-10-24 12:57:08 +02:00
Alex Kriuchykhin d4cb8de300
Merge pull request #4556 from scinote-eln/dependabot/bundler/nokogiri-1.13.9 
Bump nokogiri from 1.13.7 to 1.13.9
 2022-10-21 15:44:03 +02:00
Alex Kriuchykhin 224bbe9afd
Merge pull request #4564 from okriuchykhin/ok_SCI_7360_v3 
Fix repository permissions helper [SCI-7360]
 2022-10-21 14:58:34 +02:00
Oleksii Kriuchykhin d38556e3fa Fix repository permissions helper [SCI-7360] 2022-10-21 14:51:16 +02:00
Alex Kriuchykhin 3bc3036b58
Merge pull request #4563 from okriuchykhin/ok_SCI_7360_v2 
Fix typo in update team assignments service, improve shared inventories migration [SCI-7360]
 2022-10-21 14:36:52 +02:00
Alex Kriuchykhin 23a8f8fc07
Merge pull request #4561 from okriuchykhin/ok_SCI_7363 
Fix task access display modal [SCI-7363]
 2022-10-21 14:29:28 +02:00
Oleksii Kriuchykhin a9e7e81e51 Fix typo in update team assignments service, improve shared inventories migration [SCI-7360] 2022-10-21 14:04:33 +02:00
Alex Kriuchykhin 2ddb6d8685
Merge pull request #4558 from rekonder/aj_SCI_7373 
Fix permission on experiment open for org admins [SCI-7373]
 2022-10-21 13:48:28 +02:00
Alex Kriuchykhin 207b8311af
Merge pull request #4559 from aignatov-bio/ai-sci-7374-fix-protocol-creation-from-dashboard 
Fix protocol creation from dashboard [SCI-7374]
 2022-10-21 13:47:33 +02:00
Oleksii Kriuchykhin 8dfedfe165 Fix task access display modal [SCI-7363] 2022-10-21 13:33:22 +02:00
Anton 05902d485b Fix protocol creation from dashboard [SCI-7374] 2022-10-21 11:40:50 +02:00
Andrej 140dc8c768 Fix permission on experiment open for org admins [SCI-7373] 2022-10-21 11:25:54 +02:00
Alex Kriuchykhin 6e2b40aef3
Merge pull request #4557 from okriuchykhin/ok_SCI_7360 
Fix shared repositories migration, update sharing logic and permissions [SCI-7360]
 2022-10-21 11:08:58 +02:00
Oleksii Kriuchykhin 7d3f48199a Fix shared repositories migration, update sharing logic and permissions [SCI-7360] 2022-10-21 11:00:52 +02:00
Alex Kriuchykhin 1799361944
Merge pull request #4555 from okriuchykhin/ok_SCI_7366 
Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366]
 2022-10-21 10:35:10 +02:00
dependabot[bot] 311f3d0baf
Bump nokogiri from 1.13.7 to 1.13.9 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.7 to 1.13.9.
- [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.13.7...v1.13.9)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-10-21 03:54:44 +00:00
Oleksii Kriuchykhin 94978ea2ea Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366] 2022-10-20 16:19:02 +02:00
aignatov-bio c7ee068893
Merge pull request #4554 from aignatov-bio/ai-sci-7367-fix-label-preview-in-print-modal 
Fix label preview in print modal [SCI-7367]
 2022-10-20 11:02:46 +02:00
Anton ac0fe4389d Fix label preview in print modal [SCI-7367] 2022-10-20 10:57:40 +02:00
Alex Kriuchykhin a55390898a
Merge pull request #4553 from okriuchykhin/ok_SCI_7348_v2 
Fix protocol permission propagation [SCI-7348]
 2022-10-20 09:24:44 +02:00