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

11556 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin 0788072df1 ump version to 1.26.3.1 2022-11-30 12:14:19 +01:00
Alex Kriuchykhin 25e6a51be8
Merge pull request #4667 from rekonder/fix_session_end 
Fix session end for remember me [SCI-7502
 2022-11-30 12:12:45 +01:00
Andrej a2dbf79716 Fix session end for remember me 2022-11-30 12:03:27 +01:00
Oleksii Kriuchykhin 8ba9e93cc8 Bump version to 1.26.3 2022-11-30 10:27:56 +01:00
Giga Chubinidze b695903ea4 added frozen string literal 2022-11-30 11:39:28 +04:00
ajugo ea7f447190
Fix ovelaping checkbox on experiment card view [SCI-7546] (#4663) 2022-11-29 15:08:47 +01:00
artoscinote c4ba723998
Merge pull request #4662 from artoscinote/ma_SCI_7534 
Make deferred SmartAnnotation loading optional [SCI-7534]
 2022-11-29 13:51:28 +01:00
Martin Artnik 76de2d1380 Make deferred SmartAnnotation loading optional [SCI-7534] 2022-11-29 13:47:52 +01:00
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
artoscinote 7cc09faa94
Merge pull request #4657 from artoscinote/ma_SCI_7534 
Move atwho initialization to when a field is focused [SCI-7534]
 2022-11-28 12:39:45 +01:00
Martin Artnik f231c69a02 Move atwho initialization to when a field is focused [SCI-7534] 2022-11-28 11:44:25 +01:00
ajugo d255e40ba2
Fix printers instructions toggle [SCI-7535] (#4656) 2022-11-28 10:35:01 +01:00
aignatov-bio ecde2fae0d
Merge pull request #4655 from aignatov-bio/ai-sci-7472-fix-tooltip-for-clear-reminders 
Fix tooltip for clear reminders [SCI-7472]
 2022-11-28 10:15:00 +01:00
Anton 8ef5a742f6 Fix tooltip for clear reminders [SCI-7472] 2022-11-28 10:11:06 +01:00
Giga Chubinidze ba0ebfbe29 Update sorting on Projects and Experiments pages [SCI-7175] 2022-11-26 01:18:54 +04:00
artoscinote 1a700b8359
Merge pull request #4650 from artoscinote/ma_SCI_7460 
Fix disabling item edit button [SCI-7460]
 2022-11-25 10:36:20 +01:00
Martin Artnik 6fe86f2015 Fix disabling item edit button [SCI-7460] 2022-11-25 10:24:24 +01:00
aignatov-bio c2be99abda
Merge pull request #4595 from aignatov-bio/ai-sci-7359-fix-select-time-layout 
Fix time picket CSS [SCI-7359]
 2022-11-24 09:44:12 +01:00
ajugo c44aa2cb9c
Implement session end for multiple tabs [SCI-7502] (#4632) 2022-11-23 20:08:26 +01: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 2959cf6276 Add exposed IDs to recent work [SCI-7206] 2022-11-23 15:03:35 +01:00
aignatov-bio d1c664e0ab
Merge pull request #4640 from aignatov-bio/ai-sci-7522-fix-session-modal-overlap 
Fix session modal overlap [SCI-7522]
 2022-11-23 14:37:53 +01:00
artoscinote 7d53027530
Merge pull request #4641 from G-Chubinidze/gc_SCI_7492 
Missing navigate away pop up at inventory page [SCI-7492]
 2022-11-23 14:14:35 +01:00
Giga Chubinidze f78cf58552 pointer events value change 2022-11-23 17:12:25 +04:00
Anton 007aeaa2b6 Fix session modal overlap [SCI-7522] 2022-11-23 13:21:28 +01:00
Giga Chubinidze dac093823e few double quotes changed to single quotes 2022-11-23 16:08:43 +04:00
Giga Chubinidze 3b8a58b7db fixed code according to hound styling comments 2022-11-23 16:05:56 +04:00
ajugo 5b291acc27
Fix smart annotation [SCI-7498] (#4626) 2022-11-23 12:58:32 +01:00
Giga Chubinidze 47d593f0db Missing navigate away pop up at inventory page [SCI-7492] 2022-11-23 15:38:01 +04:00
aignatov-bio d6b5034db9
Merge pull request #4634 from aignatov-bio/ai-sci-7472-fix-tooltip-on-new-button-in-inventory 
Fix tooltip on new button in inventory [SCI-7472]
 2022-11-23 12:05:24 +01:00
Martin Artnik c21152b2e2 Add protocol ID to linked protocol dropdown [SCI-7204] 2022-11-23 11:49:53 +01:00
aignatov-bio 176f3c48e1
Merge pull request #4637 from aignatov-bio/ai-sci-7233-fix-show-password-for-edit-settings 
Fix show password for edit settings [SCI-7233]
 2022-11-22 16:23:36 +01:00
Anton 7079072eb8 Fix show password for edit settings [SCI-7233] 2022-11-22 16:06:47 +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
Anton 98e87a2f4b Fix markup [SCI-7359] 2022-11-22 11:29:57 +01:00
Alex Kriuchykhin a0ab9e3584
Merge pull request #4635 from rekonder/Fix_template 
Fix jira url for github template
 2022-11-22 11:14:33 +01:00
Andrej 50d6429b4c Fix jira url for github template 2022-11-22 11:13:08 +01:00
Alex Kriuchykhin b7664ad70f
Merge pull request #4621 from scinote-eln/release/1.26.2.1 
Release/1.26.2.1
 2022-11-22 11:07:20 +01:00
Anton 961b39159e Fix tooltip on new button in inventory [SCI-7472] 2022-11-22 11:05:57 +01:00
Alex Kriuchykhin dd54a30e13
Merge pull request #4601 from rekonder/aj_SCI_7376 
Enable checkboxes for experiment table/card view for all roles  [SCI-7376]
 2022-11-22 10:57:34 +01:00
Alex Kriuchykhin d6728ef9d3
Merge pull request #4597 from rekonder/aj_SCI_7361 
Fixed external protocol icon out of body [SCI-7361]
 2022-11-22 10:56:55 +01:00
Alex Kriuchykhin b487894c9d
Merge pull request #4596 from aignatov-bio/ai-sci-7389-fix-protocol-import-error 
fix protocol import error [SCI-7389]
 2022-11-22 10:56:10 +01:00
Giga Chubinidze 43f8370a08 add IDs to the protocol templates tables [SCI-7179] 2022-11-22 13:55:41 +04:00
Alex Kriuchykhin dc9831d3bc
Merge pull request #4568 from rekonder/aj_SCI_7181 
Remove old step code [SCI-7181]
 2022-11-22 10:52:06 +01:00
ajugo f2a680d826
Fix zebra printer print status [SCI-7474] (#4625) 2022-11-21 16:55:03 +01:00
artoscinote 92d446b43d
Merge pull request #4628 from artoscinote/ma_SCI_7473 
Fix inventory multiline file uploads [SCI-7473]
 2022-11-21 12:59:40 +01:00
artoscinote 974e4d0bf9
Merge pull request #4629 from artoscinote/ma_SCI_7460 
Disable instead of hide edit button when selected items not on page [SCI-7460]
 2022-11-21 12:59:24 +01:00
Martin Artnik 5d41ea5fa7 Disable instead of hide edit button when selected items not on page [SCI-7460] 2022-11-21 11:58:15 +01:00
Martin Artnik 95348b82e8 Fix inventory multiline file uploads [SCI-7473] 2022-11-21 11:47:46 +01:00