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
Anton
937bc60542
Merge branch 'features/september-release' of github.com:scinote-eln/scinote-web into features/september-release
2023-08-07 10:37:20 +02:00
Anton
89d7241f60
Merge branch 'develop' into features/september-release
2023-08-07 10:35:15 +02:00
Martin Artnik
76a0f433cd
Basic OVE editor implementation [SCI-8929]
2023-08-02 14:13:04 +02:00
Anton
2b83243aa8
Refactor insert menu [SCI-8905]
2023-07-26 16:28:32 +02:00
Martin Artnik
3978d9efef
Merge branch 'develop' into features/august-release
2023-07-26 11:22:49 +02:00
Giga Chubinidze
ab41b5e219
Some icons have the checkboard pattern applied to the background [SCI-5605]
2023-07-25 11:52:31 +04:00
sboursen-scinote
634d4b6066
Prefill the protocol name in modal when saving from template [SCI-8239]
2023-07-25 09:23:32 +02:00
Anton
aa87b332e4
Prepare step components for results refactor [SCI-8880]
2023-07-24 14:07:11 +02:00
Martin Artnik
ebfaca6966
Clear wopi file length error on input, css fix [SCI-8877]
2023-07-24 12:46:45 +02:00
Anton
2a47909e32
Update step text element [SCI-8880]
2023-07-21 10:35:14 +02:00
Martin Artnik
5cc087835a
Merge branch 'develop' into features/august-release
2023-07-19 11:21:24 +02:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] ( #5736 )
...
* CSS: Protocol templates UI issues [SCI-8790]
* Reorder css properties
* Remove whitespace in scss
* Adding flexible class to protocols-show
2023-07-14 12:31:54 +02:00
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] ( #5766 )
...
* Fix label templates, inline edit, checklist and step [SCI-8792]
* Add mouse selection to protocol name on task and protocol desc.
* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
Anton
4cc6513f82
Fix css for protocol checklists [SCI-8788]
2023-07-13 13:55:32 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] ( #5760 )
2023-07-13 09:45:53 +02:00
aignatov-bio
c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes
...
Multiple CSS fixes [SCI-8762]
2023-07-12 14:34:59 +02:00
Anton
24454a0fb9
Multiple CSS fixes [SCI-8762]
2023-07-12 12:25:31 +02:00
aignatov-bio
683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions
...
Fix checklists drag/drop interactions in Safari [SCI-8716]
2023-07-12 09:48:27 +02:00
Anton
71020c032d
Fix checklists drag/drop interactions in Safari [SCI-8716]
2023-07-11 13:42:08 +02:00
Anton
8e1836aa82
CSS fixes [SCI-8762]
2023-07-10 21:09:29 +02:00
Anton
8fac4c1b7c
UI CSS fixes
2023-06-22 11:55:23 +02:00
Anton
2030b71082
UI CSS Fixes
2023-06-21 12:02:18 +02:00
artoscinote
62411fb77b
Merge pull request #5517 from sboursen-scinote/sb_SCI-8316
...
Add office file to task step - reload file does not work for empty file [SCI-8316]
2023-06-20 11:12:28 +02:00
Anton
4e972de096
UI CSS fixes
2023-06-19 15:58:17 +02:00
Anton
c4f82cc756
Css fixes [SCI-8671]
2023-06-15 15:12:51 +02:00
Anton
d795f996f2
Merge branch 'develop' into features/ui-revamp
2023-06-14 15:18:50 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] ( #5589 )
2023-06-14 10:20:40 +02:00
Martin Artnik
27c2850f49
More fixes for icons [SCI-8366]
2023-06-08 18:12:28 +02:00
Martin Artnik
dcc30822f5
New icon tweaks & fixes [SCI-8366]
2023-06-08 17:33:50 +02:00
Giga Chubinidze
a777fd5584
New icons implementation [SCI-8366]
2023-06-08 10:33:37 +04:00
G-Chubinidze
3a2ad1eda6
Well template table arrow & math calculation disabled [SCI-8596] ( #5549 )
2023-06-02 16:08:42 +02:00
sboursen-scinote
a58803a2cd
Fix Reload button for new attachement (Wopi) when content changes [SCI-8316]
...
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-30 15:49:38 +02:00
Giga Chubinidze
d72653aff2
Cursor position improvements, focused fields - part 1 (more in addons) [SCI-8098]
2023-05-26 02:59:19 +04:00
Andrej
100eab9cb0
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/plate_templates
2023-05-18 10:56:10 +02:00
Andrej
6ed55be62c
Fix merge conflicts
2023-05-17 11:40:14 +02:00
Andrej
32d8fc3e0c
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning
2023-05-16 14:26:12 +02:00
Soufiane
19cad569b3
Cache the values of formulas of HOT tables in meta data [SCI-8173] ( #5406 )
2023-05-16 11:19:56 +02:00
ajugo
d8945cc627
Fix large asset preview [SCI-8433] ( #5408 )
2023-05-16 10:24:08 +02:00
Andrej
97bde133a8
Fix plate template JSON creation [SCI-8082]
2023-05-08 10:25:50 +02:00
Andrej
29a9c3781e
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning
2023-05-04 13:34:45 +02:00
ajugo
d92a9d62b3
Fix opening of the step reorderable modal [SCI-8364] ( #5358 )
2023-05-04 09:48:59 +02:00
ajugo
d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] ( #5295 )
2023-04-25 15:12:19 +02:00
G-Chubinidze
413a65972b
At click away to another page save input to step table [SCI-8096] ( #5257 )
...
Co-authored-by: Giga Chubinidze <gchubinidze@unisens.ge>
2023-04-25 14:33:32 +02:00
Andrej
a33707bd5e
Reverse table header/row numbering for plate templates [SCI-8082]
2023-04-19 12:22:22 +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
ajugo
b62f1f5405
Add missing flash messages [SCI-8247] ( #5308 )
2023-04-14 15:10:35 +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
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
ajugo
e85f1f8bbd
Show error message for protocols templates with same name [SCI-8247] ( #5266 )
2023-04-13 15:34:36 +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
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
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
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
Anton
0c76d7a9b1
Merge branch 'develop' into features/navigation-refactor
2023-03-31 20:31:30 +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
Oleksii Kriuchykhin
0beb64511d
Fix saving of big tables on steps [SCI-8216]
2023-03-28 13:29:02 +02: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
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
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
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
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
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
Anton
ea9d2d8291
Merge branch 'develop' into features/protocol_versioning
2023-02-14 11:07:58 +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
ajugo
9caa5be4c0
Updated protocol actions select menu in task [SCI-7820] ( #4939 )
2023-02-07 10:39:49 +01:00
ajugo
29a7113cc1
Fix loading task steps and step timestamps [SCI-7902] ( #4941 )
2023-02-06 16:47:11 +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
Giga Chubinidze
ed4363484a
Step timestamp display [SCI-7837]
2023-02-03 11:12:33 +04:00
Giga Chubinidze
e412f40948
simple logic update
2023-01-31 17:08:34 +04: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
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
Martin Artnik
2010ff091c
Styling fixes and cleanup [SCI-7574]
2022-12-22 10:37:47 +01:00
Giga Chubinidze
ae8efa8e1a
changed if else logic, added back placeholders
2022-12-16 17:22:06 +04:00
Martin Artnik
3ea059529d
Fix table scroll wrapping [SCI-7569]
2022-12-14 14:32:23 +01:00
Giga Chubinidze
556431a0da
changed code for develop branch
2022-12-12 19:17:57 +04:00
Martin Artnik
de9f06a1fc
Upgrade TinyMCE to 6.3, fix issues [SCI-7574]
2022-12-09 12:52:18 +01:00
Anton
eddd5b7476
Fix options dropdown position on step [SCI-7387]
2022-10-27 12:42:54 +02:00
Anton
c6e5fba21c
Fix file name in attachment delete modal [SCI-7356]
2022-10-19 11:12:27 +02:00
artoscinote
d08838bf48
Merge branch 'develop' into master_1_26_0_5
2022-09-29 10:12:29 +02:00
artoscinote
e3ca916c2a
Merge pull request #4447 from scinote-eln/ma_SCI_7184
...
Add y-scroll to step tables [SCI-7184]
2022-09-21 10:29:19 +02:00
Anton
07f0142789
Fix links in locked step texts elements [SCI-7224]
2022-09-20 15:44:52 +02:00
artoscinote
dddbc16a50
Merge pull request #4438 from scinote-eln/ma_SCI_7184
...
Add y-scroll to step tables [SCI-7184]
2022-09-19 13:56:17 +02:00
Martin Artnik
c67213db41
Add y-scroll to step tables [SCI-7184]
2022-09-16 11:16:39 +02:00
aignatov-bio
c0339b17be
Merge branch 'develop' into ai-sci-7108-add-duplication-functionality-to-steps
2022-09-15 11:25:25 +02:00
Anton
34b87ae92f
Fix files loading during copy [SCI-7149]
2022-09-02 15:09:56 +02:00
Anton
d555227652
Add acitvities and flash messages for component duplication [SCI-7108]
2022-08-31 11:09:38 +02:00
Anton
e22af8830a
Add activties to step duplication [SCI-7109]
2022-08-24 13:45:39 +02:00
artoscinote
766d2bb3e0
Fix checkboxes for technicians [SCI-7122] ( #4378 )
2022-08-23 18:10:28 +02:00
Anton
3e539adbde
Fix step drag/drop file [SCI-7123]
2022-08-23 17:59:28 +02:00
Anton
bc112dd6af
Add step duplication [SCI-7109]
2022-08-23 17:54:33 +02:00
artoscinote
74b9101e6f
Enable table scroll for locked tasks [SCI-7125] ( #4375 )
2022-08-23 14:23:21 +02:00
Anton
d8bcdb09e4
Fix drag n drop for locked tasks [SCI-7123
2022-08-23 14:20:24 +02:00
artoscinote
c2242b6cc8
Amend how checkboxes work with locking [SCI-7122] ( #4374 )
2022-08-23 10:10:20 +02:00
Anton
1bac9aeb4c
Add duplication to components [SCI-7108]
2022-08-22 15:03:49 +02:00
Andrej
371f5e782b
Remove strikethrough for step name and checklist items [SCI-7116]
2022-08-19 16:02:20 +02:00
aignatov-bio
1e6e0f5038
Merge pull request #4360 from aignatov-bio/ai-sci-7107-fix-attachmets-actions-dropdown-position
...
Fix attachments actions dropdown position [SCI-7107]
2022-08-18 12:47:01 +02:00
Anton
2d60ce7e99
Fix attachments actions dropdown position [SCI-7107]
2022-08-18 11:35:30 +02:00
Anton
96d52254c3
Fix file uploading for unlimited storage [SCI-7105]
2022-08-18 11:26:42 +02:00
ajugo
5cdc8488b5
Add tooltips to step asset file name [SCI-7022] ( #4356 )
2022-08-16 12:20:37 +02:00
Anton
1a13e1bfc6
Fix unexpected error on step attachments [SCI-7032]
2022-08-16 11:22:19 +02:00
