mvrazic
|
e4f49a86ab
|
e2e - modified tags where names were used [SCI-9620] (#6538)
|
2023-10-26 16:03:58 +02:00 |
|
Oleksii Kriuchykhin
|
6235a03595
|
Merge branch 'develop' into e2e
|
2023-10-26 15:36:36 +02:00 |
|
Martin Artnik
|
88b8498dc2
|
Merge pull request #6540 from scinote-eln/master
Merge master
|
2023-10-26 15:35:23 +02:00 |
|
Martin Artnik
|
dd70adb59f
|
Merge pull request #6539 from scinote-eln/hotfix/1.29.1.1
Hotfix/1.29.1.1
|
2023-10-26 15:28:23 +02:00 |
|
Martin Artnik
|
761b2ebf21
|
Bump version to 1.29.1.1
|
2023-10-26 15:27:44 +02:00 |
|
Martin Artnik
|
dc24643cf2
|
Merge pull request #6537 from scinote-eln/revert-6536-ai-sci-9588-add-paste-image
Revert "Break after first image [SCI-9588]"
|
2023-10-26 14:58:38 +02:00 |
|
Martin Artnik
|
5fb1a00a21
|
Revert "Break after first image [SCI-9588]"
|
2023-10-26 14:58:27 +02:00 |
|
Martin Artnik
|
0fb6d8c54d
|
Merge pull request #6536 from aignatov-bio/ai-sci-9588-add-paste-image
Break after first image [SCI-9588]
|
2023-10-26 14:35:10 +02:00 |
|
Anton
|
c90aa8ee62
|
Break after first image [SCI-9588]
|
2023-10-26 14:33:44 +02:00 |
|
Martin Artnik
|
0696af987c
|
Merge pull request #6535 from aignatov-bio/ai-sci-9588-add-paste-image
Fix web insert image [SCI-9127]
|
2023-10-26 14:27:06 +02:00 |
|
Anton
|
a4e48c798d
|
Fix web insert image [SCI-9127]
|
2023-10-26 14:24:45 +02:00 |
|
Martin Artnik
|
c79669ba3f
|
Merge pull request #6534 from aignatov-bio/ai-sci-9588-add-paste-image
Fix i18n for clipboard modal [SCI-9588]
|
2023-10-26 13:34:19 +02:00 |
|
Anton
|
fded38a5a6
|
Fix i18n for clipboard modal [SCI-9588]
|
2023-10-26 13:32:17 +02:00 |
|
Alex Kriuchykhin
|
72ef510edc
|
Update Travis CI config, temporary switch to only API tests for CI (#6528)
|
2023-10-26 13:29:52 +02:00 |
|
Martin Artnik
|
590648b4b5
|
Merge pull request #6533 from aignatov-bio/ai-sci-9588-add-paste-image
Fix image ratio
|
2023-10-26 13:26:29 +02:00 |
|
Anton
|
261f853b03
|
Fix image ratio
|
2023-10-26 13:24:29 +02:00 |
|
Martin Artnik
|
605d5bfcb7
|
Merge pull request #6532 from aignatov-bio/ai-sci-9588-add-paste-image
Add image paster [SCI-9588]
|
2023-10-26 12:17:41 +02:00 |
|
Anton
|
0ffd3dcee3
|
Add image paster [SCI-9588]
|
2023-10-26 12:15:30 +02:00 |
|
Oleksii Kriuchykhin
|
e4c0ce58b8
|
Merge branch 'develop'
|
2023-10-25 11:34:47 +02:00 |
|
Oleksii Kriuchykhin
|
ac56cb429c
|
Bump version to 1.29.1
|
2023-10-25 11:33:51 +02:00 |
|
Martin Artnik
|
5972140fd0
|
Merge pull request #6524 from aignatov-bio/ai-sci-9594-fix-marvinjs-in-edit-mode
Fix marvinJS in tinymce [SCI-9594]
|
2023-10-24 16:33:16 +02:00 |
|
Anton
|
e0f2677d1c
|
Fix marvinJS in tinymce [SCI-9594]
|
2023-10-24 16:31:20 +02:00 |
|
Alex Kriuchykhin
|
1eece29f84
|
Fix error at filtering by date on project page [SCI-9590] (#6523)
|
2023-10-24 16:00:41 +02:00 |
|
aignatov-bio
|
060300c785
|
Merge pull request #6522 from aignatov-bio/ai-sci-9592-fix-protocol-header
Fix protocol header [SCI-9592]
|
2023-10-24 13:43:53 +02:00 |
|
Anton
|
d0703f04dc
|
Fix protocol header [SCI-9592]
|
2023-10-24 13:41:13 +02:00 |
|
ajugo
|
f278f490d9
|
Fix api tests [SCI-9569] (#6519)
* Fix api tests [SCI-9569]
* Fix inventory status api index [SCI-9569]
|
2023-10-24 13:36:03 +02:00 |
|
Martin Artnik
|
7f7ed1ea8a
|
Merge pull request #6521 from artoscinote/ma_SCI_9583
Smart annotation and text value fixes [SCI-9583]
|
2023-10-24 13:25:58 +02:00 |
|
Martin Artnik
|
0e3c7eaf26
|
Fix issue with text value rendering [SCI-9583]
|
2023-10-24 13:15:17 +02:00 |
|
Martin Artnik
|
2850135e96
|
Revert "Fixed Item card smart annotation link [SCI-9583]"
This reverts commit 0a3ba6a366.
|
2023-10-24 13:14:23 +02:00 |
|
Martin Artnik
|
1d3c17206c
|
Merge pull request #6514 from lasniscinote/gl_SCI_9583
Fixed Item card smart annotation link [SCI-9583]
|
2023-10-23 13:59:37 +02:00 |
|
Martin Artnik
|
ebb2c7537b
|
Merge pull request #6517 from artoscinote/ma_SCI_9574
Fix user smart annotations [SCI-9574]
|
2023-10-23 13:37:49 +02:00 |
|
Martin Artnik
|
4d9a3c65f3
|
Merge pull request #6518 from artoscinote/ma_SCI_9585
Fix members filter [SCI-9585]
|
2023-10-23 13:34:06 +02:00 |
|
Martin Artnik
|
4f014394e2
|
Fix members filter [SCI-9585]
|
2023-10-23 13:31:27 +02:00 |
|
Martin Artnik
|
ee076c7f3b
|
Fix user smart annotations [SCI-9574]
|
2023-10-23 11:50:24 +02:00 |
|
Martin Artnik
|
d74cd77e41
|
Merge pull request #6516 from scinote-eln/develop
Merge develop
|
2023-10-23 11:14:50 +02:00 |
|
Martin Artnik
|
475a1fbd46
|
Merge pull request #6513 from mvrazic/mv_SCI_9581
Modified and added e2e tags mostly for inventories section.
|
2023-10-23 11:11:57 +02:00 |
|
Martin Vražič
|
0f1ec8eada
|
added e2e tag on create button - inventory dialog
|
2023-10-23 11:11:06 +02:00 |
|
Gregor Lasnibat
|
0a3ba6a366
|
Fixed Item card smart annotation link [SCI-9583]
|
2023-10-22 08:56:51 +02:00 |
|
mvrazic
|
77b3e7a44f
|
Merge branch 'e2e' into mv_SCI_9581
|
2023-10-20 15:06:30 +02:00 |
|
Martin Vražič
|
c392b5114f
|
Modified and added new tags mostly for inventories section.
|
2023-10-20 11:23:51 +02:00 |
|
Martin Artnik
|
040379039f
|
Merge pull request #6510 from G-Chubinidze/gc_SCI_9552
Report - Well plates columns fix [SCI-9552]
|
2023-10-20 10:16:11 +02:00 |
|
aignatov-bio
|
453bdf0082
|
Merge pull request #6508 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Fix drag n drop on results
|
2023-10-20 09:43:49 +02:00 |
|
Gregor Lasnibat
|
6812bd135b
|
Fixed double PATCH request sent [SCI-9568] (#6512)
|
2023-10-20 09:37:09 +02:00 |
|
Giga Chubinidze
|
186eb1cc7e
|
Report - Well plates columns fix [SCI-9552]
|
2023-10-20 02:27:06 +04:00 |
|
Anton
|
635a4b7fb3
|
Fix drag n drop on results
|
2023-10-19 17:41:13 +02:00 |
|
Alex Kriuchykhin
|
8a18bc6ad3
|
Fix item card on results page, fix smart annotation links in RTE fields [SCI-9572] (#6506)
|
2023-10-19 16:35:23 +02:00 |
|
Alex Kriuchykhin
|
18c03eb836
|
Fix smart annotation links on the item card [SCI-9571] (#6501)
|
2023-10-19 16:35:15 +02:00 |
|
aignatov-bio
|
efaef6f182
|
Merge pull request #6507 from aignatov-bio/ai-sci-9576-add-drag-n-drop-to-results
Add drag n drop to results [SCI-9576]
|
2023-10-19 16:03:02 +02:00 |
|
Gregor Lasnibat
|
8e7f216fb0
|
Fixed Item card file link [SCI-9479] (#6504)
|
2023-10-19 15:58:28 +02:00 |
|
Anton
|
3dd36e1dda
|
Add drag n drop to results [SCI-9576]
|
2023-10-19 15:58:20 +02:00 |
|