Commit graph

2184 commits

Author SHA1 Message Date
artoscinote
9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] (#6056) 2023-08-23 16:49:17 +02:00
Alex Kriuchykhin
3c0389adc8
Make docx parser feature togglable [SCI-9094] (#6055) 2023-08-23 16:46:29 +02:00
artoscinote
0bea4a06ef
Add result duplicate action [SCI-8959] (#6019) 2023-08-23 15:05:31 +02:00
Alex Kriuchykhin
b08a94ced6
Remove What's new section from user preferences section [SCI-9098] (#6046) 2023-08-23 13:12:06 +02:00
aignatov-bio
c111d287ef
Merge pull request #6039 from aignatov-bio/ai-sci-9024-add-move-modal-for-elements
Add element movements between step and results [SCI-9024]
2023-08-22 12:26:57 +02:00
Anton
e9174ad158 Add element movements between step [SCI-9024] 2023-08-22 12:15:55 +02:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
Alex Kriuchykhin
dbbc5775d4
Add unit column to ledger records, fix stock update records and their creation logic [SCI-9021] (#6034) 2023-08-22 10:47:58 +02:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
artoscinote
20c20012b2
Merge pull request #5863 from ivanscinote/SCI-8807-notifications
Remove system notifications [SCI-8807]
2023-08-18 10:28:05 +02:00
Oleksii Kriuchykhin
14e49956f7 Show only default label templates when feature is disabled [SCI-9028] 2023-08-17 13:44:22 +02:00
Martin Artnik
8d31c5eb3b Merge branch 'develop' into features/ove-integration 2023-08-16 10:41:26 +02:00
Oleksii Kriuchykhin
5332cbc788 Pass user by id instead of serialized object for deleyed jobs [SCI-9053] 2023-08-11 15:31:29 +02:00
Anton
6e5fa5ccd7 Add create actions [SCI-8953] 2023-08-11 15:04:49 +02:00
Martin Artnik
11fb166a0c Migration fix, additional endpoints, cleanup [SCI-8947] 2023-08-07 16:09:15 +02:00
Alex Kriuchykhin
4299cce08b Migrate results to the new data model with ResultOrderableElements [SCI-8878] (#5869) 2023-08-07 16:07:20 +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
ajugo
9a55889264
Merge pull request #5919 from okriuchykhin/ok_SCI_8974
Fix file URL generation on shared task page [SCI-8974]
2023-08-07 08:56:05 +02:00
Oleksii Kriuchykhin
c61a075818 Fix file URL generation on shared task page [SCI-8974] 2023-08-04 15:09:59 +02:00
Alex Kriuchykhin
b365553a14
Merge pull request #5917 from scinote-eln/features/august-release
Merge features/august release to develop
2023-08-04 14:01:44 +02:00
ajugo
7a6886b895
Fix rendering of RTE images for shareable links [SCI-8970] (#5913) 2023-08-04 11:24:27 +02:00
wandji
31f8bc19d5
Add unique database index to checklist items position (#5886)
* Add unique database index to checklist items position and update errors to render flash message when a checklist item validation fails [SCI-8841]

* Improve protocol checklist item reordering [SCI-8841]

* Add act as list to gemfile and use sequential updates for reodering with act_as_list [SCI-8841]
2023-08-02 15:37:01 +02:00
Martin Artnik
76a0f433cd Basic OVE editor implementation [SCI-8929] 2023-08-02 14:13:04 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications 2023-08-02 13:40:06 +02:00
Alex Kriuchykhin
4a563d3456
Implement loading settings from both, database and env variables [SCI-8813] (#5885) 2023-08-01 10:44:27 +02:00
ajugo
e71d5805ca
Refactored settings for Label templates feature and Zebra printing [SCI-8918] (#5895)
* Refactored settings for Label templates feature and Zebra printing [SCI-8918]

* Add check for label template [SCI-8918]
2023-08-01 10:30:57 +02:00
Ivan Kljun
18fb319351 Drop system notifications tables and remove logic 2023-07-25 14:48:03 +02:00
Oleksii Kriuchykhin
de69b1b100 Merge branch 'develop' into features/shareable-links 2023-07-25 09:47:47 +02:00
Alex Kriuchykhin
9d336423ab
Fix projects exports with tables [SCI-8827] (#5840) 2023-07-21 16:44:03 +02:00
Alex Kriuchykhin
7cb8feefb9
Fix permission checking in WOPI controller [SCI-8856] (#5833) 2023-07-21 11:53:10 +02:00
Soufiane
c12023f8aa
Remove user_team model and related code [SCI-8815] (#5815) 2023-07-20 10:57:29 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Andrej
2a5f55aed8 Fix result table rendering in reports [SCI-8897] 2023-07-19 11:53:47 +02:00
Soufiane
3775727857
Fix project export issue [SCI-8827] (#5767) 2023-07-17 15:33:02 +02:00
Oleksii Kriuchykhin
a95aab85e2 Merge branch 'develop' into features/shareable-links 2023-07-13 15:04:27 +02:00
Oleksii Kriuchykhin
fca9aea4a8 Merge branch 'features/rails-upgrade' into develop 2023-07-13 13:10:59 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Soufiane
6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758)
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
2023-07-12 15:42:34 +02:00
artoscinote
5bcf31ed2e
Fix activity filter loading via URL params [SCI-7537] (#5737) 2023-07-10 13:59:15 +02:00
ajugo
836d1b6be1
Add permissions for shareable links and some fixes for controller [SCI-8747] (#5709)
Add permissions for shareable links and som fixes for controller [SCI-8747]
2023-07-05 16:21:26 +02:00
Alex Kriuchykhin
b7e04972e1
Implement model and controller for shareable links, update team model [SCI-8648] (#5693) 2023-07-03 15:54:11 +02:00
Soufiane
9d70d35491
Implement share button on task [SCI-8650] (#5691)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-29 13:38:59 +02:00
ajugo
563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Oleksii Kriuchykhin
e5fe82a297 Fix file name of inventory export, add archived columns to exports [SCI-8760] 2023-06-28 10:22:26 +02:00
Martin Artnik
d1302d322b Fix zip export [SCI-8734] 2023-06-23 11:18:16 +02:00
artoscinote
3658a224b2
Merge pull request #5650 from okriuchykhin/ok_SCI_8718
Limit execution time of file text extraction jobs to 5 minutes [SCI-8718]
2023-06-23 09:55:52 +02:00
Oleksii Kriuchykhin
e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Oleksii Kriuchykhin
f44e339c7f Limit execution time of file text extraction jobs to 5 minutes [SCI-8718] 2023-06-22 11:39:10 +02:00
Oleksii Kriuchykhin
66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
artoscinote
91ee51105c
Merge pull request #5574 from G-Chubinidze/gc_SCI-8218
"i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218]
2023-06-16 11:34:59 +02:00
Giga Chubinidze
f05ddac07d fixed syntax error 2023-06-16 13:32:39 +04:00
Giga Chubinidze
67b7c8fe07 updated logic 2023-06-16 12:49:05 +04:00
Soufiane
2e16302812
Team admin can see all projects in Navigator [SCI-8549] [SCI-8381] (#5575)
Disable project links if team admin is missing read permission [SCI-8381]
2023-06-12 12:55:32 +02:00
Alex Kriuchykhin
f0c2624179
Implement inventories export backend logic [SCI-8444] (#5578) 2023-06-12 10:29:17 +02:00
Giga Chubinidze
95437c69a4 included name 2023-06-08 12:54:01 +04:00
Giga Chubinidze
aa5caf3cc3 refactor 2023-06-08 11:54:59 +04:00
Alex Kriuchykhin
98e1962372
Fix viewable_by_user method for Step [SCI-8625] (#5569) 2023-06-06 15:29:58 +02:00
Alex Kriuchykhin
eacf2c0c23
Use correct permissions in repository row assigning filters [SCI-8616] (#5565) 2023-06-06 13:53:12 +02:00
ajugo
e8501e0754
Add well plates to project export report [SCI-8605] (#5552) 2023-06-02 18:56:52 +02:00
Alex Kriuchykhin
a0616adf17
Improve speed of protocol templates table loading [SCI-8553] (#5509) 2023-05-30 12:41:53 +02:00
Alex Kriuchykhin
1a430a77fd
Add filtering option for active/archived PET listing API endpoints, add linked tasks to protocol serializer [SCI-7091] (#4381) 2023-05-19 11:34:31 +02: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
Oleksii Kriuchykhin
f8f3fd8c5e Remove Tika server mode, update version [SCI-8367] 2023-05-17 13:44:40 +02:00
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
ajugo
74516da01a
Update reports for plate templates and add headers to docx tables [SCI-8375] (#5373)
Update reports for plate templates and add headers to docx tables [SCI-8375]
2023-05-10 16:15:14 +02:00
Alex Kriuchykhin
ab318df1af
Update permissions for team owner to see all protocols and can manage users [SCI-8380] (#5371) 2023-05-09 16:23:29 +02:00
Martin Artnik
cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +02:00
ajugo
a288708368
Add API endpoint for protocol templates [SCI-7456] (#5321)
* Add API endpoint for protocol templates [SCI-7456]

* Create protocol template api serializer [SCI-7456]
2023-05-03 15:55:36 +02:00
Soufiane
32c483316f
Enable searching by ID when smart annotating [SCI-7944] (#5055)
Add objects search by ID in smart annotations [SCI-7944]
2023-05-03 11:05:29 +02:00
Anton
cb6b2c3855 Add backend for navigator [SCI-8233] 2023-04-24 12:25:56 +02:00
Alex Kriuchykhin
9e058af0a3
Fix default public user role assignment for projects [SCI-7969] (#5334) 2023-04-21 11:58:34 +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
Soufiane
5e321b761d
Enable support of files larger than 4GB in zip [SCI-8267] (#5278)
Update rubyzip gem to the latest version and enable support for large files [SCI-8267]
2023-04-11 11:36:27 +02:00
ajugo
9f1b60eda4
Fix changing public protocol role for old protocols [SCI-8275] (#5270) 2023-04-07 13:25:25 +02:00
artoscinote
890687052b
Fix permission team scoping in API [SCI-8265] (#5261) 2023-04-06 15:26:39 +02:00
Oleksii Kriuchykhin
60579465ab Refactor user_notifications controller, remove unused code [SCI-8207] 2023-04-06 14:57:00 +02:00
Martin Artnik
1e464d7861 Remove unused assignment clone method [SCI-8263] 2023-04-04 15:39:10 +02:00
artoscinote
df21102215
Merge pull request #5254 from artoscinote/ma_SCI_8263
Clear user assignments when duplicating protocol [SCI-8263]
2023-04-04 15:23:15 +02:00
Martin Artnik
e26ed3d852 Clear user assignments when duplicating protocol [SCI-8263] 2023-04-04 14:09:52 +02:00
artoscinote
42a6f258a4
Merge pull request #5252 from okriuchykhin/ok_SCI_8199
Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199]
2023-04-04 14:02:59 +02:00
aignatov-bio
a17a893daf
TinyMCE after image parsing strip description [SCI-8258] (#5253) 2023-04-04 13:52:35 +02:00
Oleksii Kriuchykhin
a70d8dea74 Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199] 2023-04-04 13:42:20 +02:00
Alex Kriuchykhin
ed9f3d49d4
Merge pull request #5248 from artoscinote/ma_SCI_8259
Properly copy visibility and public assignments when cloning protocol [SCI-8259]
2023-04-04 11:31:21 +02:00
ajugo
cd2a1be9e0
Fix linked protocol without linked_at [SCI-8255] (#5249) 2023-04-04 11:25:02 +02:00
Martin Artnik
ec0657b7b9 Properly copy visibility and public assignments when cloning protocol [SCI-8259] 2023-04-04 11:20:38 +02:00
Oleksii Kriuchykhin
c937122b2f Transfer protocol linked_at timestamp when cloning tasks [SCI-8256] 2023-04-04 10:42:52 +02:00
Alex Kriuchykhin
bed256cd37
Merge pull request #5231 from artoscinote/ma_SCI_8131
Handle removal of last owner public group [SCI-8131]
2023-04-03 13:02:38 +02:00
Martin Artnik
132593c854 Prevent removal of last manually assigned user manager [SCI-8131] 2023-04-03 11:46:32 +02:00
sboursen-scinote
a1c1b6e5a7 Refactor the solution [SCI-8227]
Co-Author okriuchykhin <oleksii@scinote.net>
2023-03-31 17:39:17 +02:00
sboursen-scinote
aa75782766 Fix hound [SCI-8227] 2023-03-31 16:56:12 +02:00
sboursen-scinote
021913d6a8 Fix hound [SCI-8227] 2023-03-31 16:54:52 +02:00
sboursen-scinote
9b8db8befd FIX: Duplicated task with linked protocol loses template loaded timestamp [SCI-8227] 2023-03-31 16:49:40 +02:00
ajugo
f535bc1fa0
Fix protocol counter on my statistics [SCI-8240] (#5228) 2023-03-31 10:01:58 +02:00
Alex Kriuchykhin
f5b43f248f
Merge pull request #5205 from artoscinote/ma_SCI_8200
Update public user assignments on public role change [SCI-8200]
2023-03-27 13:13:09 +02:00
Alex Kriuchykhin
3d8717e994
Merge pull request #5186 from okriuchykhin/ok_SCI_8177
Improve error handling in protocol archive/restore actions [SCI-8177]
2023-03-27 13:11:11 +02:00
Martin Artnik
efcda1e057 Update public user assignments on public role change [SCI-8200] 2023-03-27 13:11:00 +02:00
Alex Kriuchykhin
69445f26e8
Merge pull request #5203 from okriuchykhin/ok_SCI_6931
Update protocols migration for linked protocols [SCI-6931]
2023-03-27 11:45:43 +02:00
Oleksii Kriuchykhin
9885dc0f29 Update protocols migration for linked protocols [SCI-6931] 2023-03-27 11:39:09 +02:00
Alex Kriuchykhin
678d51692e
Merge pull request #5194 from artoscinote/ma_SCI_8131
Prevent removing/changing role for last user with user manage permission on protocol [SCI-8131]
2023-03-24 13:58:57 +01:00
Martin Artnik
b1cce70cc6 Preven removing last user manager for protocols/projects [SCI-8131] 2023-03-24 13:32:38 +01:00
artoscinote
00191e41de
Merge pull request #5192 from scinote-eln/features/token-revocation
Features/token revocation
2023-03-24 11:13:38 +01:00
Oleksii Kriuchykhin
f2c8f67791 Improve error handling in protocol archive/restore actions [SCI-8177] 2023-03-23 15:32:22 +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
aignatov-bio
5844fce23e
Merge pull request #5156 from aignatov-bio/ai-sci-8154-cleanup-old-protocol-code
Clean old protocol code [SCI-8154]
2023-03-17 11:26:41 +01:00
Anton
248b6b6581 Remove additional code 2023-03-17 11:11:59 +01:00
Alex Kriuchykhin
4dd5cb5de4
Adapt global search for new protocol versioning [SCI-8080] (#5158) 2023-03-17 10:43:50 +01:00
aignatov-bio
9a3b056d32
Fix access modal for protocol [SCI-8063] (#5128) 2023-03-14 14:49:11 +01:00
Alex Kriuchykhin
d285a0a9db
Preserve old protocol types for backward compatibility, fix protocol draft user permissions [SCI-8083] (#5123) 2023-03-13 09:55:53 +01:00
Anton
ca5f61a0e2 Add all team members through access modal [SCI-8063] 2023-03-09 14:13:01 +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
Martin Artnik
69dbc036de Display ID of original protocol in linked protocol info [SCI-8106] 2023-03-08 15:48:03 +01:00
Alex Kriuchykhin
f8a4e7ee65
Update logic for linked protocol templates with task [SCI-7973] (#5058) 2023-03-07 13:03:01 +01:00
Alex Kriuchykhin
8956d72f12
Switch to showing of total sum of all versions in protocols table [SCI-8066] (#5082) 2023-03-07 09:58:36 +01:00
artoscinote
b2cf5548f6
Merge pull request #5071 from artoscinote/ma_SCI_8060
Ensure user assignments stay in sync with protocol versions [SCI-8060]
2023-03-06 16:12:05 +01:00
Martin Artnik
cfcb80f642 Fix assignment sync to new protocol drafts and deletion [SCI-8060] 2023-03-06 16:06:38 +01:00
ajugo
9379d9a175
Fix load protocol to task [SCI-8072] (#5070) 2023-03-06 10:53:01 +01:00
aignatov-bio
d99957d8a1
Merge branch 'features/protocol_versioning' into ai-sci-8021-fix-modifier-name-for-drafts 2023-03-03 20:50:46 +01:00
Anton
b4b5b70331 Fix draft creation [SCI-8075] 2023-03-03 15:51:36 +01:00
Martin Artnik
73ed75a73a Ensure user assignments stay in sync with protocol versions [SCI-8060] 2023-03-03 13:20:15 +01:00
Alex Kriuchykhin
4fb18a8018
Fix save as draft action [SCI-8068] (#5066) 2023-03-02 16:10:28 +01:00
ajugo
ed90c912f6
Add description to cloned protocol template from protocol [SCI-8053] (#5063) 2023-03-02 15:35:18 +01:00
aignatov-bio
25644ab5a3
Fix version number for draft created from old versions [SCI-8023] (#5040) 2023-03-02 14:34:14 +01:00
ajugo
3bdc8feaee
Fix protocol name field editability [SCI-8033] (#5053) 2023-03-02 13:50:47 +01:00
Alex Kriuchykhin
420b07440d
Fix inventory copying for shared inventories [SCI-7998] (#5025) 2023-03-01 17:22:53 +01:00
Anton
4eab2c25f3 Save last_modified_by on protocol update [SCI-8021] 2023-03-01 15:19:34 +01:00
Alex Kriuchykhin
9908b31d11
Fix protocols datatable [SCI-7984] (#5046) 2023-03-01 15:04:53 +01:00
ajugo
b24c823597
Add linked_at to the Protocols [SCI-7964] (#5042)
* Add linked_at to the Protocols [SCI-7964]

* Add activity subject_type constrain for migration query [SCI-7964]
2023-03-01 11:33:32 +01:00
Andrej
64da4c5368 Fix connected device model for request without device id [SCI-7972] 2023-02-28 16:42:56 +01:00
Anton
6c7a0d85c2 Fix protocol public assignments [SCI-8019] 2023-02-28 15:15:55 +01:00
ajugo
96cf2f1d38
Update protocol templates update action on task [SCI-7903] (#5009)
* Update protocol templates update action on task [SCI-7903]

* Simplify logic for update from parent [SCI-7903]
2023-02-28 14:17:34 +01:00
artoscinote
e88b84000b
Merge pull request #5021 from artoscinote/ma_SCI_7978
Protocol permission modal changes [SCI-7978]
2023-02-27 13:34:32 +01:00
Anton
9abc8489a6 Propagate archived/flag to versions [SCI-8004] 2023-02-27 11:12:40 +01:00
ajugo
95d04d11d2
Fix validation for multiple parent protocols for drafts [SCI-7994] (#5020)
* Fix validation for multiple parent protocols for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]

* Fix validation for drafts [SCI-7994]
2023-02-24 17:56:51 +01:00
Martin Artnik
7357782144 Protocol validation fix [SCI-7978] 2023-02-24 17:28:36 +01:00
Anton
60cda9b6f2 Fix version number for draft [SCI-7989] 2023-02-24 15:32:10 +01:00
Alex Kriuchykhin
b2ab467440
Improve loading time of current tasks widget [SCI-7999] (#5022)
* Improve loading time of current tasks widget [SCI-7999]

* Improve speed of objects search for smart annotations editor [SCI-7999]
2023-02-24 13:30:55 +01:00
Anton
dd27b13537 Fix protocol name validation [SCI-8003] 2023-02-24 10:15:23 +01:00
Martin Artnik
c24b0fa5ab Refactor access modals [SCI-7978] 2023-02-23 14:57:38 +01:00
Martin Artnik
b0fc97a549 Fix assignable for top level assignables [SCI-7978] 2023-02-22 15:37:39 +01:00
Anton
826cb162da Add save as draft action 2023-02-22 14:59:48 +01:00
Anton
a95ca75362 Add new protocol modal [SCI-7810] 2023-02-21 14:15:53 +01:00
ajugo
166208f186
Update i flyouts of protocols (task screen) [SCI-7861] (#5003) 2023-02-21 13:44:26 +01:00
ajugo
2c079cc918
Update protocol duplication [SCI-7900] (#4992) 2023-02-18 09:09:33 +01:00
aignatov-bio
c92faeb48c
Merge pull request #4987 from aignatov-bio/ai-sci-7948-fix-cell-allignment-step-tables
Add step table metadata during import/export and copy [SCI-7948]
2023-02-18 08:44:37 +01:00
artoscinote
e5139b4bd2
Merge pull request #4986 from artoscinote/ma_SCI_7940
Improve file extension detection for pasted images [SCI-7940]
2023-02-17 14:59:34 +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
Anton
df8579d52f Add step table metadata during import/export and copy [SCI-7948] 2023-02-17 14:50:45 +01:00
Martin Artnik
cfdcffc85a Improve file extension detection for pasted images [SCI-7940] 2023-02-17 12:14:08 +01:00
Martin Artnik
43f6a8e66f Fix table of contents, add image download tooltip [SCI-7937] 2023-02-17 10:36:47 +01:00
ajugo
9a57071d7a
Update restore action for protocol templates [SCI-7634] (#4969)
* Update restore action for protocol templetes [SCI-7634]

* Move protocol table reload to methond [SCI-7634]
2023-02-16 18:03:11 +01:00
Alex Kriuchykhin
7f8f723cbe
Fix handling of ISS in Azure configuration, fix linked accounts page [SCI-7923] (#4974) 2023-02-14 16:50:15 +01:00
Anton
ea9d2d8291 Merge branch 'develop' into features/protocol_versioning 2023-02-14 11:07:58 +01:00
Alex Kriuchykhin
b71f360261
Add visibility and default public user role fields to protocols [SCI-7819] (#4963) 2023-02-13 16:18:26 +01:00
Martin Artnik
8d434c7be4 Fix base64 image extraction for non-saved models [SCI-7918] 2023-02-13 16:03:58 +01:00
Anton
dc5cfb9fc3 Add publish and delete action [SCI-7905] 2023-02-13 14:45:22 +01:00
Martin Artnik
f880ea46ce Add connected device logging [SCI-7632] 2023-02-13 11:32:18 +01:00
Anton
b55f68c0dc Update archive action for protocol templates [SCI-7898] 2023-02-09 14:10:07 +01:00
Martin Artnik
ae7fce446b Don't touch steps when commenting [SCI-7584] 2023-02-02 16:28:23 +01:00
Alex Kriuchykhin
dadb2fdf06
Merge pull request #4909 from okriuchykhin/ok_SCI_7816
Fix date time inventories reminder processing [SCI-7816]
2023-02-01 16:26:54 +01:00
Oleksii Kriuchykhin
fa96a9a939 Fix date time inventories reminder processing [SCI-7816] 2023-01-30 17:07:27 +01:00
Alex Kriuchykhin
02da980ab8
Fix task protocol editing with empty description [SCI-7823] (#4897) 2023-01-27 14:15:09 +01:00
Alex Kriuchykhin
00d99ee296
Fix user assigning to teams with existing team sharing records [SCI-7720] (#4879) 2023-01-24 15:47:53 +01:00
Martin Artnik
0a768fbfa3 Fix pasting same image multiple times [SCI-7803] 2023-01-24 11:52:20 +01:00
aignatov-bio
a72de2800f
Merge pull request #4871 from aignatov-bio/ai-sci-7619-refactor-access-modals-pet
Refactor access modals P/E/T [SCI-7619]
2023-01-24 10:14:40 +01:00
artoscinote
d319f9bf89
Fix copying multiple TinyMCE images [SCI-7803] (#4875) 2023-01-24 10:11:52 +01:00
Alex Kriuchykhin
b3267d7934
Fix multiple inventory reminders issues [SCI-7805][SCI-7808][SCI-7809] (#4876) 2023-01-24 09:36:13 +01:00
Anton
37eb902b25 Refactor access modals P/E/T [SCI-7619] 2023-01-22 22:23:18 +01:00
Alex Kriuchykhin
7f3999fa4f
Add protocol published versions modal [SCI-7519] (#4725) 2023-01-20 14:29:25 +01:00
G-Chubinidze
913cd26e70
Update of sharing options to all teams is not saved [SCI-7421] (#4852)
* Update of sharing options to all teams is not saved
2023-01-20 14:14:34 +01:00
Martin Artnik
fb4cbad4e8 Add tinymce image permission checks [SCI-7788] 2023-01-20 10:45:56 +01:00
Martin Artnik
6bddd6c716 Fix text result creation [SCI-7778] 2023-01-19 08:58:05 +01:00
Alex Kriuchykhin
1ac86b8188
Merge pull request #4832 from okriuchykhin/ok_SCI_7638
Improve loading speed of inventory table [SCI-7638]
2023-01-18 11:39:52 +01:00
Oleksii Kriuchykhin
e51cf28ec6 Improve loading speed of inventory table [SCI-7638] 2023-01-18 11:10:43 +01:00
Alex Kriuchykhin
f455b8fb32
Merge pull request #4784 from okriuchykhin/ok_SCI_7703
Improve handling of db locks [SCI-7703]
2023-01-18 10:24:52 +01:00
Oleksii Kriuchykhin
3a85cdde0a Improve handling of db locks [SCI-7703] 2023-01-17 17:30:20 +01:00
Martin Artnik
5f7976ce0e Fix copying and pasting TinyMCE images [SCI-7774] 2023-01-17 14:32:25 +01:00
Martin Artnik
76025a4883 Properly assign team to tinymce asset when extracting base64 images [SCI-5098] 2023-01-17 10:49:08 +01:00
Martin Artnik
db76272602 Fix extraction of TinyMCE images [SCI-5098] 2023-01-16 16:35:36 +01:00
Martin Artnik
7cb639524b Fix parsing of RTE images [SCI-5098] 2023-01-16 16:07:14 +01:00
Martin Artnik
a043bf2cd3 Fix tinymce images for blank texts [SCI-5098] 2023-01-16 12:00:00 +01:00
Martin Artnik
a513951a7c Fix legacy tinymce step issues [SCI-5098] 2023-01-16 10:58:37 +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
Martin Artnik
4df203bd13 Fix touching of protocol when changes happen [SCI-7584] 2023-01-12 16:18:31 +01:00
Martin Artnik
662b9174fa Extract pasted base64 images from RTE texts [SCI-5098] 2023-01-12 13:24:31 +01:00
ajugo
67dcbb0fa6
Open the correct experiment view [SCI-7662][SCI-7741] (#4798)
* Fix experiment view loading [SCI-7662]

* Fix experiment view loading [SCI-7662]
2023-01-12 11:31:04 +01:00
ajugo
99d190f0d6
Fix tiny_mce image duplication [SCI-7727] (#4788) 2023-01-10 11:18:56 +01:00
ajugo
ef8b8344fd
Saving selected experiment view [SCI-7662] (#4779) 2023-01-10 11:08:49 +01:00
ajugo
92e044dfd3
Fix locked task duplication [SCI-7682] (#4773) 2023-01-09 09:52:34 +01:00
artoscinote
710a97a50e
Merge pull request #4751 from artoscinote/ma_SCI_7596
Don't touch result when comment is created [SCI-7596]
2023-01-04 13:14:07 +01:00
Martin Artnik
7460cc5b82 Don't touch result when comment is created [SCI-7596] 2023-01-04 12:55:32 +01:00
Martin Artnik
15543d5222 Do not touch protocol if step or checklist is checked [SCI-7584] 2023-01-04 12:33:11 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic 2023-01-04 10:08:38 +01:00
Anton
9c488d5a0c Add new access user modal [SCI-7518] 2023-01-03 14:43:03 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views 2022-12-22 13:33:25 +01:00
Anton
d1a68adb22 Add access modal for protocols [SCI-7518] 2022-12-22 13:27:46 +01:00
Oleksii Kriuchykhin
72f1cf2704 Fix viewer permissions for inventories [SCI-7422] 2022-12-20 13:26:38 +01:00
Oleksii Kriuchykhin
5fea4722ac Add versions and access columns to protocols table, update protocol model [SCI-7516] 2022-12-19 15:39:32 +01:00