Commit graph

13767 commits

Author SHA1 Message Date
ajugo
bbcc900ef5
Merge pull request #5812 from rekonder/features/shareable-links
Merge develop to features/shareable-links
2023-07-19 13:10:02 +02:00
Andrej
f493ec0da1 Merge branch 'develop' into features/shareable-links 2023-07-19 12:57:20 +02:00
Andrej
2a5f55aed8 Fix result table rendering in reports [SCI-8897] 2023-07-19 11:53:47 +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
20f1483e6e Clunky parts: horizontal scroller on the label template full-screen view [SCI-8666] 2023-07-19 11:13:10 +02:00
Giga Chubinidze
323230c2e3 Sorting icons are visible in table header row [SCI-8725] 2023-07-19 11:11:42 +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
4ac0ee3ace
Fix opening of task/tags for archived my_module [SCI-8886] (#5801) 2023-07-19 10:32:51 +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
aignatov-bio
e250362733
Merge pull request #5795 from aignatov-bio/ai-sci-8788-fix-checklist-items-button
Fix add checklist items position [SCI-8788]
2023-07-19 09:58:07 +02:00
aignatov-bio
4b2f520779
Merge pull request #5788 from aignatov-bio/ai-sci-8870-fixed-rtf-preview-for-new-files
Fix rtf preview for new images [SCI-8870]
2023-07-19 09:57:56 +02:00
aignatov-bio
03225bbd7a
Merge pull request #5810 from aignatov-bio/ai-sci-8890-fix-js-error-in-console-log
Fix js error in console log [SCI-8890]
2023-07-19 09:57:46 +02:00
aignatov-bio
0b58bd922a
Merge pull request #5809 from aignatov-bio/ai-sci-8891-fix-asset-result-edit-mode
Fix asset result edit mode [SCI-8891]
2023-07-19 09:55:44 +02:00
Anton
f540b3dc8d Fix js error in console log [SCI-8890] 2023-07-19 09:55:27 +02:00
artoscinote
4f5a0d89a7
Merge pull request #5797 from wandji20/wb-SCI-8884
Fix issue when fetching table results via API [SCI-8884]
2023-07-19 09:51:08 +02:00
wandji20
126814aee8 Rename result_table serializer metadata to table_metadata [SCI-8884] 2023-07-19 08:49:20 +01:00
wandji20
7d36c74070 Fix issue when fetching table reults via API [SCI-8884] 2023-07-19 08:45:56 +01:00
ajugo
699860e730
Add position to step elements API [SCI-8834] (#5799) 2023-07-19 09:42:40 +02:00
ajugo
f84de45cfe
Fix opening of activites for archived my_module [SCI-8887] (#5804) 2023-07-19 09:42:23 +02:00
Anton
36ffe3a444 Fix asset result edit mode [SCI-8891] 2023-07-19 09:42:00 +02:00
Giga Chubinidze
6bfbb83df5 Error at inviting user to SciNote 2023-07-19 11:07:17 +04:00
sboursen-scinote
0824c5111a Merge branch 'develop' into sb_SCI-8827 2023-07-19 09:01:51 +02:00
Soufiane
12dd66b6a6
Fix smart annotation popover in tasks [SCI-8867] (#5805) 2023-07-18 15:59:47 +02:00
Alex Kriuchykhin
8b47982ccc
Fix fetching of WOPI discovery document [SCI-8889] (#5803) 2023-07-18 15:25:04 +02:00
artoscinote
eb37a68f27
Merge pull request #5802 from sboursen-scinote/sb_SCI-8866-8867
Fix smart annotation popover in tasks [SCI-8867]
2023-07-18 15:01:48 +02:00
sboursen-scinote
bb7eee9b64 Fix smart annotation popover in tasks [SCI-8866][SCI-8867] 2023-07-18 14:55:19 +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
aignatov-bio
bab8e2c330
Merge pull request #5796 from aignatov-bio/ai-sci-8883-fix-snapshot-table-render
Fix snapshot table render [SCI-8883]
2023-07-18 14:16:13 +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
wandji
7dcc774414
Refactor html partial rendering in json responses [SCI-8811] (#5763)
* Remove redundant use of respond_to in controlller actions with just one responder format [SCI-8811]

* Remove redundant begin block and replace 303 status code with :see_other [SCI-8811]
2023-07-18 13:36:41 +02:00
artoscinote
9a488f9440
Merge pull request #5761 from G-Chubinidze/gc_SCI_8824
Fixed default avatar on activity page [SCI-8824]
2023-07-18 13:00:09 +02:00
Giga Chubinidze
3cf1c5365f conflict fix 2023-07-18 14:18:41 +04:00
Anton
f710691709 Fix snapshot table render [SCI-8883] 2023-07-18 11:43:55 +02:00
Anton
f0b691769f Fix add checklist items position [SCI-8788] 2023-07-18 11:25:23 +02:00
Anton
d37f335f17 Fix rtf preview for new images [SCI-8870] 2023-07-18 11:08:39 +02:00
aignatov-bio
b18421ec4b
Merge pull request #5762 from aignatov-bio/ai-sci-8735-add-error-modal-for-protocol-parsing
Added error handling for protocol import [SCI-8735]
2023-07-18 10:21:11 +02:00
artoscinote
ad4724ba04
Add salt to token JWT token payload [SCI-8854] (#5791) 2023-07-18 09:22:39 +02:00
artoscinote
5a65b94ce3
Merge pull request #5714 from wandji20/wb-SCI-8744
Set blank default date for added_on repository filters [SCI-8744]
2023-07-18 08:41:14 +02: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
a1128d2c66
Merge pull request #5779 from G-Chubinidze/gc_SCI_8791
CSS: Inventories filter input width [SCI-8791]
2023-07-18 08:16:52 +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
artoscinote
3e5de32105
Merge pull request #5793 from G-Chubinidze/gc_SCI_8663
Clunky parts: button initialization when P/E/T view is changed [SCI-8663]
2023-07-18 08:14:58 +02:00
Giga Chubinidze
1982143608 Clunky parts: button initialization when P/E/T view is changed [SCI-8663] 2023-07-18 01:50:05 +04: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
ajugo
d71351fcbc
Fix scrollTo for inventory filter [SCI-8869] (#5782) 2023-07-17 15:39:19 +02:00