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

8929 commits

Author SHA1 Message Date
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
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
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
Alex Kriuchykhin d9897d6e7c
Merge pull request #4624 from okriuchykhin/ok_SCI_7457 
Fix protocol owner re-assignment when removing a user from a team [SCI-7457]
 2022-11-21 11:03:50 +01:00
Oleksii Kriuchykhin 69812786ba Fix protocol owner re-assignment when removing a user from a team [SCI-7457] 2022-11-18 12:52:30 +01:00
Oleksii Kriuchykhin 66f9f13508 Implement current team switch when navigating to tasks and experiments from another team [SCI-7447] 2022-11-18 11:48:49 +01:00
ajugo 42af732073
Fix zebra printer switch and optimize zebra library loading [SCI-7430] (#4612) 
* Fix zebra printer switch and optimize zebra library loading [SCI-7430]

* Fix zebra enabled [SCI-7430]
 2022-11-14 10:43:09 +01:00
ajugo 4e77174e52
Fix vue print modal component initialization [SCI-7469] (#4616) 2022-11-14 10:42:51 +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
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
Oleksii Kriuchykhin 82d4b03cf6 Fix global activities user selection dropdown [SCI-7402] 2022-11-07 21:58:06 +01:00
Andrej aa99c2d7c8 Enable checboxes for experiment table/card view for all roles [SCI-7376] 2022-11-07 15:51:39 +01:00
Andrej a88d41ca6a Fixed external protocol icon out of body [SCI-7361] 2022-11-07 11:03:34 +01:00
Anton 22c682c58b fix protocol import error [SCI-7389] 2022-11-04 11:49:05 +01:00
Anton b3bd165d01 Fix time picket CSS [SCI-7359] 2022-11-04 11:36:21 +01:00
Anton 5b08ee1cc8 Hide active reminders, if stock management disabled [SCI-7428] 2022-11-03 15:48:32 +01: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
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
Andrej 09a1adb194 Fix hound [SCI-7181] 2022-10-24 13:12:28 +02:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07: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
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
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
Oleksii Kriuchykhin 94978ea2ea Fix automatic user assigning to reports and inventories [SCI-7365][SCI-7366] 2022-10-20 16:19:02 +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
ajugo 3a0eec7043
Fix button shrink for inventory toolbar [SCI-7252] (#4551) 2022-10-19 18:09:59 +02:00
Oleksii Kriuchykhin 5ba6fe08d6 Fix protocol permission propagation [SCI-7348] 2022-10-19 17:26:13 +02:00
ajugo 0a56d772b7
Move print button for shared repository in view mode [SCI-7277] (#4550) 2022-10-19 14:10:04 +02:00
ajugo 9639e30c72
Generate correct format for create at at print time [SCI-7351] (#4547) 2022-10-19 13:18:52 +02:00
ajugo 98c32fda78
Fix label preview for custom repository columns [SCI-7358] (#4549) 2022-10-19 13:18:33 +02:00
aignatov-bio 822a4f87c7
Merge pull request #4548 from aignatov-bio/ai-sci-7350-replace-label-template-promo-logo 
Replace label template promo logo [SCI-7350]
 2022-10-19 11:44:06 +02:00
Anton 1062fbc2fd Replace label template promo logo [SCI-7350] 2022-10-19 11:25:49 +02:00
Anton c6e5fba21c Fix file name in attachment delete modal [SCI-7356] 2022-10-19 11:12:27 +02:00
Alex Kriuchykhin 482044a448
Merge pull request #4542 from rekonder/aj_SCI_7346 
Update default density for label templates [SCI-7346]
 2022-10-19 10:04:53 +02:00
Anton 689c34e54d Fix css issues for login and signup forms [SCI-7233] 2022-10-18 11:54:10 +02:00
aignatov-bio 83c3699493
Merge pull request #4539 from aignatov-bio/ai-sci-7340-save-label-dimenssions-on-preview-button 
Save dimensions on refresh label template preview [SCI-7340]
 2022-10-18 11:26:36 +02:00
ajugo fab625d819
Set correct permission for repository on team role change [SCI-7341] (#4540) 2022-10-18 10:43:51 +02:00
ajugo 64975effc6
Close print label modal at print click [SCI-7327] (#4526) 2022-10-18 10:42:50 +02:00
Andrej 538f141aaf Change default density for label templates [SCI-7346] 2022-10-18 09:41:25 +02:00
Anton bb354f2dbc Save dimensions on refresh label template preview [SCI-7340] 2022-10-17 12:25:08 +02:00
Anton 91c46e2005 Fix copy experiment only to active projects [SCI-7345] 2022-10-17 11:08:59 +02:00
Alex Kriuchykhin 6abfc8d293
Merge pull request #4527 from rekonder/aj_SCI_7326 
Move loading label print modal for task [SCI-7326]
 2022-10-17 10:21:51 +02:00
Alex Kriuchykhin 4cee224180
Merge pull request #4534 from okriuchykhin/ok_SCI_7338 
Fix user role selection when inviting new users [SCI-7338]
 2022-10-17 10:21:37 +02:00
Alex Kriuchykhin 63a1b35a45
Merge pull request #4529 from okriuchykhin/ok_SCI_6943_v2 
Unify tags loading order [SCI-6943]
 2022-10-17 10:21:13 +02:00
Alex Kriuchykhin d12cdb8a9a
Merge pull request #4530 from okriuchykhin/ok_SCI_7297_v2 
Fix display of a creator in the reports table [SCI-7297]
 2022-10-17 10:18:09 +02:00
Alex Kriuchykhin 15813166fe
Merge pull request #4537 from okriuchykhin/ok_SCI_7343 
Allow team owners to manage project users [SCI-7343]
 2022-10-17 10:16:50 +02:00
Alex Kriuchykhin eba3fc574b
Merge pull request #4536 from okriuchykhin/ok_SCI_7330 
Fix permission checking in reports controller [SCI-7330][SCI-7331]
 2022-10-17 10:16:15 +02:00
Alex Kriuchykhin 51da8edacc
Merge pull request #4533 from okriuchykhin/ok_SCI_7336 
Fix project users assignment to newly created experiments [SCI-7336]
 2022-10-17 10:15:44 +02:00
Alex Kriuchykhin 15af00934b
Merge pull request #4535 from rekonder/aj_SCI_7322 
Implemented label preview options for the Viewer role [SCI-7322]
 2022-10-17 09:35:47 +02:00
Oleksii Kriuchykhin bded75ac2c Allow team owners to manage project users [SCI-7343] 2022-10-14 15:51:37 +02:00
Alex Kriuchykhin ec81234ec5
Merge pull request #4531 from rekonder/aj_SCI_7305 
Remove old label printer modal code [SCI-7305]
 2022-10-14 14:44:02 +02:00
Oleksii Kriuchykhin 8e838fe09f Fix permission checking in reports controller [SCI-7330][SCI-7331] 2022-10-14 14:26:02 +02:00
Andrej 16b4a89fb8 Disable label preview options for Viewer role [SCI-7322] 2022-10-14 11:49:31 +02:00
Oleksii Kriuchykhin a5336608f8 Fix user role selection when inviting new users [SCI-7338] 2022-10-14 11:35:35 +02:00
Alex Kriuchykhin c725e1f100
Merge pull request #4521 from okriuchykhin/ok_SCI_7325 
Fix protocol import in templates [SCI-7325]
 2022-10-14 11:19:29 +02:00
Oleksii Kriuchykhin a3b8f98b24 Fix project users assignment to newly created experiments [SCI-7336] 2022-10-14 10:23:57 +02:00
Andrej f3fdcc1204 Remove old label printer modal code [SCI-7305] 2022-10-13 16:49:06 +02:00
Oleksii Kriuchykhin 68fab55328 Fix display of a creator in the reports table [SCI-7297] 2022-10-13 14:55:24 +02:00
Oleksii Kriuchykhin e43aa30193 Unify tags loading order [SCI-6943] 2022-10-13 13:55:36 +02:00
Andrej 5752401a29 Move loading label print modal on task [SCI-7326] 2022-10-13 13:16:18 +02:00
ajugo 58acb94977
Remove status from print label modal [SCI-7328] (#4524) 2022-10-12 16:56:58 +02:00
Oleksii Kriuchykhin 1bd3a7e783 Fix protocol import in templates [SCI-7325] 2022-10-12 14:27:21 +02:00
Alex Kriuchykhin 1e6c6da964
Merge pull request #4517 from okriuchykhin/ok_SCI_7298 
Add option to disable local password log in [SCI-7298]
 2022-10-12 12:54:34 +02:00
Alex Kriuchykhin 827567c167
Merge pull request #4515 from rekonder/aj_SCI_7314 
Fixed the existing templates  [SCI-7314]
 2022-10-12 11:49:09 +02:00