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

11185 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Kriuchykhin 897a8f71ec
Merge pull request #4318 from okriuchykhin/ok_SCI_7058 
Fix team switching when viewing repository from another team [SCI-7058]
 2022-08-08 13:10:31 +02:00
aignatov-bio 85cc7ae581
Merge pull request #4324 from aignatov-bio/ai-sci-7062-marvinjs-save-issue 
Fix marvinJS save issue [SCI-7062]
 2022-08-08 11:52:15 +02:00
aignatov-bio 0fdc9e9723
Merge pull request #4322 from aignatov-bio/ai-sci-7075-fix-protocol-creation-from-dashboard 
Fix protocol creation from dashboard [SCI-7075]
 2022-08-08 11:50:15 +02:00
aignatov-bio 6403e2256c
Merge pull request #4320 from aignatov-bio/ai-sci-7048-update-label-templates-toolbar 
Update labels index page [SCI-7048]
 2022-08-08 11:50:03 +02:00
Anton 6db1ec0a34 Fix marvinJS save issue [SCI-7062] 2022-08-08 11:48:58 +02:00
aignatov-bio 08879e6186
Merge pull request #4323 from aignatov-bio/ai-sci-7069-fix-table-checklist-reposition-issue 
Fix inline field when value change [SCI-7069]
 2022-08-08 11:34:41 +02:00
