Alex Kriuchykhin
9e9f8ab402
Add external_id field to repository list and checklist items [SCI-9454] ( #6702 )
2023-11-24 14:21:11 +01:00
Oleksii Kriuchykhin
01219f09eb
Merge branch 'develop' into features/inventory-items-relationships
2023-11-23 11:08:42 +01:00
Anton
0ec734b467
Merge branch 'develop' into features/notification-revamp
2023-11-23 10:05:42 +01:00
Alex Kriuchykhin
43b8f97126
Improve handling of unshared inventories and unassigned items for stock ledger records [SCI-9504] ( #6565 )
2023-11-20 13:24:31 +01:00
Oleksii Kriuchykhin
e8abbbbcdf
Merge branch 'develop' into features/inventory-items-relationships
2023-11-16 11:04:27 +01:00
Oleksii Kriuchykhin
3bc7edc7f7
Merge branch 'develop' into features/inventory-item-card-edit
2023-11-15 10:58:42 +01:00
Oleksii Kriuchykhin
fdb4e93e16
Merge branch 'features/inventory-item-card-edit' into features/inventory-items-relationships
2023-11-14 15:28:57 +01:00
wandji
73cb2528c8
Add repository_row_connection controller and actions [SCI-9672] ( #6633 )
...
* Add repository_row_connection controller and actions [SCI-9672]
2023-11-14 14:02:26 +01:00
Martin Artnik
57d5d03718
Merge branch 'develop' into features/asset-sync
2023-11-14 09:41:42 +01:00
ajugo
5878ed0c7c
Fix unit test [SCI-9570] ( #6552 )
2023-11-13 09:34:38 +01:00
Martin Artnik
cc5bbcde2f
Fix results search [SCI-9596]
2023-11-10 15:44:27 +01:00
Oleksii Kriuchykhin
0b72740062
Merge branch 'develop' into features/inventory-items-relationships
2023-11-10 09:19:45 +01:00
Ivan Kljun
4481541a9f
Implement repository date reminder notification [SCI-9561]
2023-11-07 11:36:23 +01:00
Giga Chubinidze
e7958ed40c
hound fix
2023-11-03 13:14:10 +04:00
Giga Chubinidze
370a0ecad5
logic / migration updates
2023-11-03 13:09:48 +04:00
Martin Artnik
f015c8c56e
Create a copy of the synced file in case of conflict [SCI-9640]
2023-11-03 09:46:05 +01:00
Martin Artnik
3a3d62a1be
Merge branch 'develop' into features/asset-sync
2023-11-02 11:28:17 +01:00
Giga Chubinidze
dd2a4a4047
Implement Task Due Date Reminder notification [SCI-9562]
2023-11-02 07:07:35 +04:00
Alex Kriuchykhin
d3ba70c2bf
Fix file previews in project exports [SCI-9619] ( #6548 )
2023-10-30 17:28:53 +01:00
Martin Artnik
6308779668
Merge branch 'develop' into features/notification-revamp
2023-10-27 12:04:07 +02:00
Martin Artnik
7376b363a8
Asset sync model and endpoints [SCI-9465] ( #6399 )
2023-10-25 09:30:42 +02:00
Martin Artnik
a952f3ba70
Implement low stock notification [SCI-9522]
2023-10-19 11:33:40 +02:00
Anton
db3f217bba
Implement acitvity notifications
...
[SCI-9512]
2023-10-17 14:59:50 +02:00
ajugo
9f1c668a10
Fix result assets download for shareable links [SCI-9542] ( #6460 )
2023-10-17 11:35:16 +02:00
Anton
16b5df353f
Refactor user settings page [SCI-9513]
2023-10-16 09:41:37 +02:00
Martin Artnik
1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements
2023-10-13 14:55:16 +02:00
Anton
2434cca42c
Clean notification model [SCI-9384]
2023-10-12 11:47:29 +02:00
Anton
726ff5e238
Remove old notification extends [SCI-9384]
2023-10-12 11:38:19 +02:00
Anton
0ad8b9f978
Migrate to noticed gem [SCI-9384]
2023-10-11 14:03:59 +02:00
Andrej
79118effa7
Merge branch 'develop' into features/october-release
2023-10-10 11:09:04 +02:00
Martin Artnik
763ede050d
Merge pull request #6392 from ivanscinote/SCI-9430-move-result-does-not-work
...
Fix moving result elements [SCI-9430]
2023-10-09 15:11:30 +02:00
Ivan Kljun
7c0e8221c1
Fix moving result elements [SCI-9430]
2023-10-09 14:54:22 +02:00
Alex Kriuchykhin
efa0149c9f
Merge pull request #6386 from rekonder/aj_SCI_9484
...
Fix unsharing of repository rows [SCI-9484]
2023-10-09 11:06:23 +02:00
Andrej
30295a313b
Fix unsharing of repository rows [SCI-9484]
2023-10-09 11:05:33 +02:00
Ivan Kljun
879b03ad3d
Fix pdf reports [SCI-9464]
2023-10-09 10:49:07 +02:00
wandji20
6358ad2da4
Fix issue with protocol and result text name [SCI-9420]
2023-10-05 08:08:49 +01:00
Ivan Kljun
b4faefdb23
Set sequential_updates to true for acts_as_list for result orderable [SCI-9430]
2023-10-04 13:59:23 +02:00
Ivan Kljun
2919516bca
Fix moving result elements bug [SCI-9430]
2023-10-04 13:37:00 +02:00
Oleksii Kriuchykhin
d9404df361
Use custom sanitizer config for PDF reports generation [SCI-9368]
2023-10-03 09:39:47 +02:00
Martin Artnik
295de7b0bc
Implement default name for results [SCI-9425]
2023-09-29 13:01:41 +02:00
Andrej
1aa9b17b1a
Add relationship column to the inventory [SCI-9356]
2023-09-26 11:12:45 +02:00
Oleksii Kriuchykhin
fe5848ad7c
Add new inventory rows connection model, add connections counter caches to rows [SCI-9363]
2023-09-25 11:24:50 +02:00
Anton
01e4ab3cd5
Removed variable
2023-09-22 12:07:56 +02:00
Anton
566705cb67
Small fixes [SCI-9340]
2023-09-22 10:07:29 +02:00
Anton
77948572f1
Refactor checklist [SCI-9340]
2023-09-22 08:36:37 +02:00
Martin Artnik
18072bbde7
Fix update of database settings values [SCI-9240]
2023-09-15 11:04:13 +02:00
Martin Artnik
160d9775d8
Merge branch 'develop' into features/september-release
2023-09-15 10:40:55 +02:00
Oleksii Kriuchykhin
45e9a459d7
Fix user and team activities filters [SCI-9287]
2023-09-14 14:22:01 +02:00
Anton
af0fbfeec0
Merge branch 'develop' into features/september-release
2023-09-14 13:45:40 +02:00
Alex Kriuchykhin
d08c2d8bb0
Merge pull request #6101 from okriuchykhin/ok_SCI_9148
...
Hide from annotations projects where user is not assigned [SCI-9148]
2023-09-14 10:57:34 +02:00
Oleksii Kriuchykhin
c649ad26f3
Hide from annotations projects where user is not assigned [SCI-9148]
2023-09-14 10:54:56 +02:00
Alex Kriuchykhin
fae428e305
Fix OVE file preview from imported .eln [SCI-9263] ( #6200 )
2023-09-13 15:00:52 +02:00
Martin Artnik
520f978f35
Fix update of database settings values [SCI-9240] ( #6174 )
2023-09-08 14:45:39 +02:00
Alex Kriuchykhin
d8965e8ef9
Refactor old export async methods to ActiveJobs [SCI-9092] ( #6170 )
2023-09-08 11:35:16 +02:00
Martin Artnik
4abc2288b3
Merge pull request #6163 from artoscinote/ma_SCI_9244
...
Fix global search to work with new results [SCI-9244]
2023-09-07 14:17:06 +02:00
wandji
a59f94c5a9
Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023] ( #6092 )
...
* Add RepositoryStockValueZipExport service and connect export consumption button [SCI-9023]
* Add consumption export modal and improve report generation [SCI-9023]
* Add repository_row association to repository_ledger_records [SCI-9023]
2023-09-07 13:12:27 +02:00
Martin Artnik
bf7b1c2f2a
Fix global search to work with new results [SCI-9244]
2023-09-07 11:43:45 +02:00
wandji
a25e6fdda3
Add sorting options to experiment task table view [SCI-9120] ( #6102 )
2023-09-06 16:14:17 +02:00
Gregor Lasnibat
f172c97a79
Fix missing OVE file preview [SCI-9214]
2023-09-06 12:45:42 +02:00
aignatov-bio
c33243b962
Merge pull request #6126 from aignatov-bio/ai-sci-9141-add-title-to-tinymce-fields
...
Add title to text component [SCI-9141]
2023-09-05 14:32:42 +02:00
Ivan Kljun
56744e2dcd
Use act_as_list for reordering result elements, localize title for result reordering modal [SCI-9182]
2023-09-05 11:02:39 +02:00
Anton
86f413cc71
Add title to text component [SCI-9141]
2023-09-04 14:13:29 +02:00
Martin Artnik
3724a4a067
Merge branch 'develop' into features/september-release
2023-09-01 10:30:48 +02:00
artoscinote
19026b936d
Merge pull request #6117 from artoscinote/ma_SCI_9180
...
Fix result assets when duplicating [SCI-9180]
2023-08-31 16:00:50 +02:00
Oleksii Kriuchykhin
b4eb4d38e6
Merge branch 'develop' into features/ove-integration
2023-08-31 15:52:38 +02:00
Martin Artnik
65e55acc06
Fix result assets when duplicating [SCI-9180]
2023-08-31 15:38:56 +02:00
Alex Kriuchykhin
d63ec9f927
Fix shareable links association on user model [SCI-9200] ( #6114 )
2023-08-31 11:48:35 +02:00
Martin Artnik
8245ad9738
Fix up result element duplicate endpoints [SCI-9107]
2023-08-30 14:54:38 +02:00
artoscinote
953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors
...
Update 'Not started' status color at reports [SCI-9007]
2023-08-28 09:56:25 +02:00
Ivan Kljun
90199d3590
Add method light_color? to my_module_status [SCI-9007]
2023-08-25 15:47:34 +02:00
Martin Artnik
0faad52f6c
Merge branch 'hotfix/1.28.0.1' into develop
2023-08-24 12:14:30 +02:00
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
