scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
13173 commits 69 branches 179 tags 165 MiB
Commit graph

59 commits

Author SHA1 Message Date
ajugo d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
Oleksii Kriuchykhin 7fff3e8f78 Merge branch 'hotfix/1.26.6.2' into develop 2023-03-20 15:36:49 +01:00
Oleksii Kriuchykhin b67691acb5 Merge branch 'develop' into features/protocol_versioning 2023-03-17 13:53:30 +01:00
ajugo 8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] (#5125) 2023-03-14 13:03:37 +01:00
Martin Artnik ca4a5360ed Fix protocol link and step delete modal styling [SCI-8109] 2023-03-09 13:53:52 +01:00
Alex Kriuchykhin 87153b8899
Improve filtering of user supplied data in the input and text fields [SCI-8095] (#5106) 2023-03-09 11:38:47 +01:00
ajugo 8b1bc51950
Fix loading of i icon on protocol [SCI-8051] (#5061) 2023-03-03 09:55:42 +01:00
Martin Artnik 165e012d23 Replace highlight.js with prism.js [SCI-7974] 2023-02-28 16:22:35 +01:00
Soufiane 53f2bc3be0
Merge pull request #4977 from sboursen-scinote/sb_SCI-7910 
Protocol templates - revert action and alert message [SCI-7910]
 2023-02-28 15:33:05 +01:00
sboursen-scinote 1c9d9d8082 Add a small refactor [SCI-7910] 2023-02-28 14:13:18 +01:00
sboursen-scinote 66edffe53a Use I18n [SCI-7910] 2023-02-28 12:03:00 +01:00
sboursen-scinote b99d9c485c Revert "Update the style of the unlink protocol modal [SCI-7909]" 
This reverts commit 0f9dcda99b.
 2023-02-28 11:51:42 +01:00
Anton a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
sboursen-scinote 0f9dcda99b Update the style of the unlink protocol modal [SCI-7909] 2023-02-14 16:26:06 +01:00
sboursen-scinote 4b264db343 Update the text of the inlink protocol modal [SCI-7909] 2023-02-14 14:59:05 +01:00
ajugo cb332f163f
Update the Load protocol template to task modal [SCI-7591] (#4870) 
* Update the Load protocol template to task modal [SCI-7591]

* Update the Load protocol template to task modal [SCI-7591]

* Load last protocol version from repository to task [SCI-7591]

* Fix find_by for load_table [SCI-7591]
 2023-02-14 13:19:24 +01:00
Anton a39058ffe5 Fix table overflow for TinyMCE [SCI-7782] 2023-01-19 12:56:15 +01:00
Martin Artnik 3e65ae921c Fix TinyMCE blocking turbolinks [SCI-7729] 2023-01-12 12:09:44 +01:00
Martin Artnik b559352128 Remove TinyMCE draft auto init functionality [SCI-7729] 2023-01-11 15:31:14 +01:00
Andrej 745be5a0f7 Remove old step code [SCI-7181] 2022-10-24 13:07:10 +02:00
Alex Kriuchykhin 9aeb107635
Fix saving protocol to repository [SCI-6935] (#4190) 2022-07-06 11:45:04 +02:00
artoscinote 2515ed5a32
Add collapsing task status buttons [SCI-6721] (#4060) 2022-04-28 14:12:08 +02:00
aignatov-bio ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +02:00
aignatov-bio 2d667acdd1 Prevent tinymce edit mode when link click 2020-09-22 10:56:40 +02:00
Urban Rotnik aa88b6bdb4 Move redirect to controller 2020-09-09 11:26:43 +02:00
Urban Rotnik d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Mojca Lorber c0c93772ff Fix protocol duplication at saving protocol from task to repository 2020-06-09 11:45:03 +02:00
aignatov-bio c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
aignatov-bio 8b5872347a
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown 
Add new protocol template dropdown [SCI-4538]
 2020-05-07 08:32:54 +02:00
aignatov-bio 9d006aac9e Fix handson table for colapsed protocol section 2020-05-02 22:15:38 +02:00
aignatov-bio 1ed62c4a49 Fix I18n and save to repository button 2020-05-01 20:45:09 +02:00
aignatov-bio ad705a740c Add new protocol template dropdown 2020-04-24 15:48:40 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
aignatov-bio b188b0511b Refactor TinyMCE autosave check 2020-03-19 15:45:14 +01:00
Anton Ignatov c389972e2a Fix JS error in recent protocol drop down 2019-09-24 09:47:04 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
aignatov-bio b57e79a557
Fix tables (#1963) 2019-08-09 09:41:32 +02:00
Oleksii Kriuchykhin a5d47e75c5 Remove duplicated protocols.js.erb file [SCI-3678] 2019-08-08 14:33:07 +02:00
aignatov-bio 68ebf13bca
Fix tags modal issue (#1856) 2019-07-02 11:20:49 +02:00
aignatov-bio 81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
aignatov-bio 52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800) 
* Add recent protocols dropdown to task page
 2019-06-13 15:47:29 +02:00
zmagod 8ca7151df4 added constant to load_from_file_size_error local 2016-12-06 13:52:07 +01:00
zmagod ef2471d3f7 fixes inport eln error message and spinner [fixes SCI-752] 2016-12-05 10:44:58 +01:00
Oleksii Kriuchykhin be59b85d3b Added additional checks for tutorial steps [SCI-703] 2016-11-22 13:55:23 +01:00
Matej Zrimšek c8eb82cc85 Fixed tutorial step numbers and changed getting next page reference on protocols page. 2016-11-17 14:46:04 +01:00
Matej Zrimšek 92d990a715 Code for tutorial function steps parameter reformatted. Deleted Git merging line. 2016-11-17 14:46:04 +01:00
Matej Zrimšek 0e97bfc002 Refactored and added back button for tutorial for steps 21-22. Minor tutorial function renaming and docs update. 2016-11-17 14:46:04 +01:00
Matej Zrimšek 33c96c9eee Refactored and added back button for tutorial for steps 12-13. 2016-11-17 14:46:04 +01:00
Oleksii Kriuchykhin d2e29935cf Improved tutorial styling [SCI-685] 2016-11-16 15:44:06 +01:00
Oleksii Kriuchykhin b9f982ead7 Additional steps added to tutorial and numbering of the steps fixed [SCI-571] 2016-11-11 10:07:34 +01:00