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

9410 commits

Author SHA1 Message Date
Giga Chubinidze 9e3073b11e step timestamp changes 2023-02-07 15:53:58 +04:00
Martin Artnik d0fd0efc1f Disable all TinyMCE context menus [SCI-7886] 2023-02-07 11:40:18 +01:00
ajugo c2fcba729a
Add empty space in PDF report after asset link [SCI-7660] (#4940) 2023-02-07 10:39:11 +01:00
artoscinote 5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187 
Support compiling webpacker content from addons [SCI-7187]
 2023-02-07 10:24:18 +01:00
artoscinote b9be286802
Merge pull request #4908 from sboursen-scinote/sb_SCI-7674 
Inventories: archived by and archived on seen on active item list [SCI-7674]
 2023-02-07 10:23:28 +01:00
artoscinote db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831 
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
 2023-02-06 16:59:08 +01:00
ajugo 29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] (#4941) 2023-02-06 16:47:11 +01:00
sboursen-scinote 1614e3e52b Fix hound [SCI-7831] 2023-02-06 16:42:48 +01:00
sboursen-scinote 2fc5772af3 Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831] 2023-02-06 16:36:52 +01:00
Martin Artnik ebd98bfb85 Make TinyMce init more extensible [SCI-7187] 2023-02-06 16:05:13 +01:00
aignatov-bio bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata 
Save handson table metadata [SCI-7834]
 2023-02-06 14:24:51 +01:00
Anton 3849b1a7a1 Save handson table metadata [SCI-7834] 2023-02-06 14:21:55 +01:00
sboursen-scinote 93851b8c90 Fix code style issues [SCI-7831] 2023-02-06 13:49:34 +01:00
sboursen-scinote 9023e8d1d4 Standarize the returned json when the request is not succesful [SCI-7831] 2023-02-06 13:31:11 +01:00
sboursen-scinote c39b660fe3 Format error before sending it from back-end [SCI-7831] 2023-02-06 13:29:15 +01:00
artoscinote 2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359 
Fix multiple route helper incluions [SCI-6359]
 2023-02-06 13:08:04 +01:00
Martin Artnik 7c6cca0615 Fix multiple route helper incluions [SCI-6359] 2023-02-06 13:03:12 +01:00
artoscinote 3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837 
Step timestamp display [SCI-7837]
 2023-02-06 12:03:02 +01:00
