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

12801 commits

Author SHA1 Message Date
Andrej db43c96619 Add advance filtering to protocol template table [SCI-10288] 2024-02-28 15:21:09 +01:00
Martin Artnik ca26f60f7a
Merge pull request #7159 from G-Chubinidze/gc_SCI_10251 
Inventory duplicating and stock column issues [SCI-10251]
 2024-02-28 15:15:18 +01:00
wandji20 cefb6bac7e Fix saving experiment changes in edit modal [SCI-10325] 2024-02-28 14:23:10 +01:00
wandji20 b59392b932 Fix issue moving experiments [SCI-10292] 2024-02-28 13:58:09 +01:00
Giga Chubinidze cfa859b7c7 Inventory duplicating and stock column issues [SCI-10251] 2024-02-28 16:42:11 +04:00
sboursen-scinote 374ae646de Reset selected datatable row after actionToolbar action [SCI-10275] 2024-02-28 13:18:04 +01:00
Anton 0d7f3993f6 Fix versions modal [SCI-10296] 2024-02-28 12:42:31 +01:00
aignatov-bio 3f4189445b
Merge pull request #7154 from aignatov-bio/ai-sci-10289-fix-permission-assigned-task 
Small table fixes [SCI-10289][SCI-10293][SCI-10295]
 2024-02-28 11:51:07 +01:00
sboursen-scinote ce97d4d404 Center unread comments [SCI-10262] 2024-02-28 11:27:29 +01:00
Anton 089165477e Small table fixes [SCI-10289][SCI-10293][SCI-10295] 2024-02-28 11:25:24 +01:00
Anton 588f69efd7 Fix protocol sorting [SCI-10287] 2024-02-28 10:54:28 +01:00
aignatov-bio dda7e039b0
Merge pull request #7151 from wandji20/wb-SCI-10290 
Fix operation & unit fields in stock modal missing [SCI-10290]
 2024-02-28 10:31:10 +01:00
aignatov-bio 73e9e16586
Merge pull request #7150 from wandji20/wb-SCI-10265 
Fix double request for create task modal [SCI-10265]
 2024-02-28 10:30:33 +01:00
aignatov-bio c3ac951fd1
Merge pull request #7148 from sboursen-scinote/sb_SCI-10286 
Show repositories that don't contain any items in the list [SCI-10286]
 2024-02-28 10:30:13 +01:00
aignatov-bio 75cce6698d
Merge pull request #7144 from aignatov-bio/ai-sci-10279-fix-table-comments-bugs 
Fix table and comments bugs [SCI-10279][SCI-10285]
 2024-02-28 10:21:20 +01:00
wandji20 47750d5e4f Fix operation & unit fields in stock modal missing [SCI-10290] 2024-02-28 03:57:40 +01:00
wandji20 1f155100cd Fix double requestfor create task modal [SCI-10265] 2024-02-28 03:05:32 +01:00
sboursen-scinote 47daae5b26 Show repositories that don't contain any items in the list [SCI-10286] 2024-02-27 21:05:30 +01:00
Martin Artnik 9666dd994f
Merge pull request #7069 from G-Chubinidze/gc_SCI_101000 
Implement sorting on all columns of tables revamped in v.1 [SCI-10100]
 2024-02-27 16:03:03 +01:00
aignatov-bio f9aceeb78d
Merge pull request #7145 from wandji20/wb-SCI-10265 
Add micro-interactions on the revamped modals [SCI-10265]
 2024-02-27 14:11:29 +01:00
aignatov-bio 5d3bbe7703
Merge pull request #7138 from wandji20/wb-SCI-10210 
Default table to try and fit all columns to screen [SCI-10210]
 2024-02-27 14:09:24 +01:00
Giga Chubinidze 4488243fad hound fix [SCI-10100] 2024-02-27 16:41:20 +04:00
G-Chubinidze f75d3b3952
Merge branch 'develop' into gc_SCI_101000 2024-02-27 16:38:04 +04:00
Giga Chubinidze 980468cb41 Added back backend code for table column sorting [SCI-10100] 2024-02-27 16:34:55 +04:00
wandji20 0070db5e78 Add micro-interactions on the revamped modals [SCI-10265] 2024-02-27 13:03:41 +01:00
Martin Artnik 02e8fc4e45
Merge pull request #7143 from G-Chubinidze/gc_SCI_10254 
Loading file to results - wrong file and preview [SCI-10254]
 2024-02-27 11:41:44 +01:00
aignatov-bio fb734b1b3e
Merge pull request #7137 from aignatov-bio/ai-sci-10267-replace-old-access-modal 
Replace old access modal [SCI-10267]
 2024-02-27 11:26:32 +01:00
aignatov-bio f48969f76d
Merge pull request #7139 from sboursen-scinote/sb_SCI-10264 
Remove custom cursor icons [SCI-10264]
 2024-02-27 11:25:35 +01:00
