scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
14109 commits 70 branches 179 tags 165 MiB
Commit graph

4233 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 092e451f2e Merge branch 'develop' into features/protocol-parsing 2023-07-13 13:59:10 +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
G-Chubinidze ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
ajugo 32fc7698d2
Implement welcome modal for shareable links [SCI-8748] (#5729) 2023-07-11 16:01:42 +02:00
artoscinote 4a8582ebc8
Initial implementation of protocol processing modal [SCI-8661] (#5683) 
* Initial implementation of protocol processing modal [SCI-8661]

* Prepare placeholder jobs and integrate notifications [SCI-8661]
 2023-07-11 09:27:15 +02:00
Soufiane a1e32e0c3d
Profile - 2FA error page [SCI-8779] (#5734) 
* Fix 2FA form submit [SCI-8779]
 2023-07-11 09:22:42 +02:00
Soufiane d8658991d6
Fix task page issues after rails upgrade [SCI-8821] (#5745) 2023-07-11 09:21:22 +02:00
Soufiane 9034793d69
Implement the assigned items datatable for shareable links [SCI-8751] (#5721) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-11 08:16:29 +02:00
Anton 8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
Soufiane e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00
Anton 2daa9126d1 Small fixes for css bundling [SCI-8773] 2023-07-07 11:44:42 +02:00
Alex Kriuchykhin 97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] (#5728) 2023-07-07 11:08:28 +02:00
ajugo 6c6fc404d2
Implement task shareable modal [SCI-8651] (#5723) 
* Implement task shareable modal [SCI-8651]

* Fix routes [SCI-8651]

* Clean code for vue share button initilization [SCI-8651]
 2023-07-06 16:05:03 +02:00
Soufiane 33bb79d17a
Implement details and notes sections of shareable links [SCI-8750] (#5710) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-06 15:10:26 +02:00
Anton f071e482d8 Migrate to css bundling [SCI-8773] 2023-07-06 13:26:41 +02:00
Anton 93a6a0bdc5 Merge branch 'features/remove-front-end-gems' of github.com:scinote-eln/scinote-web into features/remove-front-end-gems 2023-07-06 11:15:48 +02:00
Anton 4b82ba9613 Merge branch 'features/rails-upgrade' into features/remove-front-end-gems 2023-07-06 11:14:48 +02:00
Soufiane 94ead579e6
Create the general layout for shareable links [SCI-8749] (#5699) 2023-07-06 09:19:29 +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
ivanscinote 71e5c81f8b
Unified paddings for collapsing content at printers pages [SCI-8787] (#5720) 
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
 2023-07-05 15:06:53 +02:00
ajugo c8c0a147b5
Revert "Unified paddings for collapsing content at printers pages [SCI-8787] (#5718)" (#5719) 
This reverts commit dbb0e1a50a.
 2023-07-05 14:20:22 +02:00
ivanscinote dbb0e1a50a
Unified paddings for collapsing content at printers pages [SCI-8787] (#5718) 
* Unified paddings for collapsing content at printers pages

* Reordered css values as per bot-hound suggestion
 2023-07-05 14:19:23 +02:00
Soufiane ea6a714dac
Disallow scripts loading over https [SCI-8634] (#5713) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-07-05 13:19:16 +02:00
Alex Kriuchykhin 5f1c6bf2f0
Fix multiple issues after Rails upgrade [SCI-8780] (#5716) 2023-07-05 12:43:23 +02:00
Anton 9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +02:00
artoscinote 85ad167998
Merge pull request #5660 from artoscinote/ma_SCI_8506 
Make label print modal work globally [SCI-8506]
 2023-07-05 09:53:56 +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
artoscinote fc7a04d0f9
Merge pull request #5649 from G-Chubinidze/gc_SCI_7524 
Settings - My preferences - Date formats appear duplicated [SCO-7524]
 2023-07-03 14:49:40 +02:00
Anton b956f9de25 Remove bootstrap form 2023-07-03 12:59:13 +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
Soufiane 1a9ef4a1d5
Update the Tasks screens for the Shareable-links feature [SCI-8649] (#5679) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-29 11:17:41 +02:00
Martin Artnik 02a9813fb8 Show checkboxes for tasks in archived experiments [SCI-8692] 2023-06-28 15:57:15 +02:00
Martin Artnik 1d6f3cedc7 Add action toolbar to archived tasks card view [SCI-8691] 2023-06-28 15:39:03 +02:00
ajugo 563605e6ef
Implement share task toggle on settings page [SCI-8647] (#5686) 2023-06-28 11:47:41 +02:00
Anton 586d9eaf4b CSS fixes [SCI-8758][SCI-8759] 2023-06-27 20:31:25 +02:00
Anton e2190cedde Small css fixes [SCI-8742] 2023-06-27 11:58:02 +02:00
artoscinote 5fe463d293
Merge pull request #5674 from sboursen-scinote/sb_SCI-8164-8726 
[SCI-8164][SCI-8726]
 2023-06-26 15:43:29 +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
artoscinote fa60cb6589
Merge pull request #5664 from G-Chubinidze/gc_SCI_8476 
Breadcrumbs on label/protocol template page [SCI-8476]
 2023-06-26 13:00:19 +02:00
artoscinote ec3e8a20cc
Merge pull request #5671 from sboursen-scinote/sb_SCI-8729 
Archived view broken after folder [SCI-8729]
 2023-06-26 11:55:08 +02:00
sboursen-scinote 49ac9a20d8 Fix folders style in table archived view [SCI-8729] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-24 13:20:46 +02:00
Soufiane fdc4f4ddd7
Create an export_limit_exceeded model for repositories export [SCI-8730] (#5667) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-23 12:10:58 +02:00
Giga Chubinidze ef94a4f2bb logic refactor, url removal 2023-06-23 13:39:54 +04:00
artoscinote 496fbc9eca
Merge pull request #5653 from rekonder/aj_SCI_8719 
Remove breadcrumbs project table and fix project filtering [SCI-8719]
 2023-06-23 09:54:00 +02:00
artoscinote f1876b4f59
Merge pull request #5661 from okriuchykhin/ok_SCI_8710 
Fix breadcrumbs for archived view mode [SCI-8710]
 2023-06-23 09:50:03 +02:00
Giga Chubinidze 828e566698 changed logic to accomodate templates unique design 2023-06-23 11:26:53 +04:00
Oleksii Kriuchykhin e86f0e76de Fix breadcrumbs for archived view mode [SCI-8710] 2023-06-22 15:41:37 +02:00
Martin Artnik 9364d139e0 Make label print modal work globally [SCI-8506] 2023-06-22 14:52:47 +02:00
Soufiane 9c2c767f9f
Fix Drag me Canvas button [SCI-8720] (#5652) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-22 13:45:44 +02:00
Andrej 3d2f9eae1e Remove breadcrumbs project table and fix filtering [SCI-8719] 2023-06-22 13:44:27 +02:00
Anton 8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
G-Chubinidze dfdab6e051
CSS: Issues with the projects page [SCI-8507] (#5648) 
* CSS: Issues with the projects page [SCI-8504]

* css fix

* added empty cells for folder row
 2023-06-22 10:38:36 +02:00
Giga Chubinidze e77e2813bd Settings - My preferences - Date formats appear duplicated [SCO-7524] 2023-06-22 11:09:27 +04:00
Oleksii Kriuchykhin 66b361c689 Upgrade Rails to version 7.0.5 [SCI-8632] 2023-06-21 14:38:32 +02:00
artoscinote de10f32b0f
Add tailwind styles to sign in halt layout [SCI-8689] (#5642) 2023-06-21 12:41:31 +02:00
Anton 2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +02:00
Soufiane 8b8fd1db42
Fix wicked_pdf asset pipeline [SCI-8684] (#5629) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-21 10:42:27 +02:00
G-Chubinidze d686d746cb
updated breadcrumb logic for templates (#5609) 2023-06-21 10:27:21 +02:00
G-Chubinidze a88adf7630
changed tooltips (#5639) 2023-06-21 10:00:46 +02:00
Soufiane f3dcef44ac
Show checkmark on selected user role only [SCI-8699] (#5636) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-21 08:12:31 +02:00
aignatov-bio 55e75ffa91
Merge pull request #5635 from aignatov-bio/ai-sci-8662-ui-css-fixes 
UI css fixes [SCI-8662]
 2023-06-21 08:06:52 +02:00
aignatov-bio 0543a9a0c4
Merge pull request #5637 from aignatov-bio/ai-sci-8660-ui-css-fixes 
Fix UI css fixes [SCI-8660]
 2023-06-20 16:36:45 +02:00
Anton f675034b7f Fix UI css fixes [SCI-8660] 2023-06-20 15:53:33 +02:00
Anton 73880619d6 UI css fixes [SCI-8662] 2023-06-20 13:41:42 +02:00
artoscinote ad26237d02
Implement column resizing [SCI-7961] (#5596) 
* Patch datatables to support ColReorder + ColResize [SCI-7961]

* Implement repository column resizing [SCI-7961]

* Fix colResize and colReorder interactions [SCI-7961]

* Add styling improvements for column interactions [SCI-7961]

* Update grip icons [SCI-7961]

* Tweaks and fixes [SCI-7961]
 2023-06-20 12:52:02 +02:00
aignatov-bio be42f6b0da
Revert "Fix logo size [SCI-8329]" 2023-06-20 10:22:39 +02:00
Anton 4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
aignatov-bio 245a58b5c1
Merge pull request #5626 from aignatov-bio/ai-sci-8659-fix-filters-save-button 
Revert save filter and clear reminders button [SCI-8659]
 2023-06-19 12:51:24 +02:00
Anton 1c1c42c88a Revert save filter and clear reminders button 2023-06-19 12:48:40 +02:00
artoscinote 62daa073ae
Merge pull request #5611 from G-Chubinidze/gc_SCI_8526 
Double scroller on assign item to task from inventory table [SCI-8526]
 2023-06-19 12:36:54 +02:00
ajugo 76b6d92d6e
Fix task duplication on experiment table page [SCI-8676] (#5618) 2023-06-19 11:20:56 +02:00
aignatov-bio 411e62b2bd
Merge pull request #5623 from aignatov-bio/ai-sci-8329-fix-logo-size 
Fix logo size [SCI-8329]
 2023-06-19 10:50:09 +02:00
artoscinote 36ae7e6ebd
Merge pull request #5621 from G-Chubinidze/gc_SCI_8673 
Search field on assign/assigned item to task [SCI-8673]
 2023-06-19 10:44:52 +02:00
Anton 58c17b1b00 Fix logo size [SCI-8329] 2023-06-19 10:44:13 +02:00
artoscinote 84cefeef40
Merge pull request #5620 from G-Chubinidze/gc_SCI_8645 
Buttons title (tooltip on hover) - top action toolbar [SCI-8645]
 2023-06-19 10:43:59 +02:00
artoscinote 8ba08c3797
Merge pull request #5619 from G-Chubinidze/gc_SCI_8406 
(A) label (instead of icons) in front of titles of archived elements [SCI-8406]
 2023-06-19 10:43:00 +02:00
Giga Chubinidze 44a5a1f3b2 Search field on assign/assigned item to task [SCI-8673] 2023-06-19 10:21:04 +04:00
G-Chubinidze 7c55585e1f
Merge branch 'develop' into gc_SCI_8645 2023-06-19 10:18:27 +04:00
Giga Chubinidze aa6cc57160 (A) label (instead of icons) in front of titles of archived elements 2023-06-19 10:14:13 +04:00
Giga Chubinidze 96ff988c77 Buttons title (tooltip on hover) - top action toolbar [SCI-8645] 2023-06-19 10:04:58 +04: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
aignatov-bio 45764498ed
Merge pull request #5612 from sboursen-scinote/sb_SCI-8641 
Stretched image on the empty dashboard screen [SCI-8641]
 2023-06-16 12:39:58 +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
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
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 c35d3213da
Merge branch 'develop' into gc_SCI_8406 2023-06-16 09:49:19 +02:00
sboursen-scinote a1b62b22b1 Fix image size and position in no-teams-jumbotron [SCI-8641] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-16 08:39:26 +02:00
Giga Chubinidze f8f03e6b51 Double scroller on assign item to task from inventory table [SCI-8526] 2023-06-16 06:50:38 +04: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
Martin Artnik 7b0921ea65 Remove non-existant font.css include [SCI-8646] 2023-06-15 15:38:22 +02:00
Anton c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Anton d795f996f2 Merge branch 'develop' into features/ui-revamp 2023-06-14 15:18:50 +02:00
G-Chubinidze 0ad1540a41
Merge branch 'features/ui-revamp' into gc_SCI_8511 2023-06-14 17:02:18 +04:00
Anton 4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
Giga Chubinidze 88df4b2a11 Settings page - breadcrumbs [SCI-8511] 2023-06-14 05:13:33 +04:00
Alex Kriuchykhin 976c29c136
Add CSP nonce to JQuery bundle inclusion [SCI-8609] (#5588) 2023-06-13 14:47:28 +02:00
G-Chubinidze 9315190ffe
Merge branch 'develop' into gc_SCI_8406 2023-06-13 12:13:22 +04:00
Anton 4c71ecced6 Fix icon fonts issues 2023-06-12 14:55:01 +02:00
Anton 16d4a09cfa Update left navigation 2023-06-12 14:23:26 +02: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
artoscinote e57da37ec7
Merge pull request #5573 from G-Chubinidze/gc_SCI_8366 
New icons implementation [SCI-8366]
 2023-06-12 11:25:36 +02:00
Martin Artnik 7dfbc960e3 Font fix + default label icon fix [SCI-8366] 2023-06-12 11:20:33 +02:00
Soufiane 77de460182
Due date flyout on dashboard calendar [SCI-8600] (#5554) 
* Change the scope of the DatePicker datetime format in global activities [SCI-8600]
 2023-06-09 09:24:32 +02:00
Martin Artnik 27c2850f49 More fixes for icons [SCI-8366] 2023-06-08 18:12:28 +02:00
Martin Artnik dcc30822f5 New icon tweaks & fixes [SCI-8366] 2023-06-08 17:33:50 +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
Giga Chubinidze ecf38de4d3 lone operator 2023-06-08 11:08:44 +04:00
Giga Chubinidze 06e31679fe "i" flyout for protocol on task screen - linked archived protocol template with (A) label [SCI-8218] 2023-06-08 11:07:01 +04:00
Giga Chubinidze a777fd5584 New icons implementation [SCI-8366] 2023-06-08 10:33:37 +04:00
Anton c152df4e71 Merge branch 'develop' into features/ui-revamp 2023-06-06 14:55:35 +02:00
Alex Kriuchykhin eacf2c0c23
Use correct permissions in repository row assigning filters [SCI-8616] (#5565) 2023-06-06 13:53:12 +02:00
Anton afe5cdeede Switch to inter font [SCI-8170] 2023-06-06 12:50:28 +02:00
Anton 0924ae1046 Fix results css [SCI-8618] 2023-06-06 12:36:57 +02:00
ajugo 5694cfe3d0
Fix task name rendering on experiment view [SCI-8604] (#5551) 2023-06-02 17:16:39 +02:00
Soufiane 30c5b1675f
Missing warning messages when setting up new user [SCI-8595] (#5548) 
* Fix form errors in users invitation edit [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix form errors in users confirmation new [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix form errors in users registration [SCI-8595]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-02 15:35:29 +02:00
G-Chubinidze 8a214a6dbd
Raised shrinking width of canvas (#5545) 2023-06-02 13:52:22 +02:00
ajugo f38577eb79
Add missing archived icon to the PET [SCI-8563] (#5541) 2023-06-02 10:34:11 +02:00
Soufiane f16ce94164
Move button for archived task in card view (Update) [SCI-8253] (#5543) 
* Implemet the Move task functionality for archived tasks cards view [SCI-8253]

* Fix hound [SCI-8253]

* Fix hound [SCI-8253]

* Fix toolbar buttons alignment [SCI-8253]

* Fix the position and layout of the toolbar buttons [SCI-8253]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8253]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-02 10:04:25 +02:00
Giga Chubinidze a27c2b2cd3 (A) label (instead of icons) in front of titles of archived elements 2023-06-02 04:03:41 +04:00
ajugo 790653351a
Fix medium size preview for print file [SCI-8593] (#5540) 2023-06-01 16:18:15 +02:00
artoscinote bef434fb18
Merge pull request #5537 from artoscinote/ma_SCI_8589 
Fix layout overflow when navigator is open [SCI-8589]
 2023-06-01 12:36:07 +02:00
artoscinote 66ccea318b
Merge pull request #5531 from G-Chubinidze/gc_SCI_8584 
Not responsive buttons with closed/opened navigator [SCI-8534]
 2023-06-01 12:25:07 +02:00
Giga Chubinidze 7eb24df8cb included p/e levels, scoped css class 2023-06-01 14:20:56 +04:00
Martin Artnik 673c1fbaa8 Fix layout overflow when navigator is open [SCI-8589] 2023-06-01 12:14:27 +02:00
Giga Chubinidze 8e48560cb8 Not responsive buttons with closed/opened navigator [SCI-8534] 2023-05-31 19:25:24 +04:00
artoscinote 6699533301
Merge pull request #5520 from G-Chubinidze/gc_SCI_8385 
Empty screen revamp [sci-8385]
 2023-05-31 16:35:11 +02:00
Soufiane b40c750965
Turbolinks broken by default with a secure CSP [SCI-8583] (#5529) 
* Fix broken Turbolinks with CSP nonce [SCI-8583]
 2023-05-31 15:28:16 +02:00
Giga Chubinidze 68a0be9218 changed empty screen title 2023-05-31 02:09:21 +04:00
Soufiane 46fc3d17e6
Broken modal for sharing inventories [SCI-8548] (#5506) 
* Fix share_modal js loading [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Fix hound [SCI-8548]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-30 16:15:20 +02:00
artoscinote 98a27b083a
Merge pull request #5344 from sboursen-scinote/sb_SCI-8347 
FIle/step dropdown is out of task border [SCI-8347]
 2023-05-30 13:46:10 +02:00
ajugo 14b3a1318b
Fix empty page for inventory and fix task title [SCI-8556] (#5511) 
* Remove empty state for inventory [SCI-8556]

* Fix shrinking of the task title on task page [SCI-8556]
 2023-05-30 11:19:10 +02:00
artoscinote 01b54763a2
Merge pull request #5477 from G-Chubinidze/gc_SCI_8464 
CSS: inventory items top toolbar issues [SCI-8464]
 2023-05-29 11:32:16 +02:00
artoscinote 852bba642f
Merge pull request #5500 from G-Chubinidze/gc_SCI_8385 
Empty screen revamp [SCI-8385]
 2023-05-29 11:02:15 +02:00
artoscinote f233d4d73f
Merge pull request #5499 from G-Chubinidze/gc_SCI_8448 
breadcrumb css issue & archive projects url fix [SCI-8448]
 2023-05-29 10:22:22 +02:00
ajugo 8d70fcf322
Fix default state for archived repository [SCI-8435] (#5493) 2023-05-29 10:21:34 +02:00
Giga Chubinidze 59bdd7d8d2 Empty screen revamp [SCI-8385] 2023-05-29 01:42:26 +04:00
aignatov-bio 642932bbcc
Merge pull request #5475 from rekonder/aj_SCI_8490 
Add empty states for PET [SCI-8490]
 2023-05-26 11:14:38 +02:00
aignatov-bio e25f91daf7
Merge pull request #5482 from aignatov-bio/ai-sci-8483-fix-toolbar-and-pagination 
Unify datatables layout [SCI-8583]
 2023-05-26 11:13:18 +02:00
Giga Chubinidze 5e11e3a874 fixed mymodule breadcrumb 2023-05-26 03:45:16 +04:00
G-Chubinidze 2e21e286b7
Merge branch 'develop' into gc_SCI_8464 2023-05-25 15:32:00 +04:00
aignatov-bio 384434ba80
Merge pull request #5480 from aignatov-bio/ai-sci-8510-inventory-css-fixes 
Inventory css fixes [SCI-8510]
 2023-05-25 13:12:54 +02:00
Anton e755eb73a3 Unify datatables layout [SCI-8583] 2023-05-25 13:12:27 +02:00
Anton ce7f50908d Inventory css fixes [SCI-8510] 2023-05-25 12:14:41 +02:00
Giga Chubinidze 9d9b454dc4 CSS: inventory items top toolbar issues [SCI-8464] 2023-05-25 11:18:47 +04:00
Soufiane 36d63e543a
Active state selected by default when viewing archived content [SCI-8533] (#5474) 
* Redirect to archived state when clicking on archived experiment [SCI-8533]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

* Cover the case where Project is archived and experiment is not [SCI-8533]

Co-authored-by: Sboursen <dev.sboursen@gmail.com>

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-25 08:53:12 +02:00
Andrej 9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +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 9470313899
Merge pull request #5473 from aignatov-bio/ai-sci-8518-multiple-css-fixes 
Multiple small css fixes [SCI-8518]]SCI-8529]
 2023-05-24 12:11:11 +02:00
aignatov-bio 1da074bc2a
Merge pull request #5461 from G-Chubinidze/gc_SCI_8370 
Revamp of (top) toolbar - Reports [SCI-8370]
 2023-05-24 12:07:17 +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
Anton 007eae16cc Multiple small css fixes [SCI-8518]]SCI-8529] 2023-05-24 12:03:47 +02:00
aignatov-bio 5c3ebc2509
Merge pull request #5459 from G-Chubinidze/gc_SCI_8404 
(A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404]
 2023-05-24 10:53:23 +02:00
Soufiane c7fcd0a52f
Activate assign items button in Results page [SCI-8419] (#5469) 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-24 10:35:58 +02:00
Giga Chubinidze 379ef7a9cc moved to develop, fixed pagination style 2023-05-24 11:57:06 +04:00
Giga Chubinidze e553909755 moved logic to controllers & concern 2023-05-24 02:52:26 +04:00
sboursen-scinote 61f19df51f Merge branch 'develop' into sb_SCI-8347 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:11:57 +02:00
sboursen-scinote 1f83679e5e Merge branch 'develop' into sb_SCI-8347 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-05-23 23:08:20 +02:00
aignatov-bio 1a9eab09c3
Merge pull request #5463 from aignatov-bio/ai-sci-8426-fix-tiny-mce-in-safari 
Fix tinyMCE layout in safari [SCI-8426]
 2023-05-23 21:13:21 +02:00
Giga Chubinidze 1b060893e7 moved toolbar 2023-05-23 18:03:10 +04:00
ajugo 040b3bddce
Add state switch to experiment level for archived experiments [SCI-8503] (#5464) 2023-05-23 15:29:14 +02:00
Anton 043ce88434 Fix tinyMCE layout in safari [SCI-8426] 2023-05-23 13:28:31 +02:00
aignatov-bio 9c20916d8a
Merge pull request #5453 from aignatov-bio/ai-sci-8515-refactor-inventories-scrolling 
Fix inventory page layout [SCI-8515]
 2023-05-23 10:34:47 +02:00
Giga Chubinidze 7b158d7935 (A) label for archived projects, inventories and protocol tempates in breadcrumbs [SCI-8404] 2023-05-23 11:57:50 +04:00
ajugo 3036c24be3
Prevent double click on protocol creation modal [SCI-8466] (#5458) 2023-05-23 09:50:34 +02:00
ajugo cf6a901b67
Fix display of table in search results [SCI-8409] (#5454) 2023-05-22 17:07:18 +02:00
Anton ecbd900362 Fix inventory page layout [SCI-8515] 2023-05-22 15:47:59 +02:00
aignatov-bio cbecd56122
Merge pull request #5452 from G-Chubinidze/gc_SCI_8488 
Archived breadcrumbs fix [SCI-8488] [SCI-8404]
 2023-05-22 12:54:17 +02:00
aignatov-bio 607386d186
Merge pull request #5450 from aignatov-bio/ai-sci-8483-fix-action-toolbar-and-pagination 
Fix action toolbar position [SCI-8483]
 2023-05-22 12:50:53 +02:00
Giga Chubinidze be7dc74105 Archived breadcrumbs fix [SCI-8488] [SCI-8404] 2023-05-22 14:09:14 +04:00
Soufiane 8593132a35
CSP FIX: MarvinJS, AWS and New Relic [SCI-8500] (#5449) 
* Use the actual value of the nonce for New relic [SCI-8500]

* Whitelist MarvinJs [SCI-8500]

* Whitelist used AWS bucket [SCI-8500]
 2023-05-22 11:43:19 +02:00
Anton 7c9142de5e Fix action toolbar init [SCI-8413] 2023-05-22 11:31:46 +02:00
aignatov-bio 2f372fd871
Merge pull request #5440 from aignatov-bio/ai-sci-8427-fix-mobile-view 
Fix mobile view [SCI-8427]
 2023-05-19 11:41:58 +02:00
Anton 45609461ce Fix mobile view [SCI-8427] 2023-05-19 10:24:44 +02:00
artoscinote 112bb8bec6
Merge pull request #5439 from G-Chubinidze/gc_SCI_8332 
File drop area font size is incorrect [SCI-8332]
 2023-05-19 09:59:21 +02:00
Giga Chubinidze 9ee1dd695f changed font weight to normal 2023-05-19 01:00:38 +04:00
artoscinote 2a2b0f9a47
Merge pull request #5433 from aignatov-bio/ai-sci-8477-fix-navigator-button 
Fix navigator button style [SCI-8477]
 2023-05-18 16:46:33 +02:00
artoscinote ad64628c8c
Merge pull request #5435 from aignatov-bio/ai-sci-8480-fix-protocols-icons-position 
Fix protocol icons position [SCI-8480]
 2023-05-18 16:46:02 +02:00
Soufiane 351ba06840
FIX: new relic CSP [SCI-8118][SCI-8119] (#5430) 
Switch to newRelic manual browser agent using a nonce [SCI-8118][SCI-8119]
 2023-05-18 14:20:20 +02:00
Anton c57188853e Fix protocol icons position 
[SCI-8480]
 2023-05-18 14:00:05 +02:00
Anton 753372f9e4 Fix navigator button style [SCI-8477] 2023-05-18 13:43:26 +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 557b422935
Revert "Revamp of (top) toolbar - Reports [SCI-8370]" 2023-05-18 09:46:28 +02:00
artoscinote 8bd6759d5d
Merge pull request #5387 from G-Chubinidze/gc_SCI_8370 
Revamp of (top) toolbar - Reports [SCI-8370]
 2023-05-18 09:46:03 +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
Alex Kriuchykhin 0cc253172f
Merge pull request #5326 from rekonder/aj_SCI_8082 
Reverse table header/row numbering for plate templates [SCI-8082]
 2023-05-18 09:34:19 +02:00
aignatov-bio 31bb1210af
Merge pull request #5422 from aignatov-bio/ai-sci-8438-navigation-css-fixes 
Update navigation css [SCI-8438]
 2023-05-18 08:58:48 +02:00
Giga Chubinidze f161354f1b Implement the bottom action toolbar - reports [SI-8302] 2023-05-18 00:42:16 +04:00
artoscinote 20593f087e
Merge pull request #5421 from artoscinote/ma_SCI_8399 
Implement new toolbar for protocols [SCI-8399]
 2023-05-17 15:00:38 +02:00
Anton 3bdd903623 Update navigation css [SCI-8438] 2023-05-17 14:18:16 +02:00
Martin Artnik eb5fb16b1b Implement new toolbar for protocols [SCI-8399] 2023-05-17 14:12:40 +02:00
aignatov-bio 23f4b01c8e
Merge pull request #5418 from aignatov-bio/ai-sci-update-scinote-icon-font 
Update SciNote icon font
 2023-05-17 12:30:13 +02:00
Anton a33b1b0da7 Update scinote icon font 2023-05-17 12:00:59 +02:00
Alex Kriuchykhin 5a06f649d6
Merge pull request #5417 from scinote-eln/features/sa-item-assigning 
Features/sa item assigning
 2023-05-17 11:45:13 +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
Andrej 32d8fc3e0c Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-16 14:26:12 +02:00
G-Chubinidze 49454fd8c8
Merge branch 'develop' into gc_SCI_8305 2023-05-16 16:19:46 +04:00
ajugo 43f571c154
Enable Manage access for archived protocols [SCI-8453] (#5411) 2023-05-16 13:25:33 +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
ajugo 2b848733b4
Fix assigning repository items through smart annotation pop-up to task [SCI-8417] (#5401) 2023-05-16 11:08:13 +02:00
artoscinote a856759c08
Merge pull request #5379 from sboursen-scinote/sb_SCI-8378 
Select/Unselect all does not update visibility of buttons [SCI-8378]
 2023-05-16 10:40:06 +02:00
ajugo c6f5219043
Display all protocol templates for team admin [SCI-8379] (#5391) 2023-05-16 10:29:00 +02:00
Anton 9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Soufiane c28f86d46d
Refactor inline events [SCI-8434] (#5403) 
Refactor inline events in task results [SCI-8434]
 2023-05-16 09:34:36 +02:00
Anton 8be2a02d9b Fix my module layout 2023-05-15 15:38:44 +02:00
Anton e2a14c1853 Refactor Module page layout [SCI-8421] 2023-05-15 14:17:41 +02:00
artoscinote df8a380a87
Merge pull request #5386 from sboursen-scinote/sb_SCI-8371 
CSS: label printer part 1 [SCI-8371]
 2023-05-15 13:17:17 +02:00
Giga Chubinidze 405897c564 updated code to fit new state dropdown logic + updated card view 2023-05-15 11:12:07 +04:00
ajugo e0b742b336
Fix assigning of inventory items from inventory card [SCI-8416] (#5397) 2023-05-11 13:18:19 +02:00
aignatov-bio cc181f1da7
Merge pull request #5369 from aignatov-bio/ai-sci-8394-fix-inivte-user-modal 
Fix css for invite user modal [SCI-8394]
 2023-05-11 11:35:53 +02:00
Anton 8f5560b016 Add barcode search field [SCI-8283] 2023-05-11 11:21:50 +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
aignatov-bio 4737a2d4bc
Merge pull request #5382 from aignatov-bio/ai-sci-8386-refactor-protocol-toolbar 
Update protocol top toolbar [SCI-8386]
 2023-05-10 11:39:38 +02:00
Oleksii Kriuchykhin f903ec80e5 Merge branch 'hotfix/1.27.1.2' into develop 2023-05-10 10:35:45 +02:00
Giga Chubinidze 57c0e299e8 Revamp of (top) toolbar - Reports [SCI-8370] 2023-05-10 01:09:05 +04:00
G-Chubinidze fa84365404
Merge pull request #5380 from G-Chubinidze/gc_SCI_8332 
File drop area font size is incorrect [SCI-8332]
 2023-05-10 00:54:57 +04:00
Anton 5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +02:00
sboursen-scinote 1624941c03 Fix CSS issues label printer and label templates and setting pages [SCI-8371] 2023-05-09 14:07:53 +02:00
artoscinote 09c4100115
Merge pull request #5374 from artoscinote/ma_SCI_8393 
Project dropdown menu fixes [SCI-8393]
 2023-05-09 12:43:29 +02:00
aignatov-bio a19def15f3
Merge pull request #5357 from G-Chubinidze/gc_SCI_8306 
Revamp of (top) toolbar + search field - inventories and items [SCI-8306] [SCI-8307]
 2023-05-09 11:18:05 +02:00
Giga Chubinidze 2ad5a5ed7e File drop area font size is incorrect [SCI-8332] 2023-05-09 01:39:12 +04:00
sboursen-scinote 47fde38cde Refactor the onClick on template label names to fit the CSP [SCI-8378] 2023-05-08 17:02:26 +02:00
ajugo 783d5d03ab
Add edit button to label templates and fix last updated by [SCI-8373] (#5376) 2023-05-08 11:27:29 +02:00
sboursen-scinote 5f8eafedf9 Create a modal for item assignment from inventory page [SCI-8250] 
- Fix the behavior of the search_select.
- Fix select options positioning.
- Get the items to assign from selected rows.
- Style the modal.

Style the modal [SCI-8250]

Fix select options positioning [SCI-8250]
 2023-05-08 09:43:18 +02:00
Martin Artnik cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +02:00
Anton 2ae1d545c9 Fix css for invite user modal [SCI-8394] 2023-05-05 11:20:32 +02:00
Anton 560ddca839 Add html support to disclaimer body and enable during registration [SCI-8410][SCI-8407] 2023-05-05 10:44:22 +02:00
sboursen-scinote 443cd21090 WIP: Create a modal for inventory item assignment from inventory page [SCI-8250] 2023-05-05 08:44:40 +02:00
Martin Artnik 7a6fe5050d Fix project folder delete action [SCI-8391] 2023-05-04 14:59:16 +02:00
Andrej 29a9c3781e Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/sa-item-assigning 2023-05-04 13:34:45 +02:00
Martin Artnik 9b875371a4 Implement task table bottom toolbar [SCI-8298] 2023-05-04 11:29:19 +02:00
Giga Chubinidze efa0ae9534 Revamp of (top) toolbar - items [SCI-8307] 2023-05-03 23:25:13 +04:00
Soufiane 1b34de37ef
CSP and inline js refactor [SCI-8118][SCI-8119] (#5206) 
CSP and inline js refactor [SCI-8118][SCI-8119]
 2023-05-03 11:31:17 +02:00
Soufiane df0995d867
Move button for archived task in card view [SCI-8253] (#5322) 
Implemet the Move task functionality for archived tasks cards view [SCI-8253]
 2023-05-03 11:15:17 +02:00
Soufiane 314c7cbfd9
Add object IDs to smart annotation search and global search [SCI-8085] (#5151) 
Add object codes to global search [SCI-8085]
 2023-05-03 11:07:18 +02:00
Soufiane 834bf0984d
Move generation of user annotation popover to FE [SCI-7977] (#5124) 
Move user popover to FE [SCI-7977]
 2023-05-03 09:46:18 +02:00
Giga Chubinidze a83625fbef Revamp of (top) toolbar + search field - inventories [SCI-8306] 2023-05-03 00:58:11 +04:00
Martin Artnik bfaa5c991b Action toolbar init improvement [SCI-8296] 2023-04-28 10:33:44 +02:00
artoscinote 334f111eba
Merge pull request #5351 from artoscinote/ma_SCI_8296 
Implement new experiments toolbar [SCI-8296]
 2023-04-28 10:32:22 +02:00
Martin Artnik 7744183a6e Edit form fix [SCI-8296] 2023-04-28 10:29:38 +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
Anton 1bc2baf1f3 Add navigator interactions [SCI-8047] 2023-04-26 10:34:02 +02:00
ajugo d4abcb4980
Implement assigning items to task when adding a smart annotation [SCI-8208] (#5295) 2023-04-25 15:12:19 +02:00
G-Chubinidze b01fc03101
Merge pull request #5333 from G-Chubinidze/gc_SCI_8337 
Remove screen / code for the page **/system_notifications [SCI-8337]
 2023-04-25 16:56:24 +04:00
G-Chubinidze 468a5bd2df
Merge pull request #5340 from G-Chubinidze/gc_SCI_8303 
Revamp of (top) toolbar - projects, experiments [SCI-8303] [SCI-8304]
 2023-04-25 16:51:30 +04:00