ajugo 442fd5e971
Fix protocol printing dialog [SCI-7889] (#4933) 2023-02-06 11:34:59 +01:00
sboursen-scinote a78f113498 Update the style of the form-group with errors [SCI-7831] 2023-02-06 11:31:25 +01:00
artoscinote 41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883 
Update the TinyMCE font [SC-7883]
 2023-02-06 11:19:29 +01:00
artoscinote d8c5bcedd1
Merge pull request #4926 from okriuchykhin/ok_SCI_7761 
Allow user management on archived projects [SCI-7761]
 2023-02-06 11:18:39 +01:00
ajugo 5104dab5b4
Show parent id for inventory snapshot items in exported excel [SCI-7671] (#4907) 2023-02-06 11:18:19 +01:00
ajugo 914cd3c2c8
Fix the eye icon on disable 2fa modal [SCI-7528] (#4906) 2023-02-06 11:17:57 +01:00
artoscinote 6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585 
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
 2023-02-06 11:17:43 +01:00
artoscinote 4405fa2cd9
Merge pull request #4913 from sboursen-scinote/sb_SCI-7814 
FIX: Tag modal opens in experiment table view [SCI-7814]
 2023-02-06 11:14:13 +01:00
artoscinote d9beafd9a7
Merge pull request #4903 from sboursen-scinote/sb_SCI-7676 
CSS: error messages at moving experiment [SCI-7676]
 2023-02-06 11:12:45 +01:00
sboursen-scinote 43680f1295 Remove the key prefix (e.g. Name:) from the form-control error message [SCI-7831] 2023-02-06 11:12:32 +01:00
Giga Chubinidze f3a4f316bb Update the TinyMCE font [SC-7883] 2023-02-05 23:02:59 +04:00
Giga Chubinidze 9595f434d0 on/at convention fix 2023-02-05 23:00:20 +04:00
Alex Kriuchykhin 958f9784b0
Add minimum length validation to label template name [SCI-7319] (#4930) 2023-02-03 15:36:32 +01:00
Giga Chubinidze ac4b090560 slight style refactor 2023-02-03 13:38:03 +04:00
sboursen-scinote ada165264a Bring the information flyout to the foreground in task panel [SCI-7832] 2023-02-03 08:25:07 +01:00
Giga Chubinidze ed4363484a Step timestamp display [SCI-7837] 2023-02-03 11:12:33 +04:00
Martin Artnik ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00
Oleksii Kriuchykhin 53fca4f022 Allow user managment on archived projects [SCI-7761] 2023-02-02 15:09:45 +01:00
Alex Kriuchykhin 15ac306244
Fix user auto linking with Azure AD [SCI-7764] (#4924) 2023-02-02 13:27:49 +01:00
Oleksii Kriuchykhin 8eafe0fd4a Fix Azure and Okta sign in links [SCI-7764] 2023-02-02 11:20:02 +01:00
Soufiane 937c8564f0
Update Invite new user to team modal [SCI-6007] (#4854) 
Update Invite new user to team modal [SCI-6007]
 2023-02-01 16:27:50 +01:00
Alex Kriuchykhin dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816 
Fix date time inventories reminder processing [SCI-7816]
 2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin e887e7c82b Merge branch 'develop' into features/sso-improvements 2023-02-01 16:08:56 +01:00
Alex Kriuchykhin 94806047c0
Make SSO feature switchable [SCI-7764] (#4916) 2023-02-01 15:43:20 +01:00
Anton a784518464 Fix heading styles for tinymce [SCI-7840] 2023-02-01 14:01:38 +01:00
aignatov-bio 39e213104b
Merge pull request #4914 from aignatov-bio/ai-sci-7826-fix-comments-css-in-experiment-table 
Fix comments css in experiment table [SCI-7826]
 2023-02-01 14:00:43 +01:00
ajugo 6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] (#4911) 
* Fix CSS for generated pdf/docx reports [SCI-7660]

* Call correct asset previewable function [SCI-7660]
 2023-02-01 12:01:18 +01:00
Anton e6baf20198 Fix comments css in experiment table [SCI-7826] 2023-02-01 11:42:43 +01:00
aignatov-bio e2da83ee6e
Merge pull request #4904 from aignatov-bio/ai-sci-7822-fix-dimension-calculation 
Fix label template logo dimension calculation [SCI-7822]
 2023-02-01 11:27:06 +01:00
ajugo cb3334e818
Fix datetime in repository advanced filters [SCI-7514] (#4910) 2023-02-01 10:33:36 +01:00
artoscinote 3742dc1e54
Merge pull request #4899 from sboursen-scinote/sb_SCI-7818 
Default sorting in tables is saved (user specific) [SCI-7818]
 2023-02-01 09:36:23 +01:00
artoscinote 5bd0a49550
Merge pull request #4895 from sboursen-scinote/sb_SCI-7811 
Fix: Edit title mode does not close [SCI-7811]
 2023-02-01 09:35:53 +01:00
artoscinote c88e63f8d9
Merge pull request #4893 from G-Chubinidze/gc_SCI_7813 
Lost sorting selection on experiment table view [SCI-7813]
 2023-02-01 09:30:27 +01:00
artoscinote 07b584e111
Merge pull request #4890 from G-Chubinidze/gc_SCI_7627 
My profile page updates of user data [SCI-7627]
 2023-02-01 09:29:37 +01:00
sboursen-scinote aaabf862a4 Hide module-tag-manage-modal controls when the user is not autorized [SCI-7814] 2023-01-31 15:42:43 +01:00
Giga Chubinidze e412f40948 simple logic update 2023-01-31 17:08:34 +04:00
Alex Kriuchykhin e1c4aa9469
Move Okta and Azure AD configurations to application settings [SCI-7609] (#4732) 2023-01-31 11:55:31 +01:00
sboursen-scinote 57838dc813 Reduce the height of the bluring element [SCI-7676] 2023-01-31 09:36:24 +01:00
aignatov-bio 1f1b51357c
Let multiple users to manage office files in results [SCI-7757] (#4902) 2023-01-30 17:48:37 +01:00
Oleksii Kriuchykhin fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
sboursen-scinote 408dd7dcd8 Reinitialize the Table when switching the View from archived to active [SCI-7674] 2023-01-30 15:33:08 +01:00
Anton 68f2db7996 Fix label template logo dimenstion calculation [SCI-7822] 2023-01-30 12:59:51 +01:00
sboursen-scinote 38412af02a Fix Hound issues [SCI-7676] 2023-01-30 12:32:55 +01:00
sboursen-scinote 6f153fe79a Fix Hound issues [SCI-7676] 2023-01-30 12:31:45 +01:00
sboursen-scinote 3112597e62 Fix the text more overlaping with the cell description [SCI-7676] 2023-01-30 12:24:25 +01:00
sboursen-scinote 42eae72d2a Update the layout of the move-experiment-modal when there are errors [SCI-7676] 2023-01-30 12:00:33 +01:00
sboursen-scinote 3f355ac108 Revert change to default table sorting [SCI-7818] 2023-01-27 15:54:34 +01:00
sboursen-scinote 4be094680a Enable inventories datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:44:39 +01:00
sboursen-scinote ae61d34a71 Enable reports datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:28:50 +01:00
Alex Kriuchykhin e7c61d6fd9
Fix smart annotation inventory items flyout, case with no available inventories [SCI-7824] (#4898) 2023-01-27 14:16:52 +01:00
Alex Kriuchykhin 02da980ab8
Fix task protocol editing with empty description [SCI-7823] (#4897) 2023-01-27 14:15:09 +01:00
sboursen-scinote 1dc0c8dcdf Enable label template datatable settings saving in localStorage [SCI-7818] 2023-01-27 14:10:32 +01:00
aignatov-bio 667e0be9f6
Add ability to move archived tasks [SCI-7733] (#4892) 2023-01-27 10:40:01 +01:00
sboursen-scinote d6194da3c6 Cancel action on Enter [SCI-7811] 2023-01-26 15:29:08 +01:00
sboursen-scinote 134acadb41 Cancel editing on Tab [SCI-7811] 2023-01-26 15:15:40 +01:00
Giga Chubinidze a0a81eee1c My profile page updates of user data [SCI-7627] 2023-01-26 17:01:54 +04:00
Giga Chubinidze 1fbce23788 Lost sorting selection on experiment table view [SCI-7813] 2023-01-26 17:00:03 +04:00
sboursen-scinote 2e037b69ff Fix Hound related issue [SCI-7585] 2023-01-26 09:23:37 +01:00
sboursen-scinote 36cc68f94a Fix Hound related issue [SCI-7585] 2023-01-26 09:20:20 +01:00
sboursen-scinote 95b339f759 Fix Hound related issue [SCI-7585] 2023-01-26 09:12:31 +01:00
sboursen-scinote b02889c801 Fix the behavior of the clear button [SCI-7585] 2023-01-26 09:03:08 +01:00
sboursen-scinote 15da0f2f33 Remove commented code and change the name of the hide filters method [SCI-7585] 2023-01-26 08:47:55 +01:00
sboursen-scinote adcb0e84f8 Add close button [SCI-7585] 2023-01-26 08:41:33 +01:00
sboursen-scinote ef7395b0cd Adjust the size of the clear button on small screens [SCI-7585] 2023-01-26 08:26:34 +01:00
Alex Kriuchykhin 7e1d1ffd99
Fix editing of existing reports [SCI-7817] (#4886) 
Co-authored-by: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
 2023-01-25 15:41:59 +01:00
sboursen-scinote ceb193deee Make the applyFilters button work again [SCI-7585] 2023-01-25 13:49:40 +01:00
sboursen-scinote e2521e501c Change the position of the clear button [SCI-7585] 2023-01-25 11:28:39 +01:00
sboursen-scinote 2c8c008e49 Extract the filters_list component and reset it on clear [SCI-7585] 2023-01-25 09:34:01 +01:00
Alex Kriuchykhin 00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
Martin Artnik 0a768fbfa3 Fix pasting same image multiple times [SCI-7803] 2023-01-24 11:52:20 +01:00
artoscinote 07f2b83f81
Merge pull request #4828 from sboursen-scinote/sb_SCI-7745 
Fix: Edit task from experiment table view - Enter causes error [SCI-7745]
 2023-01-24 10:21:20 +01:00
artoscinote d319f9bf89
Fix copying multiple TinyMCE images [SCI-7803] (#4875) 2023-01-24 10:11:52 +01:00
artoscinote 87fa3bc9a7
Merge pull request #4710 from G-Chubinidze/gc_SCI_7195 
Text block on step without title in rearrange modal [SCI-7195]
 2023-01-24 09:40:33 +01:00
Alex Kriuchykhin b3267d7934
Fix multiple inventory reminders issues [SCI-7805][SCI-7808][SCI-7809] (#4876) 2023-01-24 09:36:13 +01:00
Giga Chubinidze 01f6f4d5ea changed logic for item naming 2023-01-21 01:08:17 +04:00
G-Chubinidze 913cd26e70
Update of sharing options to all teams is not saved [SCI-7421] (#4852) 
* Update of sharing options to all teams is not saved
 2023-01-20 14:14:34 +01:00
sboursen-scinote 874b026c33 Clear table sci-checkbox after rename[SCI-7745] 2023-01-20 14:14:18 +01:00
sboursen-scinote 87ca1fcb77 Revert changes to clearRowTaskSelection [SCI-7745] 2023-01-20 13:54:41 +01:00
artoscinote 599ef71c90
Merge pull request #4863 from artoscinote/ma_SCI_7788 
Add tinymce image permission checks [SCI-7788]
 2023-01-20 11:44:51 +01:00
Martin Artnik fb4cbad4e8 Add tinymce image permission checks [SCI-7788] 2023-01-20 10:45:56 +01:00
Alex Kriuchykhin 5238a858bd
Fix tags modal in table view for archived tasks [SCI-7743] (#4867) 2023-01-20 10:21:52 +01:00
ajugo d178235dec
Fix the experiment table view checkbox toggling [SCI-7792] (#4866) 2023-01-19 17:59:41 +01:00