Anton 33cbfd4435 Fix table and comments bugs [SCI-10279][SCI-10285] 2024-02-27 11:23:23 +01:00
Giga Chubinidze ca831cb103 Loading file to results - wrong file and preview [SCI-10254] 2024-02-27 12:48:34 +04:00
sboursen-scinote 0c8db98700 Style the unseen comments in the task table [SCI-10262] 2024-02-26 17:43:07 +01:00
ajugo 512bf155c3
Merge pull request #7141 from lasniscinote/gl_SCI_10220 
(fix) Add shortcut to add new step (+) after the last step [SCI-10220]
 2024-02-26 17:03:07 +01:00
Gregor Lasnibat 01253da5af (fix) Add shortcut to add new step (+) after the last step [SCI-10220] 2024-02-26 16:45:13 +01:00
Gregor Lasnibat 79910d3141 (fix) Add warning for unsaved changes when leaving Task workflow edit mode (Canvas view) [SCI-10004] 2024-02-26 15:57:36 +01:00
sboursen-scinote e9242b1ab3 Remove custom cursor icons [SCI-10264] 2024-02-26 15:56:12 +01:00
wandji20 5985f866b9 Default table try and fit all columns to screen [SCI-10210] 2024-02-26 15:24:19 +01:00
Anton 5902161cb9 Replace old access modal [SCI-10267] 2024-02-26 15:22:09 +01:00
Anton b0504bc2a0 Fix conflicts 2024-02-26 10:47:47 +01:00
Anton d72e63a0f2 Merge branch 'develop' into features/inventory-import-improvements 2024-02-26 10:46:49 +01:00
aignatov-bio aa68e18b34
Merge pull request #7132 from sboursen-scinote/sb_SCI-10273 
Add missing (you) mark for current user in Grant Access modal [SCI-10273]
 2024-02-26 10:31:36 +01:00
aignatov-bio e4ccf2e377
Merge pull request #7133 from sboursen-scinote/sb_SCI-10270 
Missing filtering by signatures on task table [SCI-10270]
 2024-02-26 10:31:09 +01:00
sboursen-scinote 5aae4e0db6 Add missing filtering by signatures on task table [SCI-10270] 2024-02-23 12:30:35 +01:00
Giga Chubinidze 6aa3532472 Checklist/table/RTF titles are in one line [SCI-10238] 2024-02-23 14:10:48 +04:00
sboursen-scinote 7a88eaacbc Add missing (you) mark for current user in Grant Access modal [SCI-10273] 2024-02-23 10:41:48 +01:00
aignatov-bio 8bb080094a
Merge pull request #7130 from wandji20/wb-SCI-10266 
Add team to task list serializer and service [SCI-10266]
 2024-02-23 09:58:05 +01:00
wandji20 703259bb1f Add team to task list serializer and service [SCI-10266] 2024-02-22 13:38:24 +01:00
G-Chubinidze a62acd44b5
Merge branch 'develop' into gc_SCI_10177 2024-02-22 14:49:31 +04:00
aignatov-bio 968b34d74c
Merge pull request #7128 from aignatov-bio/ai-sci-10245-fix-multiple-resize-column 
Fix multiple resize [SCI-10245]
 2024-02-22 11:12:05 +01:00
aignatov-bio a873b97c97
Merge pull request #7129 from scinote-eln/features/new-datatable 
Features/new datatable
 2024-02-22 11:06:40 +01:00
Anton 41e92dd1e2 Fix multiple resize [SCI-10245] 2024-02-21 19:44:22 +01:00
wandji20 8221466666 Replace task flow buttons partial after successful change of task status [SCI-10198] 2024-02-21 15:25:04 +01:00
Martin Artnik 35ce14a929 Fix MarvinJS initiaization [SCI-10260] 2024-02-21 13:29:29 +01:00
Giga Chubinidze 50eefaf38b remove update flag from new dropdowns [SCI-10177] 2024-02-21 15:59:05 +04:00
Anton 52fdc53508 Fix merge 2024-02-21 12:54:00 +01:00
Anton ed0db94089 Merge branch 'develop' into features/new-datatable 2024-02-21 12:51:17 +01:00
Anton fdee40ba97 Fix protocol access template [SCI-10242] 2024-02-21 12:33:30 +01:00
Martin Artnik d4f35f51bd Fix loading of MarvinJS object (when MarvinJS is disabled) [SCI-10260] 2024-02-21 10:58:49 +01:00
Giga Chubinidze caab8fbc38 removed repository id query [SCI-10100] 2024-02-21 04:31:49 +04:00
Martin Artnik f8aae8aca6 Merge branch 'develop' into features/inventory-import-improvements 2024-02-20 15:18:07 +01:00
Gregor Lasnibat 68e9d3f400
Merge pull request #7058 from lasniscinote/gl_SCI_10076 
(fix) TinyMCE issues - Code samples & Wide tables [SCI-10076]
 2024-02-20 14:42:28 +01:00
Gregor Lasnibat 7c4e4a8ee7 (fix) TinyMCE issues - Code samples & Wide tables [SCI-10076] 2024-02-20 14:31:37 +01:00
Anton a41278c0f8 Hide empty filters at tables [SCI-10241] 2024-02-20 12:52:09 +01:00
aignatov-bio b8babaa429
Merge pull request #7107 from ivanscinote/SCI-10163-ik 
Refactor fetching/applying table state [SCI-10163]
 2024-02-20 11:06:11 +01:00
