Commit graph

14862 commits

Author SHA1 Message Date
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
80c23bd0fc
Merge pull request #6318 from artoscinote/ma_SCI_9328
Fix linked protocol info button position [SCI-9328]
2023-09-29 12:11:39 +02: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
Martin Artnik
4f2f5d156b Fix linked protocol info button position [SCI-9328] 2023-09-29 11:45:04 +02:00
wandji20
8684e2d361 Update formula, ruleJS, and parser vendor files to latest version [SCI-9314] 2023-09-29 10:35:21 +01:00
Alex Kriuchykhin
9745ef62dc
Merge pull request #6315 from okriuchykhin/ok_SCI_9369
Reduce allowed data attributes in sanitizer config only to data-mce-token [SCI-9369]
2023-09-29 11:24:25 +02:00
Oleksii Kriuchykhin
2bbb33d225 Reduce allowed data attributes in sanitizer config only to data-mce-token [SCI-9369] 2023-09-29 10:49:53 +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
9b9c370bc3
Merge pull request #6309 from artoscinote/ma_SCI_9338
Refactor datepicker limits [SCI-9338]
2023-09-28 15:16:17 +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
a499a0f0ea
Merge pull request #6307 from artoscinote/ma_SCI_9338
Fix datepicker min/max limits [SCI-9338]
2023-09-27 14:53:55 +02:00
Alex Kriuchykhin
8c1b09791d
Merge pull request #6306 from artoscinote/ma_SCI_9353
Fix for downloading assets not in current user team [SCI-9353]
2023-09-27 14:53:20 +02:00
Martin Artnik
99dd94e21f Fix datepicker min/max limits [SCI-9338] 2023-09-27 14:46:48 +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
Martin Artnik
2edba4e188 Fix for downloading assets not in current user team [SCI-9353] 2023-09-27 14:13:34 +02:00
Martin Artnik
3ce0779663
Merge pull request #6290 from ivanscinote/SCI-9344-sticky-toolbar-issues
Fix results sticky toolbar [SCI-9344]
2023-09-27 14:03:12 +02:00
Martin Artnik
5da684e959
Merge pull request #6178 from artoscinote/ma_SCI_9277
Keep asset image tooltip aspect ratio [SCI-9277]
2023-09-27 13:40:45 +02:00
Martin Artnik
d44d29a0fd
Merge pull request #6301 from G-Chubinidze/gc_SCI_9299
OVE - Activities related to Task result [SCI-9299]
2023-09-27 12:49:58 +02:00
Giga Chubinidze
b53ac04577 styling fix 2023-09-27 14:47:35 +04:00
Martin Artnik
c6272afe27
Merge pull request #6264 from ivanscinote/SCI-9247-ensure-team-export-works-with-new-results
Ensure team export works with new results [SCI-9247]
2023-09-27 12:46:52 +02:00
Martin Artnik
a8bdbc5faa
Merge pull request #6305 from ivanscinote/SCI-9349-a-new-office-file-added-to-existing-result-will-be-created-in-a-new-result
Fix bug for  adding Office files to a result [SCI-9349]
2023-09-27 12:45:36 +02:00
Martin Artnik
2503266b15
Merge pull request #6304 from sboursen-scinote/sb_SCI-8126-fix2
Fix no-result placeholder position for archived project list [SCI-8126]
2023-09-27 12:43:58 +02:00
Martin Artnik
3d04ed603f
Merge pull request #6302 from ivanscinote/SCI-9336-no-horizontal-scrollbar-on-protocol-label-templates-when-bottom-action-toolbar-is-displayed
Fix horizotnal scrollbar position for protocol & label templates [SCI-9336]
2023-09-27 12:43:04 +02:00
Martin Artnik
923006dc38
Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
2023-09-27 12:41:34 +02:00
Martin Artnik
9b2e5b6455
Merge pull request #6289 from G-Chubinidze/gc_SCI_9289
Removed delete/edit comment access on archived results [SCI-9289]
2023-09-27 12:41:03 +02:00
Andrej
5e5010632d Fix naming in assigned my module helper [SCI-9155] 2023-09-27 11:44:08 +02:00
Ivan Kljun
0b069430db Fix bug for adding Office files to a result [SCI-9349] 2023-09-27 10:55:03 +02:00
Martin Artnik
187c8b12f9
Merge pull request #6296 from ivanscinote/SCI-9346-cannot-insert-a-chemical-drawing-into-results
Add hidden element to support legacy code for MarvinJS at results [SCI-9346]
2023-09-27 10:43:25 +02:00
sboursen-scinote
e446522e81 Fix no-result placeholder position for archived project list [SCI-8126] 2023-09-27 10:14:54 +02:00
Alex Kriuchykhin
f76cb49cff
Merge pull request #6299 from rekonder/aj_SCI_9362
Escape inventory column names [SCI-9362]
2023-09-27 09:53:57 +02:00
Alex Kriuchykhin
9f03d88f12
Merge pull request #6201 from wandji20/wb-SCI-9225
Improve UI for stock consumption export [SCI-9225]
2023-09-27 09:21:22 +02:00
Alex Kriuchykhin
dc40b4354d
Merge pull request #6298 from okriuchykhin/ok_SCI_9282
Fix column placement in stock consumption export, add missing localization [SCI-9282]
2023-09-27 09:20:00 +02:00
Ivan Kljun
d53e2e8a5a Fix horizotnal scrollbar position for protocol & label templates [SCI-9336] 2023-09-27 08:53:02 +02:00
Giga Chubinidze
da70fed43a OVE - Activities related to Task result [SCI-9299] 2023-09-27 03:45:29 +04:00
Anton
f630b8860b Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396] 2023-09-26 16:23:16 +02:00
wandji20
213c752941 Improve UI for for exports in inventory with stock enabled [SCI-9225] 2023-09-26 15:20:18 +01: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
701de269f2 Escape inventory column names [SCI-9362] 2023-09-26 14:19:17 +02:00
Alex Kriuchykhin
15c10f3613
Merge pull request #6282 from rekonder/aj_SCI_9275
Fix protocol parser flyout and notifications [SCI-9275]
2023-09-26 13:42:09 +02:00
Oleksii Kriuchykhin
efae35816f Fix column placement in stock consumption export, add missing localization [SCI-9282] 2023-09-26 13:35:02 +02:00
Ivan Kljun
1373994559 Fix results sticky toolbar [SCI-9344] 2023-09-26 12:20:49 +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
Oleksii Kriuchykhin
47fae00a5f Bump version to 1.28.0.3 2023-09-26 10:36:15 +02:00