scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 23:51:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
14937 commits 31 branches 181 tags 166 MiB
Commit graph

4465 commits

Author SHA1 Message Date
Giga Chubinidze
4399b6cc0a Misalignments on the log in page when 2FA is enforced [SCI-9398] 2023-10-06 10:32:47 +04:00
Martin Artnik
19c44c50ff
Merge pull request #6363 from artoscinote/ma_SCI_9410 
Fix attachment issues [SCI-9410]
 2023-10-05 16:42:10 +02:00
Martin Artnik
5c7ee78cd6 Fix attachment issues [SCI-9410] 2023-10-05 15:44:41 +02:00
Alex Kriuchykhin
e48fc19546
Merge pull request #6361 from sboursen-scinote/sb_SCI-9468 
Import from Protocols.io not loading protocols [SCI-9468]
 2023-10-05 15:35:44 +02:00
wandji20
36ff372b30 Small improvement [SCI-9420] 2023-10-05 14:23:10 +01:00
wandji20
d3c2a7e0ad Fix issue with timestamps for reports [SCI-9420] 2023-10-05 12:25:08 +01:00
sboursen-scinote
9b24bf9504 Fix Protocols.io modal not loading any protocols [SCI-9468] 
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
 2023-10-05 12:03:05 +02:00
wandji20
6358ad2da4 Fix issue with protocol and result text name [SCI-9420] 2023-10-05 08:08:49 +01:00
Martin Artnik
1c84a97bd7
Merge pull request #6360 from G-Chubinidze/gc_SCI_9405 
Projects table header covered by top toolbar on some breakpoint [SCI-9405]
 2023-10-05 09:06:12 +02:00
Giga Chubinidze
3dbdbf02f8 Projects table header covered by top toolbar on some breakpoint [SCI-9405] 2023-10-05 02:44:30 +04:00
Martin Artnik
bcf7039fee
Merge pull request #6355 from artoscinote/ma_SCI_9428 
Fix z-index of task tab toolbar [SCI-9428]
 2023-10-04 15:43:02 +02:00
Martin Artnik
b545b6fdf9 Fix z-index of task tab toolbar [SCI-9428] 2023-10-04 14:22:17 +02:00
Oleksii Kriuchykhin
421ba27a6f Merge branch 'release/1.28.0' into develop 2023-10-04 13:19:31 +02:00
Martin Artnik
6f45980648
Merge pull request #6335 from ivanscinote/SCI-9407-css-consumption-modals-assign-to-task-modal-issues 
Fix UI for consumption/edit stock/assign to task modals [SCI-9407]
 2023-10-04 12:51:59 +02:00
Martin Artnik
b15cedd198
Merge pull request #6345 from G-Chubinidze/gc_SCI_9438 
CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438]
 2023-10-04 12:51:20 +02:00
Martin Artnik
f3900baadc
Merge pull request #6347 from artoscinote/ma_SCI_9339 
Shared task designated users style fix [SCI-9339]
 2023-10-04 12:50:23 +02:00
ivanscinote
a4d0d71f18
Merge branch 'develop' into SCI-9407-css-consumption-modals-assign-to-task-modal-issues 2023-10-04 11:00:33 +02:00
Martin Artnik
03b12e0a22 Shared task designated users style fix [SCI-9339] 2023-10-04 09:56:09 +02:00
Martin Artnik
1f5ecfba33
Merge pull request #6344 from G-Chubinidze/gc_SCI_9447 
Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447]
 2023-10-04 09:25:01 +02:00
Giga Chubinidze
b4247391a5 CSS: Incorrect icons on large PDF previews & caret on task activity [SCI-9438] 2023-10-04 05:36:03 +04:00
Giga Chubinidze
615d6ebbfa Wrong icon on the Export button in bottom toolbar & Manage columns back button [SCI-9447] 2023-10-04 04:56:17 +04:00
Martin Artnik
5960446401
Merge pull request #6320 from wandji20/wb-SCI-9406 
Add helper method to show grey layout background [SCI-9406]
 2023-10-03 16:43:18 +02:00
Martin Artnik
2d9c6ae249
Merge pull request #6339 from artoscinote/ma_SCI_9339 
Fix broken shared task styling [SCI-9339]
 2023-10-03 15:12:48 +02:00
