scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-17 22:51:24 +08:00
Code Issues Projects Releases Packages Wiki Activity
13467 commits 31 branches 181 tags 166 MiB
Commit graph

13467 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Soufiane
8e6854309e
Fix broken inventory page [SCI-8690] (#5633) 
- Stretch the datatable body to take all of the available space.
- Reload the datatable upon item assignment to task.

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-20 14:29:35 +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
artoscinote
4fe0ad026d
Change the way ConnectedDevice logging is added to TokensController [SCI-8287] (#5634) 2023-06-20 12:50:36 +02:00
artoscinote
62411fb77b
Merge pull request #5517 from sboursen-scinote/sb_SCI-8316 
Add office file to task step - reload file does not work for empty file [SCI-8316]
 2023-06-20 11:12:28 +02:00
aignatov-bio
8c64463b23
Merge pull request #5632 from scinote-eln/revert-5623-ai-sci-8329-fix-logo-size 
Revert "Fix logo size [SCI-8329]"
 2023-06-20 10:30:54 +02:00
aignatov-bio
be42f6b0da
Revert "Fix logo size [SCI-8329]" 2023-06-20 10:22:39 +02:00
aignatov-bio
a3aeac1c1d
Merge pull request #5628 from aignatov-bio/ai-sci-ui-css-fixes 
UI CSS fixes
 2023-06-19 16:00:40 +02:00
Anton
4e972de096 UI CSS fixes 2023-06-19 15:58:17 +02:00
artoscinote
979e5c5810
Merge pull request #5627 from artoscinote/ma_SCI_8683 
Fix bottom toolbar position update [SCI-8683]
 2023-06-19 15:56:01 +02:00
Soufiane
72266fc636
Inventory export FE [SCI-6546] (#5622) 
* 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

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

* Remove load_repository and check_view_permission for export_repositories [SCI-6546]

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

* Fix text grammar in repositories export modal [SCI-6546]

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

* Use I18n pluralization [SCI-6546]

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

---------

Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-19 14:16:55 +02:00
Martin Artnik
6913874257 Fix bottom toolbar position update [SCI-8683] 2023-06-19 14:10:55 +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
32b5caf2cc
Merge pull request #5625 from sboursen-scinote/sb_SCI-8675 
Missing breadcrumbs for Fluics page [SCI-8675]
 2023-06-19 12:37:25 +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
Giga Chubinidze
374a474336 removed timeouts 2023-06-19 14:34:54 +04:00
sboursen-scinote
ef16771f00 Add breadcrumbs to Fluics page [SCI-8675] 
Co-authored-by: Sboursen <dev.sboursen@gmail.com>
 2023-06-19 12:20:53 +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
artoscinote
3f01078a93
Merge pull request #5616 from artoscinote/ma_SCI_8681 
Add support for boostrap modals to action toolbar [SCI-8681]
 2023-06-16 15:23:57 +02:00
Martin Artnik
5f3b009bfc Add support for boostrap modals to action toolbar [SCI-8681] 2023-06-16 15:14:58 +02:00
artoscinote
fa92c0b3ce
Merge pull request #5615 from artoscinote/ma_SCI_8682 
Fix bottom action toolbar responsiveness [SCI-8682]
 2023-06-16 14:25:02 +02:00
Martin Artnik
e44b3bb568 Fix bottom action toolbar responsiveness [SCI-8682] 2023-06-16 14:17:46 +02:00
Soufiane
966b92e8d2
Activities update for grant project access to all team members [SCI-8383] (#5598) 
* Create new activities for granting/revoking access to all team members on projects [SCI-8383]
 2023-06-16 13:08:02 +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
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
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