Giga Chubinidze
3c588709be
changed logic
2023-08-21 06:48:08 +04:00
Anton
37e1c46152
Hide result title in docx [SCI-9062]
2023-08-18 11:35:24 +02:00
Ivan Kljun
ca35e13893
Merge remote-tracking branch 'upstream/features/september-release' into SCI-8925-show-paragraphs-checklist
2023-08-18 11:12:49 +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
450f5df8ea
Allow export of archived inventories [SCI-9060]
2023-08-17 11:20:26 +02:00
Oleksii Kriuchykhin
5e29523c61
Fix calls of user assignment propagation jobs with optional assigned_by [SCI-9053]
2023-08-16 14:34:42 +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
Andrej
104a9d5c17
Implemented trial period for open vector editor [SCI-8962]
2023-08-10 08:58:49 +02:00
Anton
89c526103d
Merge branch 'develop' into features/remove-front-end-gems
2023-08-07 11:23:21 +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
Oleksii Kriuchykhin
b49b7c4a80
Merge branch 'develop' into features/shareable-links
2023-08-02 16:05:21 +02:00
Ivan Kljun
ac8149c458
Rename variable text_array to lines
2023-08-02 13:54:07 +02:00
ivanscinote
242df0632d
Merge branch 'features/august-release' into SCI-8807-notifications
2023-08-02 13:40:06 +02:00
Ivan Kljun
9a37b75001
Applied hound linter suggestions
2023-07-31 15:45:39 +02:00
Ivan Kljun
d9df37745f
Support paragraphs for checklist items in print protocol and pdf/docx report [SCI-8925]
2023-07-31 15:12:04 +02:00
ajugo
44c919d3dc
Implement shareable link task view [SCI-8752] ( #5843 )
...
* Implement shareable link task view [SCI-8752]
2023-07-26 15:19:32 +02:00
Martin Artnik
3978d9efef
Merge branch 'develop' into features/august-release
2023-07-26 11:22:49 +02:00
Ivan Kljun
18fb319351
Drop system notifications tables and remove logic
2023-07-25 14:48:03 +02:00
Alex Kriuchykhin
026e96652b
Fix team name escaping in inventories export modal [SCI-8922] ( #5859 )
2023-07-25 13:37:45 +02:00
Giga Chubinidze
d236cc9803
Replace old icons with new ones [SCI-8906]
2023-07-24 11:56:23 +04:00
Alex Kriuchykhin
8aa06bf4af
Fix generation of docx report, fix rendering of modals [SCI-8911] ( #5831 )
2023-07-20 16:46:16 +02:00
Soufiane
c12023f8aa
Remove user_team model and related code [SCI-8815] ( #5815 )
2023-07-20 10:57:29 +02:00
Giga Chubinidze
fac8945870
Update the native table calculations display in reports [SCI-8739]
2023-07-19 22:48:21 +04:00
Andrej
2a5f55aed8
Fix result table rendering in reports [SCI-8897]
2023-07-19 11:53:47 +02:00
Martin Artnik
5cc087835a
Merge branch 'develop' into features/august-release
2023-07-19 11:21:24 +02:00
Giga Chubinidze
e381651df2
added scope functionality
2023-07-19 10:31:14 +04:00
Anton
1087f67228
Merge branch 'develop' into features/remove-front-end-gems
2023-07-18 14:36:40 +02:00
artoscinote
ad4724ba04
Add salt to token JWT token payload [SCI-8854] ( #5791 )
2023-07-18 09:22:39 +02:00
ivanscinote
6300c1bef8
Fix smart annotations multiline display [SCI-8816] ( #5790 )
2023-07-17 16:20:49 +02:00
ivanscinote
527551068b
Fix smart annotations multiline display [SCI-8816] ( #5747 )
2023-07-14 12:31:33 +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
ajugo
632716e2cd
Remove task manage permission [SCI-8528] ( #5672 )
2023-07-11 09:29:17 +02:00
Alex Kriuchykhin
97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] ( #5728 )
2023-07-07 11:08:28 +02:00
Giga Chubinidze
e1ab7bda4b
Project card permission with not assigned team admin [SCI-8727]
2023-07-07 07:06:43 +04:00
Anton
4b82ba9613
Merge branch 'features/rails-upgrade' into features/remove-front-end-gems
2023-07-06 11:14:48 +02:00
Alex Kriuchykhin
5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] ( #5716 )
2023-07-05 12:43:23 +02:00
Anton
b956f9de25
Remove bootstrap form
2023-07-03 12:59:13 +02:00
Anton
3e3374c83d
Fix service module
2023-06-29 14:38:13 +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
sboursen-scinote
706c2e492b
Fix CSS and icon inconsistencies [SCI-8164][SCI-8726]
...
- Use the correct arrow-left/arrow-right icons.
- Show the tasks of active experiments in archived branch in the Navigator.
- Fix minor style issues in P/E/T.
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-26 15:22:36 +02:00
Andrej
0ea3a10d26
Fix default role assigning on projects create through the dashboard [SCI-8728]
2023-06-22 16:40:50 +02:00
Oleksii Kriuchykhin
66b361c689
Upgrade Rails to version 7.0.5 [SCI-8632]
2023-06-21 14:38:32 +02:00
aignatov-bio
e4076c931a
Merge pull request #5614 from aignatov-bio/ai-sci-8658-css-fixes
...
UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662]
2023-06-16 12:57:17 +02:00
Anton
289c92cb00
UX fixes [SCI-8658][SCI-8667][SCI-8668][SCI-8669][SCI-8672][SCI-8660][SCI-8662]
2023-06-16 12:38:09 +02:00
Soufiane
b254f5614b
Inventory export FE [SCI-6546] ( #5608 )
...
* Implement the front-end part of inventory export functionality [SCI-6546]
- Add the export button to the action toolbar
- Create new modal and link it to the export repository action
- Update the global export limit counter
* Remove load_repository and check_view_permission for export_repositories [SCI-6546]
2023-06-16 10:48:39 +02:00
Anton
d795f996f2
Merge branch 'develop' into features/ui-revamp
2023-06-14 15:18:50 +02:00
Martin Artnik
7dfbc960e3
Font fix + default label icon fix [SCI-8366]
2023-06-12 11:20:33 +02:00
Alex Kriuchykhin
f0c2624179
Implement inventories export backend logic [SCI-8444] ( #5578 )
2023-06-12 10:29:17 +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
Martin Artnik
ac661851e5
Disable edit action for label template viewer [SCI-8619]
2023-06-06 11:42:03 +02:00
ajugo
5694cfe3d0
Fix task name rendering on experiment view [SCI-8604] ( #5551 )
2023-06-02 17:16:39 +02:00
G-Chubinidze
43218900e4
Merge branch 'develop' into gc_SCI_8496
2023-05-29 13:27:18 +04:00
Martin Artnik
701834d7b9
Add read permission checks for protocols toolbar [SCI-8521]
2023-05-29 11:23:14 +02:00
ajugo
b1a891e310
Add assign item button to shared repository [SCI-8524] ( #5478 )
2023-05-25 15:46:58 +02:00
ajugo
1ea7f53e4b
Fix missing toolbar buttons for shared inventories [SCI-8481] ( #5481 )
2023-05-25 13:46:01 +02:00
G-Chubinidze
3ea85cb2ef
Remove old client_api code [SCI-8144] ( #5223 )
...
Remove obsolete client_api code
2023-05-24 12:45:31 +02:00
aignatov-bio
4a3520883b
Merge pull request #5416 from G-Chubinidze/gc_SCI_8299
...
Implement the bottom action toolbar - inventories [SCI-8299]
2023-05-24 12:06:47 +02:00
Giga Chubinidze
5cd32d5cfa
hound fix
2023-05-24 13:48:32 +04:00
Giga Chubinidze
379ef7a9cc
moved to develop, fixed pagination style
2023-05-24 11:57:06 +04:00
Giga Chubinidze
d43f10bc6a
'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496]
2023-05-23 22:21:34 +04:00
ajugo
040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] ( #5464 )
2023-05-23 15:29:14 +02:00
G-Chubinidze
165aa38247
'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496] ( #5445 )
2023-05-22 10:37:08 +02:00
Giga Chubinidze
bfc4ebe237
'Save PDF to inventory' uppercase word in the button & double modal [SCI-8496]
2023-05-22 10:55:10 +04:00
Martin Artnik
3499d6c6c5
Fix available actions for archived items [SCI-8489]
2023-05-18 11:46:44 +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
artoscinote
cabd6bbed5
Merge pull request #5423 from sboursen-scinote/sb_SCI-8252
...
Button in the toolbar for assigning items to task from the inventory [SCI-8252]
2023-05-18 09:59:49 +02:00
artoscinote
ef0bf65c19
Merge pull request #5424 from G-Chubinidze/gc_SCI_8302
...
Implement the bottom action toolbar - reports [SI-8302]
2023-05-18 09:44:53 +02:00
Giga Chubinidze
f161354f1b
Implement the bottom action toolbar - reports [SI-8302]
2023-05-18 00:42:16 +04:00
sboursen-scinote
16ccd9703f
Implement the assign to task button [SCI-8252]
2023-05-17 16:18:11 +02:00
Martin Artnik
eb5fb16b1b
Implement new toolbar for protocols [SCI-8399]
2023-05-17 14:12:40 +02:00
artoscinote
aeb84e18d0
Implement bottom action toolbar for repository items [SCI-8300]
...
Implement bottom action toolbar for repository items [SCI-8300]
2023-05-17 11:27:55 +02:00
Martin Artnik
503099e331
Added edit buttons, updates to wording [SCI-8301]
2023-05-16 12:27:28 +02:00
Martin Artnik
c8994573fd
Add bottom action toolbar to label templates [SCI-8301]
2023-05-16 11:40:07 +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
Martin Artnik
cf9f86b5d2
Fix project actions, fix edit icons [SCI-8391]
2023-05-04 15:52:46 +02:00
Martin Artnik
7a6fe5050d
Fix project folder delete action [SCI-8391]
2023-05-04 14:59:16 +02:00
Martin Artnik
9b875371a4
Implement task table bottom toolbar [SCI-8298]
2023-05-04 11:29:19 +02:00
Martin Artnik
8beb92fc39
Implement new experiments toolbar [SCI-8296]
2023-04-26 15:51:22 +02:00
Martin Artnik
ed04bc6b6a
Implement new Projects bottom toolbar [SCI-8295]
2023-04-26 11:25:29 +02:00
ajugo
8eb7d9fa9d
Fix docx report generation for step tables with unknown metadata [SCI-8353] ( #5330 )
2023-04-21 12:00:02 +02:00
Soufiane
4245807a69
Display the last protocol version when dashboard recent works is clicked [SCI-8266] ( #5268 )
2023-04-13 11:38:30 +02:00
G-Chubinidze
32217475c7
Revert "Revert "Archived experiments UI improvements [SCI-8086]""
2023-04-12 11:34:54 +04:00
Oleksii Kriuchykhin
a70d8dea74
Fix TinyMCE issue in project export, small fixes for protocols [SCI-8199]
2023-04-04 13:42:20 +02:00
Oleksii Kriuchykhin
89a45d2b14
Merge branch 'hotfix/1.26.6.4' into develop
2023-03-29 10:39:51 +02:00
Martin Artnik
f48350c6ea
Properly handle repository snapshots in reports [SCI-8212]
2023-03-28 10:37:24 +02:00
ajugo
c0977799f3
Fix recent works for protocol [SCI-8204] ( #5211 )
2023-03-27 16:00:40 +02:00
G-Chubinidze
a1c611ab1e
Revert "Archived experiments UI improvements [SCI-8086]"
2023-03-22 13:21:08 +04:00
Oleksii Kriuchykhin
7fff3e8f78
Merge branch 'hotfix/1.26.6.2' into develop
2023-03-20 15:36:49 +01:00
Andrej
8bf9e2425b
Fix docx table generator if metadata are nil [SCI-8165]
2023-03-20 14:12:44 +01:00
Andrej
64441f791f
Fix check for nil row [SCI-8165]
2023-03-20 11:59:20 +01:00
Andrej
8d7d2a4539
Merge branch 'hotfix/1.26.6.2' of https://github.com/biosistemika/scinote-web into aj_SCI_8165
2023-03-20 11:16:33 +01:00
Andrej
c84adfdecc
Fix docx report generation with broken metadate [SCI-8165]
2023-03-20 11:14:27 +01:00
Oleksii Kriuchykhin
b67691acb5
Merge branch 'develop' into features/protocol_versioning
2023-03-17 13:53:30 +01:00
Anton
248b6b6581
Remove additional code
2023-03-17 11:11:59 +01:00
Alex Kriuchykhin
d82470aa03
Improve handling and escaping of special characters in input fields [SCI-8125] ( #5135 )
2023-03-13 18:00:30 +01:00
Giga Chubinidze
3d11400311
Archived experiments UI improvements [SCI-8086]
2023-03-13 15:12:40 +04:00
Giga Chubinidze
4cc953663f
Display the ID of the parent protocol in reports [SCI-8081]
2023-03-10 00:08:07 +04: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
Alex Kriuchykhin
5de5d64be5
Update external protocol importer backend in order to work with new protocol versioning [SCI-7829] ( #5017 )
2023-02-27 10:37:51 +01:00
Martin Artnik
89459ae21a
Protocol group assignment fixes [SCI-7978]
2023-02-24 17:24:25 +01:00
Martin Artnik
c24b0fa5ab
Refactor access modals [SCI-7978]
2023-02-23 14:57:38 +01:00
Soufiane
c88e2df19c
Fix filter_date action when only one date is present [SCI-7942] ( #5005 )
...
Fix filter_date action when only one date is present [SCI-7942]
2023-02-21 14:36:24 +01:00
Soufiane
77d4a33829
Fix the undefined method issue for activity subjects [SCI-7942] ( #4994 )
2023-02-20 11:49:27 +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
ajugo
dc8b147282
Add handson table metadata to reports [SCI-7835] ( #4956 )
...
* Add handson table metadata to reports [SCI-7835]
* Fix step table loading for empty metadata [SCI-7835]
2023-02-13 11:32:18 +01:00
artoscinote
db75d1cb34
Merge pull request #4938 from sboursen-scinote/sb_SCI-7831
...
No warning message on modal, when importing existing protocol from protocols.io into My Protocols [SCI-7831]
2023-02-06 16:59:08 +01:00
sboursen-scinote
1614e3e52b
Fix hound [SCI-7831]
2023-02-06 16:42:48 +01:00
sboursen-scinote
2fc5772af3
Catch RecordInvalid errors and remove uneeded error_format function [SCI-7831]
2023-02-06 16:36:52 +01:00
sboursen-scinote
93851b8c90
Fix code style issues [SCI-7831]
2023-02-06 13:49:34 +01:00
sboursen-scinote
c39b660fe3
Format error before sending it from back-end [SCI-7831]
2023-02-06 13:29:15 +01:00
artoscinote
2af2479808
Merge pull request #4937 from artoscinote/ma_SCI_6359
...
Fix multiple route helper incluions [SCI-6359]
2023-02-06 13:08:04 +01:00
Martin Artnik
7c6cca0615
Fix multiple route helper incluions [SCI-6359]
2023-02-06 13:03:12 +01:00
ajugo
5104dab5b4
Show parent id for inventory snapshot items in exported excel [SCI-7671] ( #4907 )
2023-02-06 11:18:19 +01:00
ajugo
6fcb9152dc
Fix CSS for generated pdf/docx reports [SCI-7660] ( #4911 )
...
* Fix CSS for generated pdf/docx reports [SCI-7660]
* Call correct asset previewable function [SCI-7660]
2023-02-01 12:01:18 +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
0304daef7d
Cast rgb() formatted css colors to hex for DOCX [SCI-7796]
2023-01-19 15:50:59 +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
Alex Kriuchykhin
91d5e9a72c
Merge pull request #4839 from okriuchykhin/team_deletion_fix
...
Fix team data deletion, add user assignments deletion for PET
2023-01-17 13:24:50 +01:00
ajugo
bf5e0da17a
Fix field codes dropdown for label templates [SCI-7770] ( #4837 )
2023-01-17 12:50:17 +01:00
Oleksii Kriuchykhin
2d8392f6c0
Fix team data deletion, add user assignments deletion for PET
2023-01-16 15:10:15 +01:00
ajugo
56fb8a4efa
Fix hoover tooltip for company logo [SCI-7766] ( #4827 )
2023-01-16 10:23:34 +01:00
ajugo
1e01d1f2b7
Fix missing translation for field codes [SCI-7765] ( #4826 )
2023-01-16 10:21:10 +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
ajugo
4b3b88fad8
Fix task access modal for user role [SCI-7712] ( #4817 )
2023-01-13 11:50:42 +01:00
aignatov-bio
d93268f920
Merge pull request #4808 from aignatov-bio/ai-sci-7744-experiment-table-fix-results-counter
...
Experiment table fix results counter [SCI-7744]
2023-01-12 13:30:25 +01:00
Anton
2f6312de11
Experiment table fix results counter [SCI-7744]
2023-01-12 13:19:32 +01:00
aignatov-bio
abaf8d9e07
Merge pull request #4806 from aignatov-bio/ai-sci-7746-fix-due-date-ordering
...
Experiment table improve due date sorting [SCI-7746][SCI-7704]
2023-01-12 12:58:18 +01:00
ajugo
769b5bc815
Fix task access modal for viewer role [SCI-7712] ( #4789 )
2023-01-12 12:15:29 +01:00
Anton
3dff1b8a8c
Experiment table improve due date sorting [SCI-7746][SCI-7704]
2023-01-12 11:57:48 +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
artoscinote
4ecf208243
Merge pull request #4780 from artoscinote/ma_SCI_7683
...
Fix task access modal for archived experiments [SCI-7683]
2023-01-10 11:51:47 +01:00
ajugo
1fe39a216c
Fix tag display in experiment table for viewer role [SCI-7696] ( #4781 )
2023-01-10 11:09:23 +01:00
Martin Artnik
da5324d2a1
Fix task access modal for archived experiments [SCI-7683]
2023-01-09 16:04:57 +01:00
aignatov-bio
29c13d8578
Merge pull request #4769 from aignatov-bio/ai-sci-7695-fix-comments-view-mode-experiment-table
...
Experiment table - fix comments view mode [SCI-7695]
2023-01-06 13:10:42 +01:00
aignatov-bio
46dfe2aa37
Merge pull request #4767 from aignatov-bio/ai-sci-7693-fix-view-mode-for-experiment-table-assigned-users
...
Experiment table - fix view mode for assigned users [SCI-7693]
2023-01-06 13:10:23 +01:00
Anton
c513e6bca7
Experiment table - fix comments view mode [SCI-7695]
2023-01-06 12:02:35 +01:00
Anton
802e0e602b
Experiment table - fix view moda for assigned users [SCI-7693]
2023-01-06 11:44:48 +01:00
Anton
a98aad56db
Fix task id in experiment table [SCI-7690]
2023-01-06 10:58:41 +01:00
ajugo
32e9329bcc
Fix user assign modal in experiment archived table view [SCI-7654] ( #4742 )
2023-01-05 12:00:12 +01:00
aignatov-bio
eaa7928617
Merge branch 'develop' into ai-sci-7167-update-repository-project-logic
2023-01-04 10:08:38 +01:00
Martin Artnik
1b4c209180
Fix syntax error [SCI-7368]
2022-12-23 15:03:02 +01:00
aignatov-bio
ea661f3c19
Merge branch 'develop' into features/new_experiment_views
2022-12-22 13:33:25 +01:00