Martin Artnik
c9e3055a22 Fix broken shared task styling [SCI-9339] 2023-10-03 14:26:06 +02:00
wandji20
dd34e72fb9 Add helper method to show grey layout background [SCI-9406] 2023-10-03 12:48:31 +01:00
Alex Kriuchykhin
f3f4fc1ad0
Merge pull request #6333 from okriuchykhin/ok_SCI_9368 
Use custom sanitizer config for PDF reports generation [SCI-9368]
 2023-10-03 13:09:50 +02:00
Alex Kriuchykhin
a000f0e67e
Merge pull request #6303 from wandji20/wb-SCI-9157 
Add export button to item card [SCI-9157]
 2023-10-03 12:52:03 +02:00
wandji20
2372edcf25 Add export button to item card [SCI-9157] 2023-10-03 10:52:57 +01:00
Ivan Kljun
667025b7c6 Fix UI for consumption/edit stock/assign to task modals [SCI-9407] 2023-10-03 11:12:03 +02:00
wandji20
4f5ecf66f4 Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-03 09:54:54 +01:00
Martin Artnik
03d6d99f7e
Merge pull request #6323 from G-Chubinidze/gc_SCI_9332 
Smart annotation modal: inventory name not correct [SCI-9332]
 2023-10-03 10:39:23 +02:00
Giga Chubinidze
de2023c873 removed unnecessary tw classes 2023-10-03 12:38:40 +04:00
Alex Kriuchykhin
40b6078ab2
Merge pull request #6312 from rekonder/aj_SCI_9386 
Refactor export stock consumption modal [SCI-9386]
 2023-10-03 10:33:00 +02:00
Oleksii Kriuchykhin
d9404df361 Use custom sanitizer config for PDF reports generation [SCI-9368] 2023-10-03 09:39:47 +02:00
Andrej
835cfb5e07 Refactor export stock consumption modal [SCI-9386] 2023-10-03 09:27:10 +02:00
Andrej
1aa9091e0d Fix protocol parser import button closing [SCI-9275] 2023-10-03 09:13:20 +02:00
Giga Chubinidze
f99db28760 using tailwind 2023-10-03 11:04:38 +04:00
wandji20
7b9e4088de Update OVE package and fix bug opening github issue link [SCI-9359] 2023-10-02 23:33:46 +01:00
G-Chubinidze
fbdd5a8165
Revert "Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]" 2023-10-02 12:28:29 +04:00
Giga Chubinidze
3932b22cd4 Smart annotation modal: inventory name not correct [SCI-9332] 2023-10-02 08:14:16 +04:00
Martin Artnik
a1df2b7b52
Merge pull request #6314 from G-Chubinidze/gc_SCI_9245_V2 
DOCX not working if result name empty. [SCI-9245]
 2023-09-29 12:24:18 +02:00
Giga Chubinidze
0be8ab5839 used i18n 2023-09-29 14:18:45 +04:00
Martin Artnik
0cb3c8bc62
Merge pull request #6313 from G-Chubinidze/gc_SCI_9324 
Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324]
 2023-09-29 11:49:26 +02:00
Giga Chubinidze
005bf93197 Organization settings (org. admin) - allowing the use of protocols for AI [SCI-9324] 2023-09-29 11:51:25 +04:00
Giga Chubinidze
07ce65f5e6 DOCX not working if result name empty. 2023-09-29 10:38:27 +04:00
Martin Artnik
7319ac5b50
Merge pull request #6310 from artoscinote/ma_SCI_9328 
Fix linked protocol dropdown [SCI-9328]
 2023-09-28 15:46:37 +02:00
Martin Artnik
82b9b676b6 Fix linked protocol dropdown [SCI-9328] 2023-09-28 15:40:48 +02:00
Martin Artnik
6e405d40a6 Refactor datepicker limits [SCI-9338] 2023-09-28 13:33:17 +02:00
Gregor Lasnibat
f352c7f186 Working on new behaviour for switching between item clicks [SCI-9354] 
Working on scrolling and highlighting [SCI-9354]

Item card preload and section title animation [SCI-9354]

Added box-shadow [SCI-9354]

Refactored logic and styles [SCI-9354]

PR fix, added back the missing HighlightComponent [SCI-9354]

PR fixes, refactoring [SCI-9354]

PR fix [SCI-9354]

Fixed scrolling to 'Assigned', highlighting [SCI-9354]

PR fix, modular logic, rename [SCI-9354]
 2023-09-28 13:21:20 +02:00