Anton ffaa6c6abb Fix inline field when value change [SCI-7069] 2022-08-08 11:32:10 +02:00
Anton edbcbffae4 Fix protocol creation from dashboard [SCI-7075] 2022-08-08 11:26:12 +02:00
artoscinote 464f9935a4
Migration fixes [SCI-7046] (#4321) 2022-08-08 11:21:38 +02:00
Anton 51cb951e06 Update labels index page [SCI-7048] 2022-08-08 11:15:46 +02:00
artoscinote eb619184a5
Implement typed label templates [SCI-7046] (#4316) 
* Implement typed label templates [SCI-7046]

* Add structure.sql, fix migration [SCI-7046]

* Fix method name [SCI-7046]

* Add dependent option to team - label_template relation [SCI-7046]

* Migration code style, add input sanitization [SCI-7046]

* Fix new label creation [SCI-7046]
 2022-08-08 10:06:00 +02:00
Oleksii Kriuchykhin 13c33c3c05 Fix team switching when viewing repository from another team [SCI-7058] 2022-08-05 14:13:36 +02:00
aignatov-bio 578314a8e6
Merge pull request #4315 from aignatov-bio/ai-sci-7059-fix-smart-annotation-for-steps 
Fix smart annotation on step text and checklist [SCI-7059]
 2022-08-05 11:35:36 +02:00
Anton 7992cd97a1 Fix smart annotation on step text and checklist [SCI-7059] 2022-08-05 11:23:36 +02:00
ajugo 899ab608f8
Prefill protocol name at save to protocol repository modal [SCI-7065] (#4314) 2022-08-05 10:46:54 +02:00
ajugo 68bbb87797
Fix cancel at closing file modal and remove edit button for marvinjs asset [SCI-7061] (#4313) 2022-08-05 10:46:14 +02:00
ajugo 0579441135
Fix error pages [SCI-6967] (#4312) 2022-08-05 10:45:46 +02:00
aignatov-bio e5448f3d1f
Merge pull request #4311 from aignatov-bio/ai-sci-7030-label-template-view-edit-screen 
Add general layout for template view screen [SCI-7030]
 2022-08-04 14:13:25 +02:00
Anton a38aa80fb5 Add main functionality to view/edit screen [SCI-7041] 2022-08-04 13:37:21 +02:00
ajugo b58e3cd4d8
Add zebra settings screen [SCI-7016] (#4310) 
* Add zebra settings screen [SCI-7016]

* Fix hound [SCI-7016]
 2022-08-04 11:14:35 +02:00
artoscinote 9478779218
TinyMCE fixes [SCI-7033] (#4308) 2022-08-04 11:06:25 +02:00
artoscinote ee9c877929
Implement BS tooltips on repository toolbar [SCI-6691] (#4309) 2022-08-04 11:05:55 +02:00
aignatov-bio f48c8ac6c7
Merge pull request #4307 from aignatov-bio/ai-sci-7029-add-label-promo-page 
Add promo page for label templates [SCI-7029]
 2022-08-04 10:54:20 +02:00
Anton 31202922af Add general layout for template [SCI-7030] 2022-08-04 10:51:30 +02:00
Alex Kriuchykhin 9077b4ace2
Merge pull request #4306 from okriuchykhin/ok_SCI_7043 
Fix copying of TinyMCE images when loading protocol from repository [SCI-7043]
 2022-08-02 16:37:38 +02:00
Anton 8c080ea04c Add promo page for label templates [SCI-7029] 2022-08-02 14:51:18 +02:00
Oleksii Kriuchykhin cb71bb4a99 Fix copying of TinyMCE images when loading protocol from repository [SCI-7043] 2022-08-02 13:43:50 +02:00
ajugo 8222227712
Fix new step alignment and author list in protocols [SCI-6991] (#4304) 2022-08-02 12:22:29 +02:00
aignatov-bio 14070dc2c3
Merge pull request #4305 from aignatov-bio/ai-sci-7041-small-task-css-fixes 
Small CSS task fixes [SCI-7032]
 2022-08-02 11:06:04 +02:00
Anton c7b0d1d6f8 Small CSS task fixes [SCI-7032] 2022-08-02 11:00:13 +02:00
artoscinote 89a3bc8072
Checklist fixes [SCI-7031] (#4302) 2022-08-02 10:18:25 +02:00
ajugo 74a688e8ae
Fix protocol title and archived result tag [SCI-6979] (#4303) 2022-08-02 10:06:00 +02:00
Alex Kriuchykhin baa565db8d
Merge pull request #4297 from okriuchykhin/ok_SCI_7028 
Make devise session timeout configurable through env variable [SCI-7028]
 2022-08-01 16:37:53 +02:00
Alex Kriuchykhin 61395482a3
Merge pull request #4299 from okriuchykhin/ok_SCI_6978_v2 
Fix long result names in PDF reports [SCI-6978]
 2022-08-01 16:37:23 +02:00
aignatov-bio ec5879b53f
Merge pull request #4300 from aignatov-bio/ai-sci-7001-fix-attachment-menu-elements-allignment 
Fix image editor callback after save image [SCI-7019]
 2022-08-01 13:59:54 +02:00
aignatov-bio 06191c15e6
Merge pull request #4301 from aignatov-bio/ai-sci-7032-fix-attachments-error-handling 
Fix error handling for step attachments [SCI-7032]
 2022-08-01 13:59:32 +02:00
Anton bf50c42549 Fix error handling for step attachments [SCI-7032] 2022-08-01 13:57:17 +02:00
Anton 784c10aec9 Fix image editor callback after save image [SCI-7019] 2022-08-01 13:32:55 +02:00
ajugo 20095067a1
Fix checklist reordering issue [SCI-7039] (#4298) 2022-08-01 13:25:29 +02:00
Oleksii Kriuchykhin fcd0de80ca Fix long result names in PDF reports [SCI-6978] 2022-08-01 13:14:53 +02:00
artoscinote a527edd07d
Attachment management fixes [SCI-7022] (#4296) 
* Attachment management fixes [SCI-7022]

* Linter fixes [SCI-7022]
 2022-08-01 13:14:04 +02:00
aignatov-bio 617dd52759
Merge pull request #4295 from aignatov-bio/ai-sci-7019-edit-action-labels-index 
Add edit actions to label templates [SCI-7019]
 2022-08-01 11:41:30 +02:00
Oleksii Kriuchykhin da9ad5797c Make devise session timeout configurable through env variable [SCI-7028] 2022-07-28 17:15:47 +02:00
Anton 67df01711f Add edit actions to label templates [SCI-7019] 2022-07-28 14:42:13 +02:00
artoscinote 47b426539f
Fix step header functionalities in locked task [SCI-7024] (#4291) 2022-07-28 14:35:34 +02:00
aignatov-bio 0249f2a30e
CSS fixes for step attachments [SCI-7001] (#4294) 2022-07-28 09:56:09 +02:00
ajugo 46f90c3c36
Fix creating WOPI file [SCI-7014] (#4293) 2022-07-27 15:02:42 +02:00
ajugo ad4f52d912
Add Label template list screen - view mode [SCI-7018] (#4292) 
* Initial label template datatable [SCI-7018]

* Add new columns to LabelTemplate and update datatable view [SCI-7018]

* Fix after rebase [SCI-7018]

* Fix migration, disable checkboxes in view mode and fix label template to team level [SCI-7018]
 2022-07-27 10:10:32 +02:00
aignatov-bio 118ae55f2f
Merge pull request #4290 from aignatov-bio/ai-sci-7017-new-templates-navigation-layout 
Add new templates section and navigation [SCI-7017]
 2022-07-26 13:59:37 +02:00
Anton 6131b6c0b7 Add new templates section and navigation [SCI-7017] 2022-07-26 13:53:51 +02:00