Commit graph

13333 commits

Author SHA1 Message Date
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
Alex Kriuchykhin
40f1be4552
Fix production Docker file [SCI-8632] (#5705) 2023-07-03 15:53:17 +02:00
Alex Kriuchykhin
097d217a55
Fix build of Docker production image [SCI-8632] (#5701) 2023-07-03 13:06:15 +02:00
aignatov-bio
f5877714b1
Merge pull request #5703 from aignatov-bio/ai-sci-8771-remove-bootstrap-form
Remove bootstrap form [SCI-8771]
2023-07-03 13:00:22 +02:00
Anton
b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +02:00
aignatov-bio
b459ed7b4b
Merge pull request #5695 from aignatov-bio/ai-fix-service-module
Fix service module
2023-06-29 14:52:18 +02:00
Anton
3e3374c83d Fix service module 2023-06-29 14:38:13 +02:00
artoscinote
e2a880795c
Merge pull request #5645 from okriuchykhin/ok_SCI_8632
Upgrade Rails to version 7.0.5 [SCI-8632]
2023-06-29 11:23:53 +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
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
Alex Kriuchykhin
2df9367b01
Remove old JS code, unneeded JS include nonce [SCI-8670] (#5607) 2023-06-16 10:19:54 +02:00
artoscinote
f3b4ea039a
Merge pull request #5613 from sboursen-scinote/sb_SCI-8555
View mode of smart annotation is not correct [SCI-8555]
2023-06-16 09:58:04 +02:00
artoscinote
d4b71fbdfd
Merge pull request #5610 from G-Chubinidze/gc_SCI_8406
(A) label (instead of icons) in front of titles of archived elements [SCI-8406]
2023-06-16 09:49:36 +02:00
artoscinote
c35d3213da
Merge branch 'develop' into gc_SCI_8406 2023-06-16 09:49:19 +02:00
sboursen-scinote
e99310f829 Fix smart-annotation view mode prefix [SCI-8555]
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-16 09:36:26 +02:00
Giga Chubinidze
3c2b96a795 (A) label (instead of icons) in front of titles of archived elements [SCI-8406] 2023-06-16 06:05:15 +04:00
artoscinote
dbda75d4ef
Merge pull request #5606 from artoscinote/ma_SCI_8646
Remove non-existant font.css include [SCI-8646]
2023-06-15 15:40:35 +02:00
Martin Artnik
7b0921ea65 Remove non-existant font.css include [SCI-8646] 2023-06-15 15:38:22 +02:00
ajugo
89f1efc64e
Update shared status in inventory datatable [SCI-8655] (#5604) 2023-06-15 15:32:01 +02:00
artoscinote
0680379dd6
Merge pull request #5599 from G-Chubinidze/gc_SCI_8630
Buttons title (tooltip on hover) - top navigation [SCI-8630]
2023-06-15 15:18:52 +02:00
artoscinote
11048be09b
Merge pull request #5603 from artoscinote/ma_SCI_8646
Bundle Inter font for proper font weights [SCI-8646]
2023-06-15 15:17:49 +02:00
aignatov-bio
2c7828a227
Merge pull request #5605 from aignatov-bio/ai-sci-8671-css-fixes
PET css fixes [SCI-8660]
2023-06-15 15:16:50 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Soufiane
34b7999e43
Revert disabling of the name input [SCI-8460] (#5602)
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-06-15 14:26:25 +02:00
Martin Artnik
657934f9bf Bundle Inter font for proper font weights [SCI-8646] 2023-06-15 14:23:01 +02:00
aignatov-bio
20a411c777
Merge pull request #5600 from scinote-eln/features/ui-revamp
Features/UI revamp
2023-06-15 11:51:44 +02:00
ajugo
2afe589657
Remove double load of current task on dashboard page [SCI-8642] (#5597) 2023-06-15 09:41:46 +02:00
Giga Chubinidze
69c7176976 Buttons title (tooltip on hover) - top navigation [SCI-8630] 2023-06-15 04:59:34 +04:00
Anton
d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
aignatov-bio
90f66afddf
Merge pull request #5595 from aignatov-bio/ai-sci-8541-update-buttom-action-toolbar
Update bottom action toolbar css [SCI-8541]
2023-06-14 15:13:31 +02:00
Anton
5643ca4387 Update bottom action toolbar css [SCI-8541] 2023-06-14 15:10:17 +02:00
artoscinote
2ceaea77a5
Merge pull request #5591 from G-Chubinidze/gc_SCI_8511
Settings page - breadcrumbs
2023-06-14 15:02:41 +02:00
G-Chubinidze
0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
ajugo
272de72231
Prevent closing assign modal from inventory for dropdown options [SCI-8640] (#5593) 2023-06-14 14:57:58 +02:00
aignatov-bio
85949b33aa
Merge pull request #5594 from aignatov-bio/ai-sci-8558-add-new-buttons-ui
Add new button style [SCI-8558]
2023-06-14 14:55:46 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
ajugo
dea721cdf0
Fix click away table update [SCI-8432] (#5589) 2023-06-14 10:20:40 +02:00
ajugo
1397e88eae
Fix route for repositories export [SCI-8445] (#5590) 2023-06-14 10:20:25 +02:00
Giga Chubinidze
41d42d47bd update addon controller 2023-06-14 05:15:18 +04:00
Giga Chubinidze
88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Soufiane
23e248ca02
Changed wording for activities [SCI-8243] (#5356)
* Change wording for access activities in projects and protocols [SCI-8243]
* Add project activity for changing all team members role via project option-edit [SCI-8243]
2023-06-13 16:55:40 +02:00
artoscinote
820bf7808a
Merge pull request #5586 from G-Chubinidze/gc_SCI_8476
Breadcrumbs on label/protocol template page [SCI-8476]
2023-06-13 14:49:14 +02:00
Alex Kriuchykhin
976c29c136
Add CSP nonce to JQuery bundle inclusion [SCI-8609] (#5588) 2023-06-13 14:47:28 +02:00
aignatov-bio
0a122b6416
Merge pull request #5587 from aignatov-bio/ai-sci-8540-update-top-navigation
Refactor top navigation [SCI-8540]
2023-06-13 14:13:25 +02:00
Anton
86e980f773 Updated top navigation [SCI-8540] 2023-06-13 14:12:41 +02:00
artoscinote
8b144fa33b
Merge pull request #5542 from G-Chubinidze/gc_SCI_8406
(A) label (instead of icons) in front of titles of archived elements [SCI-8406]
2023-06-13 12:17:32 +02:00