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

1044 commits

Author SHA1 Message Date
wandji 167abe5239
Add .json extension to OVE import tooltip [SCI-9116] (#6112) 
* Add .json extension to OVE import tooltip [SCI-9116]

* Override import and downlod tooltip values [SCI-9116]
 2023-08-31 12:51:49 +02:00
ajugo db4aa53f72
Merge pull request #5993 from sboursen-scinote/sb_SCI-9038 
Set sequence attachments file icon [SCI-9038]
 2023-08-25 21:53:22 +02:00
Soufiane a19ab3b519
Fix OVE CSS issues [SCI-9114] (#6081) 
- Fix broken CSS import.
- Hide body scroll when editor is open.
- Fix editor header design.
 2023-08-25 14:22:37 +02:00
sboursen-scinote 195df7936f Use custom images for marvin and OVE [SCI-9038] 2023-08-25 13:59:18 +02:00
wandji 61da3a12b9
Add menubar to ove editor [SCI-9115] (#6079) 
* Add menubar to ove editor [SCI-9115]
 2023-08-25 11:36:33 +02:00
Andrej 29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Andrej 35ecd064d2 Fix tinymce help plugin language inclusion [SCI-9086] 2023-08-22 10:24:45 +02:00
wandji 1d051aeb0f
Fix CSS UI issues for shareable links task sharing [SCI-9080] (#6031) 
* Fix css UI issues for shareable links task sharing [SCI-9080]
 2023-08-21 16:07:38 +02:00
Anton 0161277380 Fix bootstrap in report [SCI-9085] 2023-08-21 15:26:58 +02:00
artoscinote 8f24e90ee4
Merge pull request #6030 from wandji20/wb-SCI-9074 
Fix css issue protocol template author edit [SCI-9074]
 2023-08-21 12:58:23 +02:00
artoscinote d8da463dc2
Merge pull request #5956 from ivanscinote/SCI-9008-share-task-modal 
Move blur event to whole modal at Share task [SCI-9008]
 2023-08-21 12:04:54 +02:00
wandji20 b41b0b04f0 Fix css issue protocol template author edit [SCI-9074] 2023-08-21 11:01:07 +01:00
artoscinote 00167e30b0
Merge pull request #6029 from artoscinote/ma_SCI_8422 
Fix filtering of template tags [SCI-8422]
 2023-08-21 11:56:28 +02:00
Ivan Kljun 5902ee28e1 Remove blur event function as it is redundant 2023-08-21 11:52:57 +02:00
Martin Artnik fc18c76efd Fix filtering of template tags [SCI-8422] 2023-08-21 11:44:01 +02:00
wandji20 5e6138fa18 Replace unecessary margin value with tailwind value [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 0ae44eb3a7 Use default tailwind size for task assigned protocol description [SCI-9018] 2023-08-21 09:27:28 +01:00
wandji20 7c07befd3e Fix CSS issues in protocols, and quick start(new task) [SCI-9018] 2023-08-21 09:27:28 +01:00
Ivan Kljun 0553b5b0dc Merge remote-tracking branch 'upstream/develop' into SCI-9008-share-task-modal 2023-08-21 09:32:59 +02:00
artoscinote 20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications 
Remove system notifications [SCI-8807]
 2023-08-18 10:28:05 +02:00
artoscinote 2cc49ec6b5
Merge pull request #6005 from wandji20/wb-SCI-9003 
Fix CSS style issues [SCI-9003]
 2023-08-17 15:48:07 +02:00
ajugo dd80b4019b
Merge pull request #5942 from sboursen-scinote/sb_SCI-8987 
Fix micro-interactions for shareable links modals [SCI-8987]
 2023-08-17 15:28:43 +02:00
sboursen-scinote ef9368d2cb Fix micro-interactions for shareable links modals [SCI-8987] 2023-08-17 15:22:16 +02:00
ajugo 032655f4e7
Merge pull request #6002 from rekonder/aj_SCI_8986 
Show toast message on successful copy [SCI-8986]
 2023-08-17 15:14:05 +02:00
wandji20 4a3f8146e3 Fix CSS style issues [wb-SCI-9003] 2023-08-17 13:11:58 +01:00
Alex Kriuchykhin c356018965
Merge pull request #5918 from sboursen-scinote/sb_SCI-8981 
Share button is disabled for locked and archived tasks [SCI-8981]
 2023-08-17 14:10:09 +02:00
Andrej 9a09fbc8ce Show toast message on successful copy [SCI-8986] 2023-08-17 11:21:53 +02:00
Andrej 6e8dda64b2 Create new sequence attachment on task protocol step [SCI-8948] 2023-08-17 09:38:44 +02:00
sboursen-scinote d631098d9a Fix multiple issues with edit sequence on task protocol [SCI-8966] 
- Fix edit button label and icon
- Fix preview modal for gene-sequence
 2023-08-16 17:01:43 +02:00
Alex Kriuchykhin 975a197716
Merge pull request #5987 from ivanscinote/SCI-9034-shared-task-issues 
Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034]
 2023-08-16 15:34:57 +02:00
Ivan Kljun 1880723c8c Fix moment.js import and showing preview thumbnail img at shared task [SCI-9034] 2023-08-16 10:49:34 +02:00
Martin Artnik 8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
artoscinote 083bd4b1e2
Merge pull request #5827 from aignatov-bio/ai-sci-8843-fix-notification-infinite-scroll 
Fix infinite scroll for notifications [SCI-8843]
 2023-08-16 10:27:07 +02:00
sboursen-scinote dc27620d00 Make share button independent of task status flow or archived state [SCI-8981] 2023-08-16 10:22:55 +02:00
Anton a46674b3a3 Fix small bootstrap issues [SCI-9051] 2023-08-11 11:34:11 +02:00
Alex Kriuchykhin c6a545d8b3
Fix Turbolinks redirects with ajax requests, add JQuery migration library [SCI-9031] (#5961) 2023-08-10 16:25:04 +02:00
aignatov-bio acab34679d
Merge pull request #5960 from aignatov-bio/ai-test-jquery-pr 
Restore bootstrap overrides
 2023-08-10 14:43:12 +02:00
Anton 3c0ccc730f Restore bootstrap overrides 2023-08-10 14:36:06 +02:00
Ivan Kljun 949da66414 Move blur event to whole modal at Share task [SCI-9008] 2023-08-10 11:58:35 +02:00
Martin Artnik 4d4eebd78e Fix glitchy dropdowns on Safari [SCI-8946] 2023-08-10 11:46:31 +02:00
Soufiane aedd3e0b6d
Fix multiple issues for Shared tasks feature [SCI-8985] (#5936) 
- Centre vertically all related modals
- Convert task header tabs to sentence case
 2023-08-10 09:43:31 +02:00
Andrej 104a9d5c17 Implemented trial period for open vector editor [SCI-8962] 2023-08-10 08:58:49 +02:00
Anton 2da83f460f Test moving jquery 2023-08-09 14:43:17 +02:00
wandji a1e6392a45
Fix bugs with jquery3 upgrade [SCI-8973] (#5933) 
* Fix bugs with jquery3 upgrade [SCI-8973]

* Remove deprecated jquery method (.error, .completed, .success) [SCI-8973]

* Fix linter error [SCI-8973]
 2023-08-09 10:33:58 +02:00
ajugo c8fbdacf22
Merge pull request #5921 from rekonder/aj_SCI_8986 
Copy shareable link when you enable sharing for task [SCI-8986]
 2023-08-07 15:17:49 +02:00
Alex Kriuchykhin dacc6b48aa
Merge pull request #5924 from scinote-eln/features/protocol-parsing 
Merge features/protocol-parsing to develop
 2023-08-07 13:00:56 +02:00
Oleksii Kriuchykhin 6cf7403b21 Merge branch 'develop' into features/protocol-parsing 2023-08-07 12:55:20 +02:00
Anton 89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +02:00
Andrej 84233506c0 Copy shareable link when you enable sharing for task [SCI-8986] 2023-08-07 09:47:44 +02:00
Alex Kriuchykhin b365553a14
Merge pull request #5917 from scinote-eln/features/august-release 
Merge features/august release to develop
 2023-08-04 14:01:44 +02:00