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
14031 commits 31 branches 181 tags 166 MiB
Commit graph

14031 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleksii Kriuchykhin
7b40b43922 Merge branch 'release/1.28.0' into develop 2023-09-04 16:01:46 +02:00
Alex Kriuchykhin
df290ad3b3
Improve parameter filtering in activities filters and smart annotations [SCI-9218] (#6129) 2023-09-04 15:56:17 +02:00
artoscinote
6ad1b6b67e
Merge pull request #6128 from artoscinote/ma_SCI_9217 
Don't display icons in fields with errors (alignment issues) [SCI-9217]
 2023-09-04 15:19:25 +02:00
Martin Artnik
cc29ca4cce Don't display icons in fields with errors (alignment issues) [SCI-9217] 2023-09-04 15:17:22 +02:00
Oleksii Kriuchykhin
7781ee8695 Bump version to 1.28.1.2 2023-08-31 13:47:39 +02:00
Alex Kriuchykhin
d63ec9f927
Fix shareable links association on user model [SCI-9200] (#6114) 2023-08-31 11:48:35 +02:00
Oleksii Kriuchykhin
0afe1d2946 Bump version to 1.28.1.1 2023-08-30 13:31:30 +02:00
Alex Kriuchykhin
fd58a23e55
Handle situations when file preview was not yet generated for shared tasks [SCI-9183] (#6106) 2023-08-30 13:30:12 +02:00
artoscinote
fb177765da
Merge pull request #6108 from artoscinote/ma_SCI_9184 
Fix TinyMCE sticky header calculation [SCI-9184]
 2023-08-30 13:30:00 +02:00
Martin Artnik
c6e8bc1d2a Fix TinyMCE sticky header calculation [SCI-9184] 2023-08-30 13:28:36 +02:00
Oleksii Kriuchykhin
4ee4d9acf0 Bump version to 1.28.1 2023-08-30 10:30:48 +02:00
artoscinote
ffb8c7c455
Merge pull request #6100 from scinote-eln/hotfix/1.28.0.2 
Hotfix/1.28.0.2
 2023-08-29 16:31:04 +02:00
artoscinote
fabc9ddd1d
Merge pull request #6099 from okriuchykhin/ok_SCI_9170 
Add CSP tag to sign_in_halt layout [SCI-9170]
 2023-08-29 16:29:38 +02:00
artoscinote
809461273e
Bump version to 1.28.0.2 2023-08-29 16:29:13 +02:00
Oleksii Kriuchykhin
75890a0053 Add CSP tag to sign_in_halt layout [SCI-9170] 2023-08-29 16:26:33 +02:00
artoscinote
2b15d811a3
Merge pull request #6098 from ivanscinote/SCI-9159-task-status-text-is-black-on-experiment-list-view 
Fix task status color on exp. list view [SCI-9159]
 2023-08-29 16:18:48 +02:00
Ivan Kljun
d5066c1a5d Fix task status color on exp. list view [SCI-9159] 2023-08-29 16:12:00 +02:00
aignatov-bio
44e6b54085
Merge pull request #6096 from sboursen-scinote/sb_SCI-9167 
Fix: Protocols.io modal not loading any protocols [SCI-9167]
 2023-08-29 15:06:52 +02:00
sboursen-scinote
983daa0e67 Fix Protocols.io modal not loading any protocols [SCI-9167] 
The JavaScript responsible for loading the list was attached to a
Partial that by itself was loaded using and AJAX request. Therefore,
The JavaScript was not being executed (no page reload). It was thus moved
to the parent partial (loaded on page reload) and called when the required
HTML is appended to the DOM.
 2023-08-29 14:26:07 +02:00
artoscinote
30cb9b0697
Fix RTE images in exports [SCI-9164] (#6095) 2023-08-29 13:50:43 +02:00
aignatov-bio
e75d846930
Merge pull request #6085 from sboursen-scinote/sb_SCI-9138 
Fix description text area when creating a new team [SCI-9138]
 2023-08-29 10:33:06 +02:00
artoscinote
c955c235d2
Fix user assignment endpoints [SCI-9150] (#6094) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-29 10:32:39 +02:00
artoscinote
bb3a2f1c24
Fix applying resizable class [SCI-9137] (#6093) 2023-08-29 10:20:46 +02:00
sboursen-scinote
9f05f6d28b Fix description text area when creating a new team [SCI-9138] 2023-08-28 20:51:03 +02:00
aignatov-bio
1f382be2ca
Merge pull request #6091 from aignatov-bio/ai-sci-9144-fix-marvinjs-on-steps 
Fix marvinJS button initialisation [SCI-9144]
 2023-08-28 15:59:50 +02:00
Anton
eb44724ece Fix marving JS button initialization [SCI-9144] 2023-08-28 15:53:58 +02:00
aignatov-bio
0cbcfadec9
Merge pull request #6090 from aignatov-bio/ai-sci-9149-fix-tinymce-in-safari 
Fix tinymce in safari [SCI-9149]
 2023-08-28 15:20:24 +02:00
Anton
8d7aa2aba5 Fix tinymce in safari [SCI-9149] 2023-08-28 15:17:15 +02:00
artoscinote
90f23cc61c
Fix API endpoints for user assignments [SCI-9150] (#6089) 
* Fix project assignments API endpoint [SCI-9150]

* Fix API endpoint for updating experiment assignments [SCI-9150]

* Fix API endpoint for updating task assignments [SCI-9150]
 2023-08-28 15:13:30 +02:00
Alex Kriuchykhin
165b7febcf
Fix JS errors on text results creation/editing [SCI-9140] (#6086) 2023-08-28 14:53:09 +02:00
artoscinote
953bd234f4
Merge pull request #6065 from ivanscinote/SCI-9007-update-colors 
Update 'Not started' status color at reports [SCI-9007]
 2023-08-28 09:56:25 +02:00
Alex Kriuchykhin
a7aa06d18a
Fix error handling on new folder and project edit modals [SCI-9135] (#6082) 2023-08-28 09:37:11 +02:00
Ivan Kljun
90199d3590 Add method light_color? to my_module_status [SCI-9007] 2023-08-25 15:47:34 +02:00
wandji
f4c48fe907
Fix label templates datatables height overflow [SCI-8559] (#6083) 2023-08-25 14:23:05 +02:00
Alex Kriuchykhin
ac159c29ed
Fix task card due date setup modal [SCI-9139] (#6080) 2023-08-25 13:08:50 +02:00
artoscinote
33f2d823a8
Merge pull request #6071 from artoscinote/ma_SCI_9131 
Fix sticky tinyMCE menu offset [SCI-9131]
 2023-08-24 16:37:51 +02:00
Soufiane
e00a8bb7a3
Update logo across Scinote [SCI-8997] (#6058) 
- Update logo in PDF reports
- Update logo in Docx reports
- Update logo in sign-in page
 2023-08-24 16:27:33 +02:00
Soufiane
bed603c5d5
Fix design of sign in and signature modal [SCI-9109] (#6074) 2023-08-24 15:50:05 +02:00
wandji
962de09599
Add bootstrap-select to experiment clone modal and fix overflowing text [SCI-8559] (#6060) 
* Add bootstrap-select to experiment clone modal and fix overflowing text [SCI-8559]
 2023-08-24 15:49:22 +02:00
ajugo
9d051556ec
CSS fixes for assigned items to task and task comment number [SCI-9104] (#6068) 2023-08-24 15:21:54 +02:00
ajugo
d73e844012
Fix 404 error page description [SCI-9082] (#6069) 2023-08-24 15:16:18 +02:00
Alex Kriuchykhin
2a228d3350
Remove obsolete JS code inclusion from protocol_status_bar [SCI-9134] (#6072) 2023-08-24 15:13:52 +02:00
Alex Kriuchykhin
c1e2128b04
Fix link to original file in docx protocol parser notification [SCI-9123] (#6070) 2023-08-24 15:13:41 +02:00
Martin Artnik
dfa2afa480 Fix sticky tinyMCE menu offset [SCI-9131] 2023-08-24 14:21:30 +02:00
Martin Artnik
0faad52f6c Merge branch 'hotfix/1.28.0.1' into develop 2023-08-24 12:14:30 +02:00
ivanscinote
059530620b
Implement delegated event handling for rel='external' [SCI-8737] (#6050) 
* Replace tinymce target='_blank' with rel='external' [SCI-8737]

* Add noopener to rel='external' links
 2023-08-24 11:12:11 +02:00
artoscinote
97f406d0a8
Merge pull request #6063 from G-Chubinidze/gc_SCI_7976 
Fix gray background on tox button [SCI-7976]
 2023-08-24 11:08:13 +02:00
artoscinote
48ac044be2
Merge pull request #6066 from G-Chubinidze/gc_SCI_8727_V2 
Project actions dropdown: changed team management logic
 2023-08-24 11:04:55 +02:00
Giga Chubinidze
5cd7d2fb11 changed team management logic 2023-08-24 13:03:10 +04:00
G-Chubinidze
d3901bd96f
Project card permission with not assigned team admin [SCI-8727] (#6045) 
Fix project card action permission checks
 2023-08-24 10:59:45 +02:00