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

8495 commits

Author SHA1 Message Date
Alex Kriuchykhin 7b158133cb
Merge pull request #4252 from okriuchykhin/ok_SCI_6973 
Fix step elements interactions for technician role [SCI-6973]
 2022-07-15 10:12:23 +02:00
aignatov-bio 63c54d9005
Merge pull request #4227 from aignatov-bio/ai-sci-6971-fix-step-comments 
Fix step comments [SCI-6971]
 2022-07-15 10:10:56 +02:00
artoscinote 39f5a017cf
Add print button to protocol in repository [SCI-6871] (#4246) 2022-07-15 10:10:18 +02:00
artoscinote c707a3aac6
Fix step update activities [SCI-6980] (#4250) 2022-07-15 10:09:49 +02:00
Oleksii Kriuchykhin a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
aignatov-bio 2ec93cef43
Merge pull request #4249 from aignatov-bio/ai-sci-6989-update-protocol-name-on-link 
Update protocol name on save with link [SCI-6989]
 2022-07-15 10:08:41 +02:00
ajugo bab466d908
Fix grip for checklist elemnt position [SCI-6961] (#4254) 2022-07-15 10:07:31 +02:00
ajugo c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253) 
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
 2022-07-15 10:00:50 +02:00
Anton e320571876 Update protocol name on save with link [SCI-6989] 2022-07-14 12:59:12 +02:00
Anton 32fac2f9ab Fix merge issues for step [SCI-6949] 2022-07-14 12:50:06 +02:00
Alex Kriuchykhin 46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969 
Fix file upload and edit interactions on steps page [SCI-6969]
 2022-07-14 09:48:20 +02:00
Alex Kriuchykhin 0a8acb36f8
Merge pull request #4231 from okriuchykhin/ok_SCI_6974 
Fix display of stock consumption in assigned items table [SCI-6974]
 2022-07-14 09:47:57 +02:00
ajugo 5d2d002a04
Fix text element opening tinymce [SCI-6938] (#4243) 
* Fix edit step button [SCI-6938]

* Fix text element opening tinymce [SCI-6938]
 2022-07-13 21:09:30 +02:00
ajugo 914516ac4c
Fix checklist item alignments and step edit alignment [SCI-6961] (#4242) 2022-07-13 21:02:21 +02:00
aignatov-bio 186f892288
Merge branch 'develop' into ai-sci-6970-step-rearranging-fixes 2022-07-13 18:03:03 +02:00
artoscinote c7ac9190c3
TinyMCE and styling fixes [SCI-6956][SCI-6952][SCI-6948] (#4241) 
* Also validate char count on paste in TinyMCE [SCI-6952]

* Fix new text tinymce init [SCI-6956]

* Fix step head styling [SCI-6952]

* Fix step dropdown icon [SCI-6948]
 2022-07-13 18:02:35 +02:00
artoscinote a73fc8c0fd
Fix automatically adding new checklist item [SCI-6960] (#4238) 2022-07-13 17:58:58 +02:00
aignatov-bio a845eec33e
Merge pull request #4240 from aignatov-bio/ai-sci-6958-fix-delete-modal 
Fix delete modals size [SCI-6958]
 2022-07-13 17:58:39 +02:00
ajugo df84496381
Fix edit step button [SCI-6938] (#4232) 2022-07-13 16:13:42 +02:00
Anton 34ff261ddf Fix delete modals size [SCI-6958] 2022-07-13 15:53:08 +02:00
Anton 496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
artoscinote 3d2e835268
DOCX layout improvements [SCI-6857] (#4160) 2022-07-13 12:52:56 +02:00
aignatov-bio b84e77210f
Merge pull request #4237 from aignatov-bio/ai-sci-6932-protocol-section-css-fixes 
Fix protocol elements alignments [SCI-6932]
 2022-07-13 12:42:22 +02:00
Anton cbeac82992 Fix protocol elements allignments [SCI-6932] 2022-07-13 12:37:57 +02:00
artoscinote 15e812a358
Fix rendering of WOPI files [SCI-6936] (#4235) 2022-07-13 12:21:56 +02:00
artoscinote a575487271
Fix microinteraction for table editing [SCI-6957] (#4236) 2022-07-13 12:21:41 +02:00
artoscinote 17eada574e
CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234) 
* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]
 2022-07-13 10:47:12 +02:00
Oleksii Kriuchykhin d3a8b3ca59 Fix display of stock consumption in assigned items table [SCI-6974] 2022-07-12 16:53:07 +02:00
Oleksii Kriuchykhin 747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
Anton 8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
Martin Artnik 99e5f7558a Fix CSS syntax error 2022-07-12 10:59:33 +02:00
artoscinote 765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
artoscinote c89968453e
Fix checklist issues [SCI-6960] (#4222) 2022-07-12 10:41:58 +02:00
aignatov-bio 33e3d0f3f0
Merge pull request #4226 from aignatov-bio/ai-sci-6965-fix-save-to-protocol 
Fix save protocol repository [SCI-6965]
 2022-07-12 10:40:54 +02:00
aignatov-bio 3184647141
Merge pull request #4221 from aignatov-bio/ai-sci-6959-fix-step-content-blocks-allignment 
Fix elements step elements alignment [SCI-6959]
 2022-07-12 10:38:15 +02:00
aignatov-bio 67dbab97d9
Merge pull request #4220 from aignatov-bio/ai-sci-6944-change-core-colors 
Update accent colors [SCI-6944]
 2022-07-12 10:38:01 +02:00
Anton e8a0e7c7d4 Fix save protocol repository [SCI-6965] 2022-07-12 10:37:36 +02:00
ajugo c2f17760ea
Replace favicon in public folder and fix what's new title [SCI-5319] (#4224) 
* Fix what's new tab name [SCI-5319]

* Change favicons in public folder [SCI-5319]
 2022-07-12 10:16:04 +02:00
artoscinote dd27fadd98
Add step reordering and step element reordering service endpoints to API [SCI-6891][SCI-6892] (#4179) 
* Add step reordering service endpoint to API [SCI-6891]

* Generalize reorder validation [SCI-6891]

* Add endpoint for reordering step elements, fix issues [SCI-6892]

* Add appropriate serializers [SCI-6891][SCI-6892]

* Add step elements to step serializer [SCI-6891]

* Simplify routes, add locking [SCI-6891]
 2022-07-12 10:13:47 +02:00
ajugo 82132c865c
Add archived result counter and fix result counter [SCI-6946][6975] (#4223) 2022-07-12 09:58:21 +02:00
Alex Kriuchykhin effd75a71a
Add ordering for tags on protocols page [SCI-6943] (#4214) 2022-07-12 09:49:24 +02:00
Anton b5d67d429b Fix elements step elements alignment [SCI-6959] 2022-07-11 13:53:16 +02:00
Anton e472855690 Update accent colors [SCI-6944] 2022-07-11 12:00:13 +02:00
ajugo 045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] (#4211) 2022-07-11 11:52:38 +02:00
aignatov-bio cb86fe0e06
Merge pull request #4219 from aignatov-bio/ai-sci-6958-fix-steps-delete-modal 
Fix delete steps modal size [SCI-6958]
 2022-07-11 11:31:48 +02:00
ajugo 4db46eac44
Fix linked protocol naming and i flyout [SCI-6963] (#4213) 2022-07-11 11:29:05 +02:00
Anton d805a420b9 Fix delete steps modal size [SCI-6958] 2022-07-11 11:28:45 +02:00
artoscinote d897a4f9a8
Fix missing error class on inline edit [SCI-6954] (#4218) 2022-07-11 11:23:54 +02:00
artoscinote ee792b89df
Fix loading repositories that contain tables [SCI-6951] (#4200) 2022-07-11 10:58:20 +02:00
artoscinote cb113c4bdb
Change reordering icons [SCI-6953] (#4208) 2022-07-11 10:54:18 +02:00
artoscinote 5cb53c774c
Step header fixes [SCI-6948] (#4217) 2022-07-11 10:45:25 +02:00
artoscinote a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +02:00
Anton a54cac44da Fixed smart annotations [SCI-6939] 2022-07-08 13:50:40 +02:00
Anton 972cc49389 Fix smart annotation for step editing [SCI-6939] 2022-07-08 12:51:43 +02:00
Anton 11b62cca7b Fix task page layout [SCI-6950] 2022-07-07 15:56:36 +02:00
Anton 4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
artoscinote 102b72d413
Enable text edit mode when adding text block [SCI-6956] (#4206) 2022-07-07 13:43:29 +02:00
Alex Kriuchykhin 26820b9abb
Fix subject references for repository row activities [SCI-6906] (#4203) 2022-07-07 12:00:35 +02:00
aignatov-bio dce755b294
Merge pull request #4205 from aignatov-bio/ai-sci-6933-add-micro-interactions-to-step 
Fix microinteractions for step editing [SCI-6933]
 2022-07-07 09:15:19 +02:00
Anton b3d7c3ff75 Fix microinteractions for step editing [SCI-6933] 2022-07-06 14:31:55 +02:00
Alex Kriuchykhin a7e88e59bd
Update global search to use new step text elements [SCI-6873] (#4165) 2022-07-06 14:20:55 +02:00
artoscinote be45aac93b
Implement table click-away and auto edit mode on add [SCI-6957] (#4202) 2022-07-06 14:18:11 +02:00
artoscinote c9e7e68369
Insert element dropdown fixes [SCI-6925] (#4184) 
* Insert element dropdown fixes [SCI-6925]

* Dropdown bugfix, rounder CSS size [SCI-6925]
 2022-07-06 14:11:48 +02:00
artoscinote 7921a7276f
Fix removing non-saved checklist item [SCI-6964] (#4204) 2022-07-06 14:06:16 +02:00
ajugo 454c1f01d0
Switch to fluics api v3 [SCI-6859] (#4201) 2022-07-06 13:02:48 +02:00
artoscinote bcb8ed95fc
Fix reorder permission check [SCI-6941] (#4195) 2022-07-06 11:53:45 +02:00
artoscinote e38fbf4b10
Add join alias for consistent assigned my modules count [SCI-6942] (#4197) 2022-07-06 11:53:26 +02:00
ajugo 8e7307c5c1
Project json exporter adaptions for step improvements [SCI-6898] (#4177) 
* Adapt project export to step improvements [SCI-6898]

* Add tests [SCI-6898]
 2022-07-06 11:45:50 +02:00
ajugo 9323c5e99a
Enable copy-paste for new members invitation [SCI-6910] (#4186) 
* Enable copy-paste for new memeber invitation [SCI-6910]

* Fix hound [SCI-6910]
 2022-07-06 11:45:24 +02:00
Alex Kriuchykhin 9aeb107635
Fix saving protocol to repository [SCI-6935] (#4190) 2022-07-06 11:45:04 +02:00
Alex Kriuchykhin 7af1684db0
Fix import of repository checklist items [SCI-6962] (#4198) 2022-07-06 11:44:41 +02:00
ajugo 10e95ad465
Remove datatable for repository item CARD [SCI-6913] (#4188) 2022-07-06 11:44:30 +02:00
ajugo 6f5646af59
Copy & paste image to "Add file" modal [SCI-6930] (#4199) 
* Upload image attachments from copy paste [SCI-6930]

* Fix opening copy paste modals and handling paste event [SCI-6930]
 2022-07-06 11:43:30 +02:00
aignatov-bio ef71e59c4d
Merge pull request #4192 from aignatov-bio/ai-sci-6928-add-activities-to-bulk-step-deleteting 
Add activity to bulk step deletion [SCI-6928]
 2022-07-05 20:11:44 +02:00
aignatov-bio 5b37a96e79
Merge pull request #4174 from aignatov-bio/ai-sci-6759-load-save-protocol-from-repository 
Fix load/save protocol to repository [SCI-6759]
 2022-07-05 12:57:59 +02:00
Anton 7b0853d00a CSS fixes for steps [SCI-6932] 2022-07-05 12:49:12 +02:00
Martin Artnik 910c36af08 Merge branch 'features/step-editing-improvements' into develop 2022-07-05 10:12:10 +02:00
Anton f3fdf25d2f Add activity to bulk step deletion [SCI-6928] 2022-07-04 21:15:19 +02:00
artoscinote 79b801121a
Fix protocol title, disable reordering of elements if less than 2 [SCI-6934] (#4187) 2022-07-04 13:55:26 +02:00
artoscinote a0578e09bb
Fix tags modal css issue [SCI-6926] (#4182) 2022-07-04 13:54:54 +02:00
artoscinote 709c0b0b8a
Scroll to bottom when appending step [SCI-6927] (#4181) 2022-07-04 13:54:40 +02:00
artoscinote a5ffb90a96
Fix multi modal support, add end of body data-hook to layout [SCI-6922] (#4180) 2022-07-04 13:54:22 +02:00
ajugo 7d09882ec2
Fix edit button on stepText element [SCI-6938] (#4189) 2022-07-04 12:46:59 +02:00
aignatov-bio d5f8cef15a
Merge pull request #4175 from aignatov-bio/ai-sci-6909-fix-image-saving-to-protocol-description 
Fix image saving to tinymce field [SCI-6909]
 2022-07-04 09:57:42 +02:00
artoscinote 6b79f32e52
Fix asset V2 export/import [SCI-6936] (#4185) 
* Fix asset V2 export/import [SCI-6936]

* Fix import of legacy eln step description images [SCI-6937]
 2022-07-01 11:35:04 +02:00
artoscinote 800f856ab1
Handle step description with the new step_texts structure [SCI-6890] (#4176) 2022-06-28 09:56:24 +02:00
Anton 0e36783c5c Fix image saving to tinymce field [SCI-6909] 2022-06-27 13:31:09 +02:00
Anton bf13708e31 Fix load/save protocol to repository [SCI-6759] 2022-06-27 13:14:45 +02:00
artoscinote b880f6fc39
Add API endpoints for step texts [SCI-6889] (#4173) 2022-06-27 12:30:45 +02:00
aignatov-bio 3a5492f875
Merge pull request #4168 from aignatov-bio/ai-sci-6862-fix-css-step-editing 
CSS fixes for step editing [SCI-6862]
 2022-06-27 11:13:18 +02:00
aignatov-bio bd1f65c811
Merge pull request #4171 from aignatov-bio/ai-sci-6921-add-delete-all-button 
Add delete all steps button [SCI-6921]
 2022-06-27 11:13:06 +02:00
Anton 1863e031c5 PDF report fixes [SCI-6924] 2022-06-24 14:38:24 +02:00
Anton 5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Anton a727fc0d68 Fix css for protocol repository [SCI-6862] 2022-06-21 18:20:52 +02:00
ajugo a260217cec
Fix report logo inserting [SCI-6914] (#4167) 2022-06-21 14:27:51 +02:00
aignatov-bio f94f0d2a1e
Add fontawesome incons to simple sign in [SCI-6791] (#4166) 
Co-authored-by: Anton <anton@scinote.net>
 2022-06-21 13:07:33 +02:00
Anton 8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
ajugo a4ff347d6e
Fix datatable sort in task assigned repository to task and on first repository load [SCI-6904] (#4164) 
* Enable repository sorting on assigned repository [SCI-6904]

* Fix order at repository table initialization [SCI-6904]
 2022-06-21 10:49:03 +02:00
ajugo c39f0a4e4d
Fix missing bell reminder [SCI-6911] (#4163) 2022-06-17 10:01:36 +02:00
Alex Kriuchykhin 49f05f3df9
Merge pull request #4162 from okriuchykhin/ok_SCI_6907 
Fix repository export with enabled stock management [SCI-6907]
 2022-06-13 10:14:53 +02:00