aignatov-bio
d7e8f0303f
Merge branch 'features/navigation-refactor-v2' into ai-sci-8016-left-navigation-refactor
2023-04-19 10:33:09 +02:00
G-Chubinidze
5eacd41ca5
Adding well plate table options to "insert step content" select menu [SCI-7931] ( #5302 )
...
* well plate implementation without nested dropdown
* Implement dropdown submenu [SCI-7931]
* minor code cleanup
---------
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
Co-authored-by: Martin Artnik <martin@scinote.net>
2023-04-18 15:42:53 +02:00
Anton
265272f212
Fix marvin js icon
2023-04-18 14:09:41 +02:00
Martin Artnik
cccb5cd54e
Fix display of special characters in teams dropdown [SCI-8323]
2023-04-18 11:59:00 +02:00
Anton
1526553467
Small fixes for notificaitions [SCI-8331]
2023-04-17 15:23:52 +02:00
aignatov-bio
18590b502d
Merge pull request #5309 from aignatov-bio/ai-sci-8325-fix-date-sorting-in-notifications
...
Fix date sorting in notifications [SCI-8325]
2023-04-17 11:23:37 +02:00
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] ( #5308 )
2023-04-14 15:10:35 +02:00
Anton
c990301f1b
Fix date sorting in notifications [SCI-8325]
2023-04-14 14:46:57 +02:00
aignatov-bio
134e7373c7
Merge pull request #5280 from sboursen-scinote/sb_SCI-8237-alternative-solution
...
Title for publishing template protocol draft must include next version value (Alt) [SCI-8237]
2023-04-14 10:37:51 +02:00
artoscinote
dd97a83de1
Merge pull request #5303 from G-Chubinidze/gc_SCI_7459
...
Not saved checklist item at pasting text [SCI-7459]
2023-04-14 10:28:38 +02:00
sboursen-scinote
4783ffcc4f
Fix the issue with the published version number and refactor the code [SCI-8237]
2023-04-14 09:56:35 +02:00
Giga Chubinidze
5fa59ec2a0
Not saved checklist item at pasting text [SCI-7459]
2023-04-13 21:58:49 +04:00
aignatov-bio
cbd84b94b4
Merge pull request #5288 from aignatov-bio/ai-sci-8280-add-counters-logic-to-notifications
...
Add counters logic for notifications [SCI-8280]
2023-04-13 15:35:56 +02:00
Anton
cb7f41e516
Add counters logic for notifications [SCI-8280]
2023-04-13 15:35:21 +02:00
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] ( #5266 )
2023-04-13 15:34:36 +02:00
aignatov-bio
3ad5b779c4
Merge pull request #5298 from aignatov-bio/ai-sci-8289-css-fixes-for-navigator
...
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:59:39 +02:00
Anton
caf21959bd
Multiple CSS fixes for navigation [SCI-8289][SCI-8313][SCI-8288][SCI-8273][SCI-8309]
2023-04-13 14:54:03 +02:00
aignatov-bio
9466b119a1
Merge pull request #5297 from scinote-eln/features/navigation-refactor
...
Features/navigation refactor
2023-04-13 13:59:25 +02:00
sboursen-scinote
0b76acbede
Change the draft version to be the next one after the latest published [SCI-8237]
2023-04-11 16:29:12 +02:00
sboursen-scinote
0efeb1d4cb
Add version number to publish modal [SCI-8237]
2023-04-11 15:04:14 +02:00
sboursen-scinote
b1914468c9
Add version number to protocol details [SCI-8237]
2023-04-11 15:00:21 +02:00
Soufiane
0f8918e9f6
Revision notes written in version modal are not seen/saved [SCI-8279] ( #5272 )
...
* Load latest protocol version comment in publish modal [SCI-8279]
* Check publish permission before updating the draft comment [SCI-8279]
2023-04-11 12:50:14 +02:00
sboursen-scinote
910b67f881
Save protocol steps order when modal is hidden [SCI-8276]
2023-04-10 09:27:44 +02:00
Anton
7b40c305e8
Add infinite scroll to notifications flyout [SCI-8282]
2023-04-07 14:06:29 +02:00
ajugo
4961243731
Fix protocol dropdown options for the locked tasks and archived protocol template [SCI-8277] ( #5264 )
2023-04-06 16:29:19 +02:00
Oleksii Kriuchykhin
60579465ab
Refactor user_notifications controller, remove unused code [SCI-8207]
2023-04-06 14:57:00 +02:00
ajugo
3ad1d384ee
Raise character limit for rich text fields and reword limit text error [SCI-7959] ( #5221 )
2023-04-05 15:34:48 +02:00
artoscinote
a1cebecdcd
Merge pull request #5037 from G-Chubinidze/gc_SCI_7673
...
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-04-05 15:26:18 +02:00
artoscinote
47b7d1a1ca
Merge pull request #4999 from G-Chubinidze/gc_SCI_7935
...
Rearrange of checklist items does not work after pasting several items at once [SCI-7935]
2023-04-05 15:23:03 +02:00
Soufiane
4985c2eb88
Added Published on & Published by to Protocol details screen [SCI-8193] ( #5239 )
...
Added Published on & Published by to Protocol details screen [SCI-8193]
2023-04-05 15:08:31 +02:00
G-Chubinidze
045220c657
Wrong error message for too long office file name [SCI-7949] ( #5155 )
...
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-05 13:56:25 +02:00
Martin Artnik
79b4f0d03d
Add display of validation errors to TinyMCE [SCI-8246]
2023-04-03 15:34:59 +02:00
Anton
52aac69488
Add final version for left menu [SCI-8016]
2023-04-03 13:29:24 +02:00
Martin Artnik
2eb4c2fd9d
Enable TinyMCE menu bar on mobile [SCI-8221]
2023-04-03 12:49:04 +02:00
Anton
0c76d7a9b1
Merge branch 'develop' into features/navigation-refactor
2023-03-31 20:31:30 +02:00
Anton
ec96fb134f
Merge branch 'ai-sci-7926-add-tailwind-and-new-buttons-design' of github.com:aignatov-bio/scinote-web into ai-sci-7926-add-tailwind-and-new-buttons-design
2023-03-31 14:09:01 +02:00
Giga Chubinidze
57d951a690
Change title for publishing draft [SCI-8232]
2023-03-30 20:30:49 +04:00
Anton
ed1c4bcb69
Replace webpacker with jsbundling-rails [SCI-7926]
2023-03-30 13:39:57 +02:00
Oleksii Kriuchykhin
89a45d2b14
Merge branch 'hotfix/1.26.6.4' into develop
2023-03-29 10:39:51 +02:00
Oleksii Kriuchykhin
ee7abc2912
Fix step table renaming [SCI-8216]
2023-03-28 16:03:45 +02:00
Anton
babb46baa7
Update webpacker to version 5.4.4 [SCI-7926]
2023-03-28 14:00:28 +02:00
Oleksii Kriuchykhin
0beb64511d
Fix saving of big tables on steps [SCI-8216]
2023-03-28 13:29:02 +02:00
Anton
1177eaae5b
Add general notifiacitons flyout [SCI-8017]
2023-03-25 17:34:26 +01:00
Anton
854fc1764b
Refactor left/top navigation [SCI-8055]
2023-03-22 14:08:21 +01:00
Oleksii Kriuchykhin
cf599a8277
Fix visibility of save as draft button, fix permissions for new drafts [SCI-8145][SCI-8157]
2023-03-21 16:25:02 +01: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
Anton
5a242021e3
Fix handson table metadata issue [SCI-8138]
2023-03-16 12:02:20 +01:00
Soufiane
bc900cd26d
Merge branch 'features/protocol_versioning' into sb_SCI-8108
2023-03-16 09:20:36 +01:00
sboursen-scinote
d49a992dd4
Fix styles when protocol is published [SCI-8108]
2023-03-16 09:15:22 +01:00
ajugo
917269a8e9
Add micro-interactions for protocol repository modals [SCI-8091] ( #5102 )
2023-03-14 14:20:03 +01:00
G-Chubinidze
7881ffbd3d
Merge branch 'features/protocol_versioning' into gc_SCI_8058
2023-03-14 17:07:52 +04:00
ajugo
8acbf0b4f1
Fix revert protocol action for linked task changes [SCI-8110] ( #5125 )
2023-03-14 13:03:37 +01:00
Soufiane
7b93ced541
CSS: Protocol template - Details [SCI-8108] ( #5131 )
...
* Fix spacing issue in protocol details [SCI-8108]
* Fix spacing issue in protocol datatable [SCI-8108]
* Match the styles of the authors and the keywords to figma [SCI-8108]
* Fix broken dropdown footer [SCI-8108]
* Fix hound [SCI-8108]
2023-03-14 12:54:13 +01:00
Giga Chubinidze
67539b15de
Protocol permissions - button display [SCI-8058]
2023-03-14 12:12:54 +04:00
sboursen-scinote
4afac52ad3
Fix spacing issue in protocol datatable [SCI-8108]
2023-03-13 10:56:26 +01:00
Alex Kriuchykhin
cb1c49762a
Revert "Protocol permissions - button display [SCI-8058]" ( #5121 )
2023-03-10 11:45:32 +01:00
G-Chubinidze
f6ee2e821c
Merge pull request #5107 from G-Chubinidze/gc_SCI_8058
...
Protocol permissions - button display [SCI-8058]
2023-03-09 19:02:42 +04: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
G-Chubinidze
32d1c2cf6d
Merge branch 'features/protocol_versioning' into gc_SCI_8058
2023-03-08 21:15:36 +04:00
Giga Chubinidze
553c644811
Protocol permissions - button display [SCI-8058]
2023-03-08 21:12:29 +04:00
aignatov-bio
ff4ef31ebf
Merge pull request #5091 from aignatov-bio/ai-sci-8079-fix-print-button-on-protocol-show-page
...
Fix print protocol button on protocol show page [SCI-8079]
2023-03-07 14:09:08 +01:00
G-Chubinidze
3cd4d9f760
Merge pull request #5077 from G-Chubinidze/gc_SCI_7954
...
Archived protocol template navigation, icon, button [SCI-7954]
2023-03-07 15:51:51 +04:00
Anton
25050cb6cc
Fix print protocol button on protocol show page [SCI-8079]
2023-03-07 11:25:59 +01:00
Alex Kriuchykhin
0ab89db29c
Fix protocol Publish button behaviour after canceling of publish action [SCI-8068] ( #5081 )
2023-03-07 09:49:21 +01:00
Giga Chubinidze
4a02a130f0
Archived protocol template navigation, icon, button [SCI-7954]
2023-03-06 23:44:47 +04:00
aignatov-bio
da31883ac3
Add error handling to actions in protocol controller [SCI-8073] ( #5074 )
2023-03-03 15:33:08 +01:00
ajugo
8b1bc51950
Fix loading of i icon on protocol [SCI-8051] ( #5061 )
2023-03-03 09:55:42 +01:00
Anton
b68291c834
Fix protocol vue component loading [SCI-8024]
2023-03-02 11:33:40 +01:00
artoscinote
3b074a4af6
Merge pull request #5044 from artoscinote/ma_SCI_7974
...
Replace highlight.js with prism.js [SCI-7974]
2023-03-01 12:52:57 +01:00
Martin Artnik
165e012d23
Replace highlight.js with prism.js [SCI-7974]
2023-02-28 16:22:35 +01:00
Soufiane
2aee34ce56
Merge pull request #4955 from sboursen-scinote/sb_SCI-7904
...
Protocol templates - delete all steps (tasks screen) [SCI-7904]
2023-02-28 15:33:33 +01:00
Martin Artnik
7bf857a179
Fix permission checks for protocols [SCI-7992]
2023-02-28 13:48:29 +01:00
Giga Chubinidze
30e37a95d7
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-02-28 09:59:45 +04:00
aignatov-bio
5ef110d985
Add version modal to protocol show page [SCI-7985] ( #5018 )
2023-02-24 16:17:36 +01:00
sboursen-scinote
4ab8768024
Focus on newly added step element [sb_SCI-7938]
2023-02-24 10:49:18 +01:00
sboursen-scinote
d42cd85533
Focus on newly added Attachment [sb_SCI-7938]
2023-02-24 10:48:47 +01:00
Anton
826cb162da
Add save as draft action
2023-02-22 14:59:48 +01:00
G-Chubinidze
dac150f75f
Revert "Add office file to task step - reload file option shows plain html page [SCI-7673]"
2023-02-22 13:29:39 +04:00
Anton
a95ca75362
Add new protocol modal [SCI-7810]
2023-02-21 14:15:53 +01:00
Martin Artnik
238354a314
Add back basic TinyMCE html editor [SCI-7965]
2023-02-21 11:23:52 +01:00
artoscinote
8f8865c73c
Fix MarvinJS image toolbar issues [SCI-7934] ( #4998 )
2023-02-21 09:12:59 +01:00
Giga Chubinidze
34cfb14869
Rearrange of checklist items does not work after pasting several items at once [SCI-7935]
2023-02-21 10:44:28 +04:00
artoscinote
3ca007981b
Merge pull request #4993 from G-Chubinidze/gc_SCI_7673
...
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-02-20 10:37:03 +01:00
Giga Chubinidze
0ea7d6b75e
changed axios to jquery, removed page refresh after file creation
2023-02-20 13:27:17 +04:00
Giga Chubinidze
14592ebea6
Add office file to task step - reload file option shows plain html page [SCI-7673]
2023-02-17 22:51:10 +04:00
Martin Artnik
3961d1d6af
Add delete confirmation modal to checklist items [SCI-7952]
2023-02-17 15:59:37 +01:00
artoscinote
5d276c803c
Merge pull request #4989 from artoscinote/ma_SCI_7934
...
Fix MarvinJS image toolbar [SCI-7934]
2023-02-17 15:53:27 +01:00
Martin Artnik
fbf7e69100
Fix MarvinJS image toolbar [SCI-7934]
2023-02-17 15:43:57 +01:00
artoscinote
6400745b0c
Merge pull request #4984 from artoscinote/ma_SCI_7937
...
Fix table of contents, add image download tooltip [SCI-7937]
2023-02-17 14:59:01 +01:00
Martin Artnik
43f6a8e66f
Fix table of contents, add image download tooltip [SCI-7937]
2023-02-17 10:36:47 +01:00
artoscinote
e58f0fc1f2
Merge pull request #4912 from G-Chubinidze/gc_SCI_7195
...
Text block on step without title in rearrange modal [SCI-7195]
2023-02-15 10:43:44 +01:00
Martin Artnik
ac9c569b39
Enable Lato font in TinyMCE iframe [SCI-7883]
2023-02-14 14:06:47 +01:00
Anton
ea9d2d8291
Merge branch 'develop' into features/protocol_versioning
2023-02-14 11:07:58 +01:00
Martin Artnik
5e63240996
Add image TinyMCE plugin [SCI-7916]
2023-02-13 15:33:56 +01:00
Anton
dc5cfb9fc3
Add publish and delete action [SCI-7905]
2023-02-13 14:45:22 +01:00
Anton
743d901310
Add published view for protocol [SCI-7617]
2023-02-13 10:41:30 +01:00
Anton
3902310463
Update protocol view screen [SCI-7590]
2023-02-13 09:52:30 +01:00
sboursen-scinote
622b7f3341
Change the width of modal [SCI-7904]
2023-02-09 15:50:25 +01:00
aignatov-bio
6e570dcc9d
Merge pull request #4915 from aignatov-bio/ai-sci-7840-fix-headers-in-tinymce
...
Fix heading styles for tinymce [SCI-7840]
2023-02-07 13:25:02 +01:00
artoscinote
ca183f1f76
Merge pull request #4944 from G-Chubinidze/gc_SCI_7883
...
fixed tinymce stylings for all elements inside editing mode [SCI-7883]
2023-02-07 13:11:03 +01:00
Giga Chubinidze
3483c7ba56
fixed tinymce stylings for all elements inside editing mode
2023-02-07 16:00:14 +04:00
Martin Artnik
d0fd0efc1f
Disable all TinyMCE context menus [SCI-7886]
2023-02-07 11:40:18 +01:00
ajugo
9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] ( #4939 )
2023-02-07 10:39:49 +01:00
artoscinote
5a93cd1a12
Merge pull request #4921 from artoscinote/ma_SCI_7187
...
Support compiling webpacker content from addons [SCI-7187]
2023-02-07 10:24:18 +01:00
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] ( #4941 )
2023-02-06 16:47:11 +01:00
Martin Artnik
ebd98bfb85
Make TinyMce init more extensible [SCI-7187]
2023-02-06 16:05:13 +01:00
aignatov-bio
bfb035d339
Merge pull request #4936 from aignatov-bio/ai-sci-7834-save-handson-table-metadata
...
Save handson table metadata [SCI-7834]
2023-02-06 14:24:51 +01:00
Anton
3849b1a7a1
Save handson table metadata [SCI-7834]
2023-02-06 14:21:55 +01:00
artoscinote
3331c5fa3f
Merge pull request #4928 from G-Chubinidze/gc_SCI_7837
...
Step timestamp display [SCI-7837]
2023-02-06 12:03:02 +01:00
artoscinote
41644d70ea
Merge pull request #4934 from G-Chubinidze/gc_SCI_7883
...
Update the TinyMCE font [SC-7883]
2023-02-06 11:19:29 +01:00
artoscinote
6d455d6b7b
Merge pull request #4889 from sboursen-scinote/sb_SCI-7585
...
FIX: Clear/Close filter change - Inventory/Items filter [SCI-7585]
2023-02-06 11:17:43 +01:00
Giga Chubinidze
f3a4f316bb
Update the TinyMCE font [SC-7883]
2023-02-05 23:02:59 +04:00
Alex Kriuchykhin
958f9784b0
Add minimum length validation to label template name [SCI-7319] ( #4930 )
2023-02-03 15:36:32 +01:00
Giga Chubinidze
ed4363484a
Step timestamp display [SCI-7837]
2023-02-03 11:12:33 +04:00
Anton
a784518464
Fix heading styles for tinymce [SCI-7840]
2023-02-01 14:01:38 +01:00
Giga Chubinidze
e412f40948
simple logic update
2023-01-31 17:08:34 +04:00
Anton
68f2db7996
Fix label template logo dimenstion calculation [SCI-7822]
2023-01-30 12:59:51 +01:00
sboursen-scinote
2e037b69ff
Fix Hound related issue [SCI-7585]
2023-01-26 09:23:37 +01:00
sboursen-scinote
36cc68f94a
Fix Hound related issue [SCI-7585]
2023-01-26 09:20:20 +01:00
sboursen-scinote
95b339f759
Fix Hound related issue [SCI-7585]
2023-01-26 09:12:31 +01:00
sboursen-scinote
b02889c801
Fix the behavior of the clear button [SCI-7585]
2023-01-26 09:03:08 +01:00
sboursen-scinote
15da0f2f33
Remove commented code and change the name of the hide filters method [SCI-7585]
2023-01-26 08:47:55 +01:00
sboursen-scinote
adcb0e84f8
Add close button [SCI-7585]
2023-01-26 08:41:33 +01:00
sboursen-scinote
ef7395b0cd
Adjust the size of the clear button on small screens [SCI-7585]
2023-01-26 08:26:34 +01:00
sboursen-scinote
ceb193deee
Make the applyFilters button work again [SCI-7585]
2023-01-25 13:49:40 +01:00
sboursen-scinote
e2521e501c
Change the position of the clear button [SCI-7585]
2023-01-25 11:28:39 +01:00
sboursen-scinote
2c8c008e49
Extract the filters_list component and reset it on clear [SCI-7585]
2023-01-25 09:34:01 +01:00
artoscinote
87fa3bc9a7
Merge pull request #4710 from G-Chubinidze/gc_SCI_7195
...
Text block on step without title in rearrange modal [SCI-7195]
2023-01-24 09:40:33 +01:00
Giga Chubinidze
01f6f4d5ea
changed logic for item naming
2023-01-21 01:08:17 +04:00
artoscinote
f72a281e0a
Merge pull request #4850 from artoscinote/ma_SCI_7776
...
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
2023-01-19 14:27:19 +01:00
Alex Kriuchykhin
58be66a06c
Merge pull request #4855 from okriuchykhin/ok_SCI_7779
...
Fix icons in custom tinyMCE menu [SCI-7779]
2023-01-19 13:21:35 +01:00
aignatov-bio
d6bbdac2bb
Merge pull request #4862 from aignatov-bio/ai-sci-7782-fix-excel-tables-in-tinymce
...
Fix table overflow for TinyMCE [SCI-7782]
2023-01-19 12:59:20 +01:00
Anton
a39058ffe5
Fix table overflow for TinyMCE [SCI-7782]
2023-01-19 12:56:15 +01:00
ajugo
d64ccb441e
Fix bullet points and blocks in tinyMCE fields [SCI-7777][SCI-7785] ( #4859 )
2023-01-19 11:39:14 +01:00
Oleksii Kriuchykhin
a6abc9d7e5
Fix icons in custom tinyMCE menu [SCI-7779]
2023-01-18 16:43:50 +01:00
Martin Artnik
b46c92b3c6
Fix navigating away with unsaved TinyMCE changes [SCI-7776]
2023-01-18 11:00:08 +01:00
ajugo
1e01d1f2b7
Fix missing translation for field codes [SCI-7765] ( #4826 )
2023-01-16 10:21:10 +01:00
Martin Artnik
14c6c67a1a
Fix merging tables in TinyMCE [SCI-7697]
2023-01-13 15:29:16 +01:00
artoscinote
80eb1639bc
Merge pull request #4823 from scinote-eln/features/tiny_mce_6
...
Features/tiny mce 6
2023-01-13 13:53:03 +01:00
Alex Kriuchykhin
d4b0f0da9d
Merge pull request #4819 from scinote-eln/features/label-template-logo
...
Features/label template logo
2023-01-13 11:58:01 +01:00
Martin Artnik
3e65ae921c
Fix TinyMCE blocking turbolinks [SCI-7729]
2023-01-12 12:09:44 +01:00
Martin Artnik
33dca201ba
Remove placeholder plugin [SCI-7729]
2023-01-11 15:49:18 +01:00
Martin Artnik
b559352128
Remove TinyMCE draft auto init functionality [SCI-7729]
2023-01-11 15:31:14 +01:00
Martin Artnik
2ffec1cf49
Fix TinyMCE style loading [SCI-7729]
2023-01-11 15:28:09 +01:00
Martin Artnik
edfc1c4e08
Fix editor close when clicking restore notification [SCI-7729]
2023-01-10 13:24:58 +01:00
Martin Artnik
4e779e70a4
Merge branch 'develop' into features/tiny_mce_6
2023-01-04 14:21:02 +01:00
ajugo
ae55935002
Add missing microinteractions on step editing [SCI-7575] ( #4711 )
2023-01-03 12:25:22 +01:00
ajugo
b549938f13
Fix print modal css [SCI-7437] ( #4648 )
2022-12-22 11:09:20 +01:00
