scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-25 08:14:17 +08:00
Code Issues Projects Releases Packages Wiki Activity
13583 commits 50 branches 188 tags 169 MiB
Commit graph

4038 commits

Author SHA1 Message Date
sboursen-scinote
d97035988a Move images to public folder [SCI-8842] 2023-08-10 10:33:35 +02:00
sboursen-scinote
e0fa6c0a0f Update illustrations [SCI-8842] 2023-07-25 09:19:02 +02:00
Martin Artnik
db8583c39c Remove legacy task move/restore buttons 2023-07-19 11:32:39 +02:00
Martin Artnik
5cc087835a Merge branch 'develop' into features/august-release 2023-07-19 11:21:24 +02:00
Giga Chubinidze
4025a4a497 changed tw class 2023-07-19 11:10:08 +02:00
ajugo
0d37011bba Change behavior of repository table loading on state change [SCI-8637] (#5712) 2023-07-19 11:08:40 +02:00
ajugo
c1db4529e9
Fix consume modal display on full table view on task [SCI-8868] (#5798) 2023-07-19 10:32:36 +02:00
ajugo
f84de45cfe
Fix opening of activites for archived my_module [SCI-8887] (#5804) 2023-07-19 09:42:23 +02:00
Soufiane
12dd66b6a6
Fix smart annotation popover in tasks [SCI-8867] (#5805) 2023-07-18 15:59:47 +02:00
sboursen-scinote
bb7eee9b64 Fix smart annotation popover in tasks [SCI-8866][SCI-8867] 2023-07-18 14:55:19 +02:00
wandji
59077e5ab6
Fix css issues for reports wizard steps [SCI-8786] (#5724) 
* Fix css issues got reports wizard steps [SCI-8786]

* Fix linter errors [SCI-8786]

* Improve caret alignment for report wizard [SCI-8786]
 2023-07-18 13:39:20 +02:00
wandji
aafeb456fa
Fix CSS issues in experiments tasks page and modal [SCI-8766] (#5738) 
* Fix CSS issues in experiments tasks page and modal [SCI-8766]

* Fix linter errors [SCI-8766]

* Increase spacing for icons in ask display modal and remove html.erb extention from render partial

* Optimize changes [SCI-8766]
 2023-07-18 13:38:50 +02:00
Giga Chubinidze
3cf1c5365f conflict fix 2023-07-18 14:18:41 +04:00
artoscinote
e79c73f8c4
Merge pull request #5777 from wandji20/wb-SCI-8851 
Fix issue archiving task result tables and when downloading archived result table
 2023-07-18 08:18:11 +02:00
artoscinote
a8a631bf72
Merge pull request #5784 from sboursen-scinote/sb_SCI-8866-8867 
Fix smart annotation popover URL [SCI-8866][SCI-8867]
 2023-07-18 08:16:35 +02:00
ivanscinote
6300c1bef8
Fix smart annotations multiline display [SCI-8816] (#5790) 2023-07-17 16:20:49 +02:00
ajugo
2f5015e2a2
Fix error at adding consumption to assigned item to task [SCI-8868] (#5789) 2023-07-17 15:42:40 +02:00
Soufiane
5736c444f6
Remove not used code for global activities [SCI-4851] (#5773) 
* Fix broken task/activity [SCI-4851]

* Remove unused code for global activities [SCI-4851]
 2023-07-17 15:36:22 +02:00
sboursen-scinote
3167a3ca8f Fix smart annotation popover url [SCI-8866][SCI-8867] 2023-07-17 12:06:52 +02:00
wandji20
3ee5049654 Fix issue archiving task result tables and when downloading archived tables [SCI-8851] 2023-07-15 11:33:44 +01:00
ivanscinote
a483699d73
CSS: Protocol templates UI issues [SCI-8790] (#5736) 
* CSS: Protocol templates UI issues [SCI-8790]

* Reorder css properties

* Remove whitespace in scss

* Adding flexible class to protocols-show
 2023-07-14 12:31:54 +02:00
ivanscinote
527551068b
Fix smart annotations multiline display [SCI-8816] (#5747) 2023-07-14 12:31:33 +02:00
Soufiane
5266fad02d
Fix bootstrap input-group style [SCI-8723] (#5770) 2023-07-14 08:37:29 +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
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
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
Alex Kriuchykhin
97a16f2e76
Fix archived columns behaviour in repositories export [SCI-8777] (#5728) 2023-07-07 11:08:28 +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
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
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
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
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