Martin Artnik 425b189742
Merge pull request #7114 from artoscinote/ma_SCI_10240 
Disable button and add loader when importing inventory items [SCI-10240]
 2024-02-20 11:01:15 +01:00
aignatov-bio 286430ea51
Merge pull request #7113 from aignatov-bio/ai-sci-10208-fix-flyouts-in-main-navigation 
Fix flyouts in main navigation [SCI-10208]
 2024-02-20 11:00:56 +01:00
aignatov-bio b1f8c26adb
Merge pull request #7105 from lasniscinote/gl_SCI_10223_core 
(fix) Dropdown for addons microinteractions [SCI-10223-core]
 2024-02-20 11:00:19 +01:00
Martin Artnik 102caffe01 Disable button and add loader when importing inventory items [SCI-10240] 2024-02-20 10:58:09 +01:00
Anton bcad0145a3 Fix flyouts in main navigation [SCI-10208] 2024-02-20 10:55:03 +01:00
Andrej 17b1c87c1b Improve query for assigned task counter on protocol template [SCI-10171] 2024-02-20 10:46:49 +01:00
G-Chubinidze 1dccae57e2
Merge branch 'features/new-datatable' into gc_SCI_10189 2024-02-20 13:38:40 +04:00
Giga Chubinidze d4661fc2c7 fix hound [SCI-10189] 2024-02-20 13:37:17 +04:00
Andrej a6774772a4 Improve query for assigned task counter on protocol template [SCI-10171] 2024-02-20 09:55:45 +01:00
Giga Chubinidze 3f5b0dd30c To add "Archived on"column to Projects table (archived state) & rename column titles of "archived on" [SCI-10189] 2024-02-20 03:35:38 +04:00
Andrej 22908fe139 Fix assigned repository export in project export [SCI-10193] 2024-02-19 18:08:12 +01:00
Ivan Kljun 2827dd3de3 Refactor fetching/applying table state [SCI-10163] 2024-02-19 15:26:51 +01:00
Gregor Lasnibat a5043a0528 (fix) Quartzy microinteractions [SCI-10223-core] 2024-02-19 14:14:05 +01:00
Anton c893ee19f9 Small table fixes [SCI-10211] 2024-02-19 13:01:37 +01:00
Martin Artnik fc441bbfaa Fixed typos in clone experiment action [SCI-10232] 2024-02-19 10:46:47 +01:00
Giga Chubinidze 26881eccdb Fixed repository id column [SCI-10100] 2024-02-19 02:55:18 +04:00
Giga Chubinidze 8a0171eefa Replace legacy vue components in Item Card [SCI-10177] 2024-02-19 02:39:02 +04:00
Martin Artnik 41df10a2ee
Merge pull request #7103 from artoscinote/ma_SCI_10228 
Fix making backup copy of conflicting files [SCI-10228]
 2024-02-16 13:26:40 +01:00