Alex Kriuchykhin
ba5ef94764
Merge pull request #6253 from rekonder/aj_SCI_9155_tmp 
Add assigned tasks block to the item card [SCI-9155]
 2023-09-27 15:03:20 +02:00
Martin Artnik
d86da2d145
Merge pull request #6207 from ivanscinote/SCI-9217-eye-icons-out-of-placeholder-placeholder-height 
Fix eye icon placement in password fields [SCI-9217]
 2023-09-27 14:19:41 +02:00
Andrej
5e5010632d Fix naming in assigned my module helper [SCI-9155] 2023-09-27 11:44:08 +02:00
Alex Kriuchykhin
8cf26d7a90
Merge pull request #6283 from rekonder/aj_SCI_9162 
Fix css for importing inventory [SCI-9162]
 2023-09-26 15:07:15 +02:00
Andrej
9641c75a4a Merge branch 'develop' of https://github.com/scinote-eln/scinote-web into aj_SCI_9275 2023-09-26 11:23:25 +02:00
Oleksii Kriuchykhin
d69b7cc6e8 Merge branch 'develop' into features/october-release 2023-09-26 11:11:30 +02:00
Ivan Kljun
0794b4bdc7 Fix dropdown always open on protocol templates [SCI-9333] 2023-09-26 09:11:54 +02:00
Andrej
4e6ccce9dd Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 11:49:51 +02:00
Andrej
e0355bd75a Fix generation of labels [SCI-9155] 2023-09-25 11:47:30 +02:00
wandji
7dac5e63be
Add navigation section to item card [SCI-9154] (#6252) 2023-09-25 10:49:09 +02:00
wandji
5314ef14c7
Revert "Add navigation section to item card [SCI-9154] (#6268)" (#6284) 
This reverts commit 7430f2240d.
 2023-09-25 10:46:19 +02:00
Martin Artnik
3a22d7715d Merge branch 'develop' into features/september-release 2023-09-25 10:37:40 +02:00
wandji
7430f2240d
Add navigation section to item card [SCI-9154] (#6268) 2023-09-25 09:53:12 +02:00
Andrej
65affdf639 Fix css for importing inventory [SCI-9162] 2023-09-25 09:06:13 +02:00
Andrej
9ca96145d5 Merge branch 'features/october-release' of https://github.com/scinote-eln/scinote-web into aj_SCI_9155_tmp 2023-09-25 08:05:28 +02:00
Andrej
2478918aa6 Fix protocol parser flyout and notifications [SCI-9275] 2023-09-25 07:55:43 +02:00
Anton
6c8447beac Fix status color 2023-09-22 14:46:10 +02:00
Alex Kriuchykhin
50a87b1562
Merge pull request #6235 from wandji20/wb-SCI-8914 
Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914]
 2023-09-22 14:14:38 +02:00
Alex Kriuchykhin
c817c269cb
Merge pull request #6270 from lasniscinote/gl_SCI_9153 
Refactoring RepositoryItemSidebar and custom columns [SCI-9153]
 2023-09-22 14:13:54 +02:00
Anton
ad3cd98d6e CSS fixes protocol page 2023-09-22 11:59:39 +02:00
wandji20
3dd7d0fdb3 Fix issue previweing and realoding assets on hover and after viewmode change [SCI-8914] 2023-09-22 09:36:07 +01:00
sboursen-scinote
adc0a460bd Improve logic for custom logos on error pages [SCI-9147] 
- Switch to dynamic ERB templates.
- Move text to I18n
 2023-09-22 10:26:32 +02:00
Gregor Lasnibat
1bf2bc6156 Refactoring RepositoryItemSidebar and custom columns [SCI-9153] 
Fixed regular card (without cusotm columns) styles [SCI-9153]

Updated API to return column name, working on subcomponents [SCI-9153]

TooltipPreview on dynamic file component working [SCI-9153]

Finished new item card refactor [SCI-9153]

PR fix 01 [SCI-9153]

PR fixes 02 [SCI-9153]
 2023-09-21 20:18:20 +02:00
Alex Kriuchykhin
5cc41451cd
Merge pull request #6254 from sboursen-scinote/sb_SCI-9133 
Fix missing icon files in exported projects [SCI-9133]
 2023-09-21 17:12:08 +02:00
sboursen-scinote
aa769f92f7 Fix missing icon files in exported projects [SCI-9133] 2023-09-21 15:11:02 +02:00
Anton
97999028ef Fix modals after revamp [SCI-9330] 2023-09-21 12:52:55 +02:00
sboursen-scinote
90b9813083 Remove the Experiment ID displayed in the three dots menu dropdown [SCI-9215] 2023-09-21 11:38:09 +02:00
aignatov-bio
2ab4d2b8dc
Merge pull request #6263 from aignatov-bio/ai-sci-9319-update-protocol-template-screen 
Update protocol template screen [SCI-9319]
 2023-09-21 10:39:16 +02:00
Anton
40144ea33f Update protocol template screen [SCI-9319] 2023-09-21 10:37:58 +02:00
aignatov-bio
ecd00a4f4f
Merge pull request #6262 from aignatov-bio/ai-sci-9342-fix-task-details-section-css 
Task details css fixes [SCI-9342]
 2023-09-21 10:20:00 +02:00
Martin Artnik
810e0ffaff
Merge pull request #6261 from G-Chubinidze/gc_SCI_9269 
CSS: Results revamp issues [SCI-9269]
 2023-09-21 10:00:14 +02:00
Anton
ce2d91025c Task details css fixes [SCI-9342] 2023-09-21 09:48:46 +02:00
Alex Kriuchykhin
04e191e377
Merge pull request #6259 from wandji20/wb-SCI-9191 
Fix issue displaying long tables protocol description in import modal [SCI-9191]
 2023-09-21 09:26:25 +02:00
Giga Chubinidze
eb5d09e2fb CSS: Results revamp issues 2023-09-21 10:52:41 +04:00
Alex Kriuchykhin
8e1f8296f4
Merge pull request #6243 from rekonder/aj_SCI_9272 
Fix message for successful import protocol from protocol parser [SCI-9272]
 2023-09-20 19:36:12 +02:00
wandji20
ca8e6d88dc Fix issue displaying long tables protocol description in impor modal [SCI-9191] 2023-09-20 15:04:10 +01:00
Martin Artnik
5983ecb2bd
Merge pull request #6255 from artoscinote/ma_SCI_9348 
Clean up legacy comment logic [SCI-9348]
 2023-09-20 13:10:28 +02:00
Martin Artnik
44394fa1b6 Clean up legacy comment logic [SCI-9348] 2023-09-20 13:07:30 +02:00
Anton
d46ee2adf6 Fix task secondary navigation on small screens [SCI-9305] 2023-09-20 12:30:15 +02:00
Andrej
b47651750b Fix message for successful import protocol from protocol parser [SCI-9272] 2023-09-19 15:47:51 +02:00
Andrej
56a57233df Add assigned tasks block to the item card [SCI-9155] 2023-09-19 15:40:32 +02:00
aignatov-bio
dcce202f78
Merge pull request #6248 from aignatov-bio/ai-sci-9274-fix-legacy-inline-editing 
Fix legacy inline editing [SCI-9274]
 2023-09-19 13:49:13 +02:00
aignatov-bio
5626bdef4b
Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi 
Fix wopi and pdf preview [SCI-9260]
 2023-09-19 13:17:42 +02:00
Anton
ab8deeb181 Fix legacy inline editing [SCI-9274] 2023-09-19 13:17:23 +02:00
Anton
370508304b Fix wopi and pdf preview [SCI-9260] 2023-09-19 12:44:28 +02:00
Alex Kriuchykhin
7825433ac2
Merge pull request #6242 from rekonder/aj_SCI_9273 
Insert the correct link for protocol parser import in the email notification [SCI-9273]
 2023-09-19 09:54:05 +02:00
Oleksii Kriuchykhin
3b170a0c0d Connect backend to the new item card [SCI-9313] 2023-09-18 16:42:01 +02:00
Andrej
5e4f156ae5 Insert correct link for protocol parser import in email notification [SCI-9273] 2023-09-18 15:30:11 +02:00
Martin Artnik
8784add939
Merge pull request #6240 from artoscinote/ma_SCI_9211 
Fix report generation with text results [SCI-9211]
 2023-09-18 15:07:05 +02:00
Martin Artnik
2f4b1ef7b0 Fix report generation with text results [SCI-9211] 2023-09-18 15:01:13 +02:00
Martin Artnik
9aa4274702
Merge pull request #6237 from lasniscinote/gl_SCI_9188 
Fixed misplaced checkbox for archived task [SCI-9188]
 2023-09-18 14:42:00 +02:00