Commit graph

1154 commits

Author SHA1 Message Date
Soufiane
e00a8bb7a3
Update logo across Scinote [SCI-8997] (#6058)
- Update logo in PDF reports
- Update logo in Docx reports
- Update logo in sign-in page
2023-08-24 16:27:33 +02:00
Alex Kriuchykhin
56e411f35e
Add export stock consumption buttons and permission helper [SCI-9022] (#6040) 2023-08-24 15:28:28 +02:00
Martin Artnik
0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
Ivan Kljun
023a6fe0a8 Update 'Not started' button for reports [SCI-9007] 2023-08-24 08:31:07 +02:00
ajugo
bbe0aa29ea
Fix showing of project folder toolbar buttons [SCI-9099] (#6053)
* Fix showing of project folder toolbar buttons [SCI-9099]

* Fix reading permission for all projects for team admins [SCI-9099]

* Fix check for team admin [SCI-9099]
2023-08-23 18:05:20 +02:00
artoscinote
9f23fe557a
Add entity breadcrumbs to activity webhooks [SCI-9056] (#6056) 2023-08-23 16:49:17 +02:00
Andrej
29cddf5ef7 Merge branch 'develop' into features/ove-integration 2023-08-22 11:00:34 +02:00
artoscinote
6f5ef60ab1
Merge pull request #5733 from G-Chubinidze/gc_SCI_8727
Project card permission with not assigned team admin [SCI-8727]
2023-08-21 12:19:28 +02:00
G-Chubinidze
afdfec5f71
Update projects_service.rb 2023-08-21 14:13:00 +04:00
Giga Chubinidze
a391e6e6e1 changed loop 2023-08-21 14:08:17 +04:00
Anton
2d64d2fcbf Merge branch 'develop' into features/september-release 2023-08-21 11:25:27 +02:00
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