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
11415 commits 70 branches 179 tags 165 MiB
Commit graph

11415 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Artnik 95348b82e8 Fix inventory multiline file uploads [SCI-7473] 2022-11-21 11:47:46 +01:00
artoscinote 41a7609c3e
Merge pull request #4608 from G-Chubinidze/gc_SCI_7162 
empty repository view archived button logic fix [SCI-7162]
 2022-11-11 11:26:47 +01:00
Giga Chubinidze e9d9f613fb updated old code version in empty_index 2022-11-11 14:22:26 +04:00
aignatov-bio c5466771ff
Merge pull request #4609 from aignatov-bio/ai-sci-7471-fix-merge-issue 
Fix merge issue [SCI-7471]
 2022-11-10 11:47:54 +01:00
Anton c0141137eb Fix merge issue [SCI-7471] 2022-11-10 11:46:14 +01:00
aignatov-bio 4b6ab3bd25
Merge pull request #4544 from aignatov-bio/ai-sci-7233-fix-login-signup-forms 
Fix css issues for login and signup forms [SCI-7233]
 2022-11-10 11:15:03 +01:00
aignatov-bio a72795ec98
Merge pull request #4586 from aignatov-bio/ai-sci-7387-fix-options-dropdown-position-on-step 
Fix options dropdown position on step [SCI-7387]
 2022-11-10 11:12:28 +01:00
aignatov-bio 2c17c05c7d
Merge pull request #4260 from artoscinote/ma_SCI_6982 
Implement multiline editing in repositories [SCI-6982][SCI-6983]
 2022-11-10 11:07:30 +01:00
artoscinote 0994c4a25b
Merge branch 'develop' into ma_SCI_6982 2022-11-10 11:04:57 +01:00
aignatov-bio 0ee586a394
Merge pull request #4439 from rekonder/aj_SCI_7027 
Session end implementation [SCI-7027]
 2022-11-10 11:03:02 +01:00
artoscinote 9d41ff4f92
Bump version to 1.26.2 2022-11-09 10:48:18 +01:00
Miha Mencin c8bd5513cf
Merge pull request #4604 from okriuchykhin/ok_SCI_7434 
Fix team export/import [SCI-7434]
 2022-11-08 16:02:11 +01:00
Oleksii Kriuchykhin be7ef8fdc0 Fix team export/import [SCI-7434] 2022-11-08 14:50:16 +01:00
Alex Kriuchykhin e13cfa2c74
Merge pull request #4598 from okriuchykhin/ok_SCI_7435 
Fix Fluics templates sync scheduler [SCI-7435]
 2022-11-08 13:03:41 +01:00
Alex Kriuchykhin fc56cc4197
Merge pull request #4599 from okriuchykhin/ok_SCI_7402 
Fix global activities user selection dropdown [SCI-7402]
 2022-11-08 11:29:10 +01:00
Oleksii Kriuchykhin 82d4b03cf6 Fix global activities user selection dropdown [SCI-7402] 2022-11-07 21:58:06 +01:00
Oleksii Kriuchykhin c361dec0b6 Fix Fluics templates sync scheduler [SCI-7435] 2022-11-07 11:55:01 +01:00
aignatov-bio 6e2224990b
Merge pull request #4594 from aignatov-bio/ai-sci-7426-fix-duplicate-activity 
Fix duplicate activities wording [SCI-7426]
 2022-11-04 11:36:45 +01:00
aignatov-bio c32bf690ba
Merge pull request #4593 from aignatov-bio/ai-sci-7428-hide-active-reminders-checkbox 
Hide active reminders, if stock management disabled [SCI-7428]
 2022-11-04 11:08:56 +01:00
Anton 34ffcbd8e8 Fix duplicate activities wording [SCI-7426] 2022-11-04 11:07:59 +01:00
Anton 5b08ee1cc8 Hide active reminders, if stock management disabled [SCI-7428] 2022-11-03 15:48:32 +01:00
ajugo 22fad95efd
Rename protocol repository to templates [SCI-7418] (#4587) 2022-10-28 11:47:54 +02:00
aignatov-bio aa1de29e60
Merge pull request #4585 from aignatov-bio/ai-sci-7410-fix-label-preview-height-limit 
Fix label preview height in print modal [SCI-7410]
 2022-10-28 10:06:44 +02:00
Anton eddd5b7476 Fix options dropdown position on step [SCI-7387] 2022-10-27 12:42:54 +02:00
Anton c2338d677d Fix label preview height in print modal [SCI-7410] 2022-10-27 12:13:25 +02: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