Commit graph

384 commits

Author SHA1 Message Date
Anton
7961bee35f Merge branch 'develop' into features/september-release 2023-08-07 14:11:29 +02:00
Anton
89c526103d Merge branch 'develop' into features/remove-front-end-gems 2023-08-07 11:23:21 +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
Anton
89d7241f60 Merge branch 'develop' into features/september-release 2023-08-07 10:35:15 +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
sboursen-scinote
8cca2c595f Fix end-of-list banner issues in P/E/T [SCI-8126] 2023-08-01 11:36:09 +02:00
Giga Chubinidze
4cc9bbae95 Fixed Inventory Calendar Header [SCI-8933] 2023-07-28 10:41:59 +04:00
Giga Chubinidze
51e72307cc CSS: Calendars header fix [SCI-8933] 2023-07-27 00:38:11 +04: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
Soufiane
effdc9563a
Improve Breadcrumbs responsiveness [SCI-8494] (#5778)
- Refactor Breadcrumbs using VUE.
- Implement responsiveness breakpoints
2023-07-25 09:24:49 +02:00
aignatov-bio
67a8729b41
Merge pull request #5847 from aignatov-bio/ai-sci-8880-clean-up-step-elements
Prepare step components for results refactor [SCI-8880]
2023-07-24 14:17:55 +02:00
Anton
aa87b332e4 Prepare step components for results refactor [SCI-8880] 2023-07-24 14:07:11 +02:00
Anton
2a47909e32 Update step text element [SCI-8880] 2023-07-21 10:35:14 +02:00
Andrej
cd551c4265 Change font for error input errors [SCI-8863] 2023-07-19 14:23:48 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Anton
85f14a6bb0 Merge branch 'features/remove-front-end-gems' of github.com:scinote-eln/scinote-web into features/remove-front-end-gems 2023-07-18 14:38:25 +02:00
Anton
1087f67228 Merge branch 'develop' into features/remove-front-end-gems 2023-07-18 14:36:40 +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
ivanscinote
5519cfe75f
Fix label templates, inline edit, checklist and step [SCI-8792] (#5766)
* Fix label templates, inline edit, checklist and step [SCI-8792]

* Add mouse selection to protocol name on task and protocol desc.

* Fix css hound suggestions
2023-07-14 12:31:15 +02:00
Soufiane
78d8a54e0d
Remove BMT and bioeddie from Scinote [SCI-8643] (#5760) 2023-07-13 09:45:53 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
Anton
f071e482d8 Migrate to css bundling [SCI-8773] 2023-07-06 13:26:41 +02:00
Anton
9a5abfabf7 Move js gems to packages [SCI-8772] 2023-07-05 12:03:44 +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
8bf8b9cc72
Merge pull request #5670 from artoscinote/ma_SCI_8694
Fix boostrap datepicker to work with new font [SCI-8694]
2023-06-26 11:44:01 +02:00
Martin Artnik
9ea927e5b9 Fix boostrap datepicker to work with new font [SCI-8694] 2023-06-23 15:36:14 +02:00
Martin Artnik
5e7d3f1564 CSS fixes [SCI-8731] 2023-06-23 15:01:04 +02:00
artoscinote
c7d5bba855
Merge pull request #5657 from artoscinote/ma_SCI_8711
Fix sticky header z-index [SCI-8711]
2023-06-22 14:33:38 +02:00
artoscinote
b78105c546
Fix column width limiting [SCI-7961] (#5656) 2023-06-22 14:33:16 +02:00
Martin Artnik
370cf4b345 Fix sticky header z-index [SCI-8711] 2023-06-22 14:06:38 +02:00
Anton
8fac4c1b7c UI CSS fixes 2023-06-22 11:55:23 +02:00
Anton
5fc5f30a69 Fix pagination position [SCI-8709] 2023-06-21 14:32:25 +02:00
aignatov-bio
e520540f99
Merge pull request #5641 from aignatov-bio/ai-sci-ui-css-fixes
UI CSS Fixes
2023-06-21 12:04:12 +02:00
Anton
2030b71082 UI CSS Fixes 2023-06-21 12:02:18 +02:00
G-Chubinidze
67d0444b31
CSS: Issues with the projects page [SCI-8507] (#5630)
* CSS: Issues with the projects page [SCI-8504]

* css fix
2023-06-21 11:00:16 +02:00
artoscinote
02c93211ea
Fix column resizing issues [SCI-7961] (#5638) 2023-06-20 16:44:12 +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
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
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58: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
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
ajugo
89f1efc64e
Update shared status in inventory datatable [SCI-8655] (#5604) 2023-06-15 15:32:01 +02:00
Anton
c4f82cc756 Css fixes [SCI-8671] 2023-06-15 15:12:51 +02:00
Anton
5643ca4387 Update bottom action toolbar css [SCI-8541] 2023-06-14 15:10:17 +02:00
Anton
4674f64905 Add new button style [SCI-8558] 2023-06-14 14:54:10 +02:00
Anton
b434c8a2c7 Update css for team selection and search field [SCI-8540] 2023-06-13 11:52:14 +02:00
Anton
4c71ecced6 Fix icon fonts issues 2023-06-12 14:55:01 +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
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
b31ff44317 hound fix 2023-06-06 11:35:21 +04:00
Giga Chubinidze
e988c8f61c Well template table arrow [SCI-8596] 2023-06-06 11:34:01 +04:00
G-Chubinidze
3a2ad1eda6
Well template table arrow & math calculation disabled [SCI-8596] (#5549) 2023-06-02 16:08:42 +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
ajugo
420b78d217
Fix size of dropdown for state view changes [SCI-8570] (#5518) 2023-05-30 16:13:59 +02:00
Martin Artnik
47e0e45074 Globally fix pagination dropdown z-index [SCI-8538] 2023-05-30 11:39:52 +02:00
ajugo
d56eeeb26a
Fix top action switch padding problem [SCI-8570] (#5512) 2023-05-30 11:15:06 +02:00
Martin Artnik
bb32f3a935 Improve bottom action toolbar responsiveness [SCI-8550] 2023-05-29 16:34:07 +02:00
Martin Artnik
a5fe01a07a Add 'no actions' message to action toolbar [SCI-8525] 2023-05-29 09:33:18 +02:00
aignatov-bio
876987bc70
Merge pull request #5490 from aignatov-bio/ai-sci-8504-css-issues-on-task
Fix css issues on task [SCI-8504]
2023-05-26 17:10:09 +02:00
Soufiane
cb14333fca
Issues with the "Assign item to task" modal part 1 [SCI-8513] (#5486)
* Fix Select bounding box calculations [SCI-8513]

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

* Abbreviate very long select text [SCI-8513]

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

* Remove gap when dropdown is open [SCI-8513]

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

* Fix hound [SCI-8513]

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

* Add small refactor [SCI-8513]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
2023-05-26 11:41:47 +02: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
Anton
6716a5880e Fix css issues on task [SCI-8504] 2023-05-26 11:12:47 +02:00
Anton
ce7f50908d Inventory css fixes [SCI-8510] 2023-05-25 12:14:41 +02:00
Andrej
9164534548 Add empty states for PET [SCI-8490] 2023-05-24 18:15:41 +02:00
Soufiane
f21dc998b9
Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441)
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
2023-05-24 10:47:27 +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
47d2b4ab6a
Merge pull request #5431 from aignatov-bio/ai-sci-8456-fix-users-css-in-invite-modal
Fix elements alignment in dropdown tags [SCI-8456]
2023-05-18 16:47:14 +02:00
Anton
201117298b Fix elements alignment in dropdown tags [SCI-8456] 2023-05-18 13:29:13 +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
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
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
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
Anton
9b2ae96a43 Merge branch 'develop' into features/navigation-refactor-v2 2023-05-16 10:22:11 +02:00
Soufiane
935a63fc26
Fix smart annotation user avatar style [SCI-7798] (#5352) 2023-05-15 08:49:12 +02:00
G-Chubinidze
7173ee3ee6
Merge pull request #5392 from G-Chubinidze/gc_SCI_8402
CSS - top action bar missing border on dropdown fields [SCI-8402]
2023-05-11 14:42:31 +04:00
Giga Chubinidze
3d968073ae changed color hash to color constant 2023-05-11 14:40:56 +04:00
aignatov-bio
3b7c3a6f5b
Merge pull request #5390 from artoscinote/ma_SCI_8369
Label templates to toolbar copy [SCI-8369]
2023-05-11 11:30:31 +02:00
artoscinote
566b302ce1
Merge pull request #5378 from artoscinote/ma_SCI_8324
Fix main navigation issues [SCI-8324]
2023-05-11 11:26:30 +02:00
Giga Chubinidze
b48cde19b9 CSS - top action bar missing border on dropdown fields [SCI-8402] 2023-05-11 10:32:52 +04:00
Martin Artnik
33e9057fef Label templates to toolbar copy [SCI-8369] 2023-05-10 15:18:51 +02:00
Anton
5ec202e2c4 Update protocol top toolbar [SCI-8386] 2023-05-09 14:59:43 +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
Martin Artnik
1af7015e8b Fix main navigation issues [SCI-8324] 2023-05-08 14:44:50 +02:00
sboursen-scinote
32297c3312 Use fixed position for select option and add a fix for modals [SCI-8250] 2023-05-08 11:05:22 +02:00
Martin Artnik
cd7b365613 Project dropdown menu fixes [SCI-8393] 2023-05-05 15:47:53 +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