Anton 54428ff4f1 Fix routes for experiments my modules [SCI-10207] 2024-02-16 13:15:47 +01:00
Martin Artnik 7ac00c5007 Fix making backup copy of conflicting files [SCI-10228] 2024-02-16 13:06:17 +01:00
Alex Kriuchykhin 156f9bda9c
Fix text extraction for cloned files [SCI-10227] (#7101) 2024-02-16 12:51:47 +01:00
Ivan Kljun aae8d4d227 Remove team arg from post_process_file [SCI-10103] 2024-02-16 10:39:19 +01:00
wandji 2798005eb6
Only call inventory table restoreColumnSize in save state callbback on initial load [SCI-10195] (#7100) 2024-02-16 10:22:24 +01:00
Ivan Kljun c8b910ebc4 Merge remote-tracking branch 'upstream/develop' into SCI-10103-ik2 2024-02-16 10:06:27 +01:00
Ivan Kljun c043a9375a Fix asset sync update to account for WOPI and post process [SCI-10103] 2024-02-16 09:53:26 +01:00
wandji f48bb35c67
Only call inventory table restoreColumnSize in save state callbback on initial load [SCI-10195] (#7097) 2024-02-16 09:45:06 +01:00
Martin Artnik c273219a00 Block header links of smart annotation on long loads [SCI-10087] 2024-02-15 14:49:22 +01:00
Martin Artnik 916b310459
Merge pull request #7095 from ivanscinote/SCI-10033-ik 
Fix saving last_modified_by for WOPI audit trails [SCI-10033]
 2024-02-15 14:21:20 +01:00
Ivan Kljun e35878a9b8 Fix saving last_modified_by for WOPI audit trails [SCI-10033] 2024-02-15 14:14:38 +01:00
Martin Artnik 090f42c36b
Merge pull request #7094 from artoscinote/ma_SCI_10224 
Modal code cleanup [SCI-10224]
 2024-02-15 14:11:58 +01:00
Martin Artnik 35dc70048e Modal code cleanup [SCI-10224] 2024-02-15 14:10:24 +01:00
Gregor Lasnibat 82d9996f22
(fix) CSS for Quartzy [SCI-10159-core] (#7090) 2024-02-15 14:05:31 +01:00
Anton d1251f7440 Save selection between pages [SCI-10095] 2024-02-15 13:59:55 +01:00
Martin Artnik 87eeaab08d Fix WOPI editing not opening in new tab [SCI-10224] 2024-02-15 13:15:05 +01:00
ajugo e026f2b135
Add check for showing consumption column [SCI-10185] (#7085) 2024-02-15 13:00:09 +01:00
Gregor Lasnibat 34777d766d
Merge pull request #7091 from lasniscinote/gl_SCI_10086 
(fix) Non decimal number in inventory table has commas [gl-SCI-10086]
 2024-02-15 12:56:39 +01:00
Soufiane 5634877e95
Fix Axios get request syntax [SCI-10075] (#7088) 2024-02-15 12:55:40 +01:00
Gregor Lasnibat 71bbe02eba (fix) Non decimal number in inventory table has commas [gl_SCI_10086] 2024-02-15 12:50:31 +01:00
wandji 9b356a9837
Load label templates and printers only when the print modal is shown and fix double validate template request [SCI-10155] (#7083) 2024-02-15 12:42:24 +01:00
ajugo b14912e70e
Fix assigned repository export in project export [SCI-10193] (#7087) 2024-02-15 11:33:23 +01:00
Anton b5f08d2542 Add new render for task tags [SCI-10106] 2024-02-15 10:10:15 +01:00
ajugo ab061ee0f8
Improve loading speed of protocol template [SCI-10171] (#7086) 2024-02-14 09:39:22 +01:00
ajugo 7fe6aae843
Fix consumption check for full view repository [SCI-10184] (#7082) 2024-02-13 15:05:34 +01:00
Soufiane daa5280521
Update the navigator tree on state change and owner assignement permission change [SCI-10123] (#7081) 2024-02-13 15:04:57 +01:00
ajugo 230b580ba2
Improve loading speed of protocol template [SCI-10171] (#7077) 2024-02-13 15:04:30 +01:00
Gregor Lasnibat fd74a127ae
(fix) The spy bar should run along the entire height of the sections on the item card [SCI-10111] (#7056) 2024-02-13 10:17:36 +01:00
Martin Artnik bf6e990435
Merge pull request #7080 from artoscinote/ma_SCI_10087 
Show loader when loading smart annotations [SCI-10087]
 2024-02-12 15:54:35 +01:00
Martin Artnik baa2201622
Merge pull request #7070 from ivanscinote/SCI-10122-ik 
Add polling for asset changes for SciNote Edit [SCI-10122]
 2024-02-12 14:15:48 +01:00
Soufiane ef16651cf3
Fix Docx preview marking as ready [SCI-10037] (#7074) 2024-02-12 13:44:02 +01:00
Martin Artnik f2d06a9636 Show loader when loading smart annotations [SCI-10087] 2024-02-12 12:58:57 +01:00
aignatov-bio b624eab0a5
Merge pull request #7079 from aignatov-bio/ai-sci-8328-all-users-have-same-avatar 
Small fixes for table [SCI-8328]
 2024-02-12 12:31:51 +01:00
Anton d57b056831 Small fixes for table [SCI-8328] 2024-02-12 12:29:50 +01:00
Anton afc256ae15 Replace legacy tags modal [SCI-10125] 2024-02-12 12:22:20 +01:00
Martin Artnik 86ab489da3 SciNote version modal fixes [SCI-10183] 2024-02-12 11:25:34 +01:00
Gregor Lasnibat 24901016bc
(fix) Unable to input a decimal into the stock value regularly [SCI-10117] (#7075) 2024-02-12 11:02:51 +01:00
wandji 49f8274e98
Set default image preview opacity to 1 [SCI-10058] (#7022) 2024-02-12 10:12:31 +01:00
Giga Chubinidze a164eec850 Implement sorting on all columns of tables revamped in v.1 [SCI-10100] 2024-02-09 03:32:43 +04:00
Soufiane ff7a970326
Extend title row width in P/E/T to full width [SCI-10110] (#7072) 2024-02-07 16:07:12 +01:00
Gregor Lasnibat 4f76fabc39
Merge pull request #7068 from lasniscinote/gl_SCI_10107 
(fix) The item card will refresh when the time field is not changed [SCI-10107]
 2024-02-07 15:59:56 +01:00
ajugo e706686383
Fix loading of shareModal during navigation through the site [SCI-10112] (#7061) 2024-02-07 15:37:36 +01:00
Ivan Kljun 5276faa74b Fix applying last_modified_by at asset update [SCI-10033] 2024-02-07 15:31:13 +01:00
Anton 29fd71c76a Fix sanity checks issues [SCI-10095] 2024-02-07 12:23:21 +01:00
Ivan Kljun aec115f669 Add polling for asset changes for SciNote Edit [SCI-10122] 2024-02-07 11:26:40 +01:00
Gregor Lasnibat 384f94036d (fix) The item card will refresh when the time field is not changed [SCI-10107] 2024-02-06 16:31:59 +01:00
Anton 25defa9e43 Update tags modal [SCI-10105] 2024-02-06 15:28:00 +01:00
Alex Kriuchykhin 8fa1c21e73
Fix snapshoting for LinkedRepository caused by external_id uniqueness constraint [SCI-9817] (#7066) 2024-02-06 14:23:01 +01:00
wandji e678e593ac
Bound dropdowns to dropdown container in inventory table [SCI-10109] (#7064) 2024-02-06 14:22:52 +01:00
Gregor Lasnibat e8c74a057e (fix) Missing page data at opening result page from link [SCI-9462] 2024-02-06 12:59:37 +01:00
Alex Kriuchykhin 8abc39d4f6
Fix cloning for LinkedRepository coused by external_id uniqueness constraint [SCI-9879] (#7063) 2024-02-06 12:59:21 +01:00
Anton 51d9dbcd63 Fix experiment menu [SCI-10149] 2024-02-06 11:17:39 +01:00
ajugo 80735c0a01
Fix clearing of the repository filters [SCI-10115] (#7060) 2024-02-06 09:09:58 +01:00
Alex Kriuchykhin 342e9dbb19
Switch to asset text extraction with ActiveStorage analyzer [SCI-9954] (#6956) 2024-02-05 16:24:06 +01:00
wandji 4cb55e06af
Allow sending wopi_action url for all wopi file previews [SCI-9836] (#7054) 2024-02-05 16:23:24 +01:00
wandji ea0cdf5811
Set placeholder color for shared task modal textarea field [SCI-10120] (#7055) 2024-02-05 15:54:07 +01:00
Alex Kriuchykhin 7155d7862a
Add missing dependent option to many-to-many relations [SCI-10036] (#7024) 2024-02-05 13:36:12 +01:00
Martin Artnik 6d10159fce
Merge pull request #7049 from lasniscinote/gl_SCI_10099 
(fix) Create new SciNote-apps section and place SciNote Edit in [SCI-10099]
 2024-02-05 13:26:05 +01:00
Martin Artnik 9c51e15898
Merge pull request #7053 from artoscinote/ma_SCI_9757 
Open locally button fixes on preview [SCI-9757]
 2024-02-05 13:19:05 +01:00
Martin Artnik 3a700bae13 Add create activity in case of asset sync file conflict [SCI-10021] 2024-02-05 13:12:21 +01:00
Martin Artnik b5b29f66fc Open locally button fixes on preview [SCI-9757] 2024-02-05 12:45:15 +01:00
ajugo 71be4db51b
Fix sorting of teams on shared inventory modal window and sorting on task assigning modal [SCI-4716] (#7051) 2024-02-05 10:27:01 +01:00
ajugo 6184d0caa8
Add obsolete tag for not used activites [SCI-10121] (#7050) 2024-02-05 10:25:20 +01:00
mvrazic bbfe61e376
e2e - added new tags at repoItemSidebar [SCI-10126] (#7040) 2024-02-05 10:21:35 +01:00
wandji 5bdfc41f94
Improve logic for unsharing shared task [SCI-10097] (#7026) 2024-02-05 10:18:56 +01:00
Soufiane e85f48d51f
Delay marking Docx report as ready till after preview is created [SCI-10037] (#7025) 2024-02-05 10:18:23 +01:00
Gregor Lasnibat e2f91697f4 (fix) Create new Add-ons section and place SciNote Edit in [SCI-10099] 2024-02-02 15:06:06 +01:00
aignatov-bio b560cf9e7b
Merge pull request #7048 from aignatov-bio/ai-sci-10116-add-helpers-e2e-testing 
Add helpers for e2e testing [SCI-10116]
 2024-02-02 13:28:39 +01:00
Anton 7b80d88585 Add helpers for e2e testing [SCI-10116] 2024-02-02 13:20:51 +01:00
Gregor Lasnibat 448a23455a
(fix) Non decimal number in inventory table has commas [gl_SCI_10086] (#7038) 2024-02-02 13:06:19 +01:00
ajugo 1948757d15
Add transparent background for perfect scrollbar [SCI-10050] (#7027) 2024-02-02 09:57:08 +01:00
Anton 95492dd884 Fix infinite scroll for new tables [SCI-10098] 2024-02-01 15:15:12 +01:00
Anton fe92ab7caa Fix column name truncate [SCI-10102] 2024-02-01 13:45:36 +01:00
Soufiane 41407700d9
Fix various CSS issues with P/E/T [SCI-7842] (#7028) 
- User smart annotation gets out of comment border.

- Title not in line for live and snapshot version of assigned items to task full preview page.
 2024-02-01 13:17:48 +01:00
aignatov-bio 7a154c8fda
Merge pull request #7042 from aignatov-bio/ai-sci-data-tables-css-fixes 
Data table small css fixes
 2024-02-01 11:48:44 +01:00
Anton 0e94d72442 Data table small css fixes 2024-02-01 11:47:31 +01:00
Martin Artnik 3bf0cec084 Fix download SciNote edit button [SCI-9760] 2024-02-01 11:24:08 +01:00
Ivan Kljun e4e3a61c5a Merge remote-tracking branch 'upstream/features/new-datatable' into SCI-9983-ik 2024-02-01 11:00:31 +01:00
Martin Artnik 1458fd20a8
Merge pull request #6991 from ivanscinote/SCI-10010-ik 
Add wrong-version modal for SciNote Edit [SCI-10010]
 2024-02-01 10:49:30 +01:00
Ivan Kljun 78f3456da0 Move modals logic to open_locally.js [SCI-10010] 2024-02-01 10:42:40 +01:00
Martin Artnik baa5a57822
Merge pull request #7002 from ivanscinote/SCI-10033-ik 
Update last_modified_by for assets on edit [SCI-10033]
 2024-02-01 10:19:08 +01:00
Martin Artnik d24d9a0863
Merge pull request #7014 from G-Chubinidze/gc_SCI_10059 
New Module Modal: Error messages are stacked [SCI-10059]
 2024-02-01 10:17:34 +01:00
Ivan Kljun cc4fa19bc1 Merge remote-tracking branch 'upstream/develop' into SCI-10010-ik 2024-02-01 10:15:58 +01:00
aignatov-bio 7ac549e20d
Revert "Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]" 2024-02-01 09:36:13 +01:00
aignatov-bio f5fee23f7d
Merge pull request #7033 from aignatov-bio/ai-sci-10090-update-manage-columns-modal 
Update columns manage modal [SCI-10090]
 2024-02-01 09:31:18 +01:00
G-Chubinidze 4f8524bc42
Merge branch 'features/new-datatable' into gc_SCI_10012 2024-02-01 12:30:58 +04:00
Martin Artnik a06cf058f1
Merge pull request #7036 from G-Chubinidze/gc_SCI_10095 
Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095]
 2024-02-01 09:28:55 +01:00
G-Chubinidze 8fc3f18213
Merge branch 'features/new-datatable' into gc_SCI_10094 2024-02-01 11:59:58 +04:00
Giga Chubinidze b6355ea29e Implement design page for icons [SCI-10094] 2024-02-01 06:00:01 +04:00
Giga Chubinidze a853df18bc Bug fixes from table sanity check - Part 2(inventories, tasks) [SCI-10095] 2024-02-01 05:30:10 +04:00
Martin Artnik bdaca8d81a
Merge pull request #7029 from artoscinote/ma_SCI_9840 
Fix experiment bulk move permission checks, specs [SCI-9840]
 2024-01-31 16:51:34 +01:00
Martin Artnik 041acb548c
Merge pull request #7034 from artoscinote/ma_SCI_9757 
Preview Open locally menu fixes [SCI-9795]
 2024-01-31 15:54:03 +01:00
Martin Artnik 62d1b7c10b
Merge pull request #7031 from lasniscinote/gl_SCI_9923 
(fix) Spacing between lines in RTF is not correct [SCI-9923]
 2024-01-31 15:39:44 +01:00
Martin Artnik 4739da3ed1 Preview Open locally menu fixes [SCI-9795] 2024-01-31 15:15:24 +01:00
Anton f43718ea6d Update columns manage modal [SCI-10090] 2024-01-31 15:05:16 +01:00
sboursen-scinote 90c5cb366d Fix Axios get request syntax [SCI-10075] 2024-01-31 14:52:51 +01:00
Gregor Lasnibat 6b263c6771 (fix) Spacing between lines in RTF is not correct [SCI-9923] 2024-01-31 14:31:09 +01:00
Martin Artnik 73541e8c42 Fix experiment bulk move permission checks, specs [SCI-9840] 2024-01-31 13:52:56 +01:00
Martin Artnik 378b2dc12e
Merge pull request #7015 from lasniscinote/gl_SCI_10002_core 
(dev) Redesign Addons page in the Settings [SCI-10002-core]
 2024-01-31 11:27:02 +01:00
Martin Artnik ce90fb63c8
Merge pull request #7004 from lasniscinote/gl_SCI_10017 
(fix) Relationship modal selections are preserved [SCI-10017]
 2024-01-31 11:26:40 +01:00
ajugo 9d48cbbb86
Improve error handling for label printing [SCI-10039] (#6997) 2024-01-31 11:10:11 +01:00
Gregor Lasnibat 6f72727e38 (dev) Redesign Addons page in the Settings [SCI-10002-core] 2024-01-31 10:22:22 +01:00
Soufiane 2f997cdd78
Fix the loading order of the actions toolbar [SCI-9981] (#7019) 2024-01-30 14:45:36 +01:00
wandji 5bc542e834
Fix displayed comment counter for first comment in protocol steps and results [SCI-9573] (#7013) 2024-01-30 14:35:44 +01:00
Soufiane e5384ee52a
Trim protocol keyword names before creation [SCI-9388] (#7017) 2024-01-30 14:34:34 +01:00
wandji 2691fe91c6
Update HTML for editing unsupported ms office file formats [SCI-9901] (#7023) 2024-01-30 14:33:50 +01:00
ajugo f6a7d76c0f
Remove default value for dates in inventory filters [SCI-9360] (#7016) 2024-01-30 14:32:51 +01:00
Anton 72b40a63a0 Merge branch 'develop' into features/new-datatable 2024-01-30 12:02:04 +01:00
Martin Artnik aa4a6a5868
Merge pull request #7009 from G-Chubinidze/gc_SCI_9987_v2 
Make File Checkout feature switchable in settings [SCI-9987]
 2024-01-30 11:21:46 +01:00
Giga Chubinidze 61c34e72aa Make File Checkout feature switchable in settings [SCI-9987] 2024-01-30 14:19:45 +04:00
aignatov-bio 5725e5808c
Merge pull request #7021 from aignatov-bio/ai-sci-10091-update-access-modal 
Update access modal [SCI-10091]
 2024-01-30 10:53:35 +01:00
Anton 007bebed46 Update access modal [SCI-10091] 2024-01-30 10:28:02 +01:00
Gregor Lasnibat 6d3b604276 (fix) TypeError is logged when you press backspace in an empty keywords input field [SCI-9389] 2024-01-29 15:20:32 +01:00
aignatov-bio 94a3d551a3
Merge pull request #7008 from ivanscinote/SCI-10081-ik 
Implement search on PET tables [SCI-10081]
 2024-01-29 11:45:20 +01:00
aignatov-bio 7b720cc674
Merge pull request #7006 from aignatov-bio/ai-sci-10092-update-designated-users 
Update task table designated users [SCI-10092]
 2024-01-29 11:45:07 +01:00
Giga Chubinidze 171770a7d3 Using tailwind [SCI-10012] 2024-01-29 12:49:55 +04:00
Giga Chubinidze 086c06ab51 New Module Modal: Error messages are stacked [SCI-10059 2024-01-29 12:08:03 +04:00
Soufiane 7f30547182
Fix various issues with Inventories [SCI-10014] (#6979) 
- Show added-by column by default.
- Show stock column in view mode if stock is disabled.
- Prevent column name wrapping in column manage modal.
 2024-01-26 15:24:17 +01:00
ivanscinote a719ceb247
Fix publish-draft button [SCI-9953] (#6957) 2024-01-26 15:22:18 +01:00
ivanscinote 9b3f107d13
Fix stackable header z-index [SCI-9759] (#6914) 2024-01-26 15:21:35 +01:00
Anton 6c76e967cb Fix columns sizes [SCI-10093] 2024-01-26 13:24:11 +01:00
Ivan Kljun 67d78092b4 Implement search on PET tables [SCI-10081] 2024-01-26 09:29:39 +01:00
Anton fad8b53222 Update task table designated users [SCI-10092] 2024-01-25 15:56:48 +01:00
Oleksii Kriuchykhin 384afbcc4b Merge branch 'features/asset-sync' into develop 2024-01-25 11:32:26 +01:00
G-Chubinidze ff7e225b41
Merge pull request #7003 from G-Chubinidze/gc_SCI_9986_v2 
Changed notification flyout settings to smaller text [SCI-9986]
 2024-01-25 12:27:35 +04:00
Gregor Lasnibat 54c0534a8d (fix) Relationship modal selections are preserved [SCI-10017] 2024-01-25 09:12:57 +01:00
Giga Chubinidze c5dd3905eb Changed notification flyout settings to smaller text [SCI-9986] 2024-01-25 11:34:22 +04:00
Ivan Kljun 24faeae5de Update last_modified_by for assets on edit [SCI-10033] 2024-01-24 15:18:34 +01:00
Martin Artnik b61331b6cb
Merge pull request #7000 from ivanscinote/SCI-10020-ik 
Add error messages to AssetSyncController [SCI-10020]
 2024-01-24 14:46:58 +01:00
Anton 6bce6808f2 Fix small sanity check bugs [SCI-10080] 2024-01-24 14:06:26 +01:00
Ivan Kljun 718f5fbfad Add error messages to AssetSyncController [SCI-10020] 2024-01-24 11:02:37 +01:00
Martin Artnik cc29759dd9
Merge pull request #6967 from G-Chubinidze/gc_SCI_9986_v2 
Add "Settings" link to Notifications modal [SCI-9986]
 2024-01-24 10:45:22 +01:00
ajugo fc99c0ef5b
Fix reordering of the result elements [SCI-10079] (#6998) 2024-01-24 10:07:59 +01:00
Alex Kriuchykhin f9a1b952b6
Split inventory item relationships API V2 endpoint into separate endpoints for parents and children [SCI-10078] (#6996) 2024-01-24 10:04:38 +01:00
Giga Chubinidze ab2b6b589a Implement button examples [SCI-10012] 2024-01-24 12:47:45 +04:00
Ivan Kljun 6b50039dac Change event name to be same as function name [SCI-10010] 2024-01-24 09:32:31 +01:00
Gregor Lasnibat b8173988f9
Merge pull request #6994 from lasniscinote/gl_SCI_10029 
(fix) CSS: Error message for too big file in inventory table [SCI-10029]
 2024-01-23 20:27:40 +01:00
Ivan Kljun c2fa110fb2 Merge remote-tracking branch 'upstream/features/asset-sync' into SCI-10010-ik 2024-01-23 15:32:27 +01:00
Anton 75bbd993ee Fix workflow image update [SCI-10073] 2024-01-23 15:20:12 +01:00
Gregor Lasnibat 76ec7a0189 (fix) CSS: Error message for too big file in inventory table [SCI-10029] 2024-01-23 15:15:46 +01:00
Gregor Lasnibat 73beb3abf5
Merge pull request #6992 from lasniscinote/gl_SCI_10074 
(fix) Content disappears until page refresh when moving it between results [SCI-10074]
 2024-01-23 14:58:21 +01:00
Martin Artnik bd4471b98b
Merge pull request #6865 from G-Chubinidze/gc_SCI_9840 
"Move" feature for multiple selected tasks and experiments (bulk action) [SCI-9840]
 2024-01-23 14:32:23 +01:00
Giga Chubinidze 98af81cd8a Changed error handling [SCI-9840] 2024-01-23 17:28:11 +04:00
Gregor Lasnibat e46cfdc0d4 (fix) Content disappears until page refresh when moving it between results [SCI-10074] 2024-01-23 14:10:08 +01:00
Ivan Kljun 0eb323b2f1 Add wrong-version modal for SciNote Edit [SCI-10010] 2024-01-23 11:54:42 +01:00
Andrej c90c29332f Fix archive label for assigned items on repository cards [SCI-10072] 2024-01-23 11:38:59 +01:00
Oleksii Kriuchykhin d71061a75d Merge branch 'release/1.28.0' into develop 2024-01-23 11:17:14 +01:00
Anton 9277d646ac Small fixes for table [SCI-10045] 2024-01-23 11:08:42 +01:00
Alex Kriuchykhin bbe01f9d38
Fix inclusion of TinyMCE images in project exports [SCI-10051] (#6988) 2024-01-23 10:16:25 +01:00
Martin Artnik c3bee668dc
Merge pull request #6987 from artoscinote/ma_SCI_9757 
Fix Open menu in attachment preview screen [SCI-9757]
 2024-01-23 10:02:04 +01:00
ajugo 32b721e07d
Remove Assigned section from item card for snapshot [SCI-10066] (#6986) 2024-01-23 09:27:00 +01:00
Gregor Lasnibat 85cd24fa81
(fix) Assign from task page is closed at opening item card [SCI-10063] (#6985) 2024-01-23 09:26:30 +01:00
Martin Artnik 81a4924d6b Fix Open menu in attachment preview screen [SCI-9757] 2024-01-22 16:41:10 +01:00
ajugo 53253b462e
Fix loading project activites [SCI-10034] (#6977) 2024-01-22 15:32:30 +01:00
Anton 1fff6da45d Refactor checklist [SCI-9959] 2024-01-22 14:01:32 +01:00
Gregor Lasnibat fc606a7dd4 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-22 11:01:31 +01:00
Soufiane 313782d3d4
Implement API V2 tests for item relationships [SCI-10038] (#6972) 2024-01-22 10:50:23 +01:00
wandji 482472fb21
Fix missing unlink icon for child item relationship [SCI-10062] (#6982) 2024-01-22 10:49:07 +01:00
Soufiane e70889c001
Unlink items to other shared repositories on unsharing [SCI-10055] (#6981) 
- Team A has Repository A with Item A
 - Team B
 - Team C has Repository C with Item C

1) Share Repository A and Repository C to Team B

2) Link Item A to Item C in Team B

3) Unshare Repository A from Team B

Item A is unlinked to Item C
 2024-01-22 10:45:23 +01:00
aignatov-bio 35774441f2
Merge pull request #6970 from G-Chubinidze/gc_SCI_9989 
Remove archive confirmation modals from all tables [SCI-9989]
 2024-01-22 10:07:19 +01:00
Martin Artnik cfb64a125c
Merge pull request #6980 from aignatov-bio/ai-sci-10035-wizard-component 
Add wizard component [SCI-10035]
 2024-01-22 09:43:03 +01:00
Giga Chubinidze 9b49e891a0 changed experiment move logic similar to modules move 2024-01-22 02:16:24 +04:00
Anton 97c155f626 Add wizard component [SCI-10035] 2024-01-19 20:36:11 +01:00
Martin Artnik 62f040d475
Merge pull request #6978 from lasniscinote/gl_SCI_10061 
(fix) Well plate 12 option and 24 translation missing [SCI-10061]
 2024-01-19 15:28:43 +01:00
Gregor Lasnibat 5c305c8728 (fix) Well plate 12 option and 24 translation missing [SCI_10061] 2024-01-19 15:26:42 +01:00
Gregor Lasnibat 1bb6055f91 (fix) CSS- item relationship space in child section [SCI-10057] 2024-01-19 14:56:02 +01:00
Martin Artnik 9c755fd911
Merge pull request #6968 from G-Chubinidze/gc_SCI_9962_v2 
Improvements of the SciNote Edit option in "Add-ons" [SCI-9962]
 2024-01-19 12:20:45 +01:00
Anton bd48ae1d07 Merge branch 'features/asset-sync' of github.com:scinote-eln/scinote-web into features/asset-sync 2024-01-19 11:34:42 +01:00
Anton 9d19fe8382 Merge branch 'develop' into features/asset-sync 2024-01-19 11:33:40 +01:00