scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-09 08:57:41 +08:00
Code Issues Projects Releases Packages Wiki Activity
13511 commits 40 branches 184 tags 168 MiB
Commit graph

13511 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
wandji
2698681548
Fix Not correct naming for label in global activity filter (#5776) 
* Update translation for label_repository and sort template label names in label print modal

* Rename label_repository to label_templates in translation file and initializer/extends) [SCI-8808]
 2023-07-17 15:38:28 +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
Soufiane
3775727857
Fix project export issue [SCI-8827] (#5767) 2023-07-17 15:33:02 +02:00
aignatov-bio
c1a6370e49
Merge pull request #5780 from aignatov-bio/ai-sci-8788-fix-checklists-button-position 
Fix checklist add item button position [SCI-8788]
 2023-07-17 15:30:58 +02:00
wandji
063c1209ba
Fix issue when viewing task repository snapshot [SCI-8871] (#5785) 2023-07-17 13:15:04 +02:00
aignatov-bio
18f4b2cc19
Merge pull request #5787 from aignatov-bio/ai-sci-8855-fix-preview-generation 
Fix preview generation [SCI-8855]
 2023-07-17 13:09:38 +02:00
Anton
bd1e81f894 Fix preview generation [SCI-8855] 2023-07-17 13:05:33 +02:00
Soufiane
1dfc46e995
Fix comments update action [SCI-8873] (#5786) 2023-07-17 13:04:56 +02:00
sboursen-scinote
3167a3ca8f Fix smart annotation popover url [SCI-8866][SCI-8867] 2023-07-17 12:06:52 +02:00
Soufiane
4808f6438c
Fix CSP script-src [SCI-8634] (#5781) 2023-07-17 11:26:41 +02:00
Anton
5b989042f0 Fix checklist add item button position [SCI-8788] 2023-07-17 11:00:32 +02:00
ajugo
504a0bee62
Fix scroll for protocols.io [SCI-8825] (#5774) 2023-07-17 10:55:36 +02:00
Soufiane
18f383c543
Update CSP script-src-elem [SCI-8634] (#5775) 2023-07-14 15:38:00 +02:00
Soufiane
51a19a559b
Define allowed scripts src-elem for CSP [SCI-8634] (#5771) 2023-07-14 14:25:24 +02:00
wandji
ebe1bd583f
Fix issue json response for creating result table [SCI-8853] (#5768) 
* Fix issue json resposnse for creating result table [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix linter errors [SCI-8853]

* Fix issues when editing and updating results text/table for task [SCI-8853]

* Fix linter errors [SCI-8853]
 2023-07-14 12:30:36 +02:00
Soufiane
5266fad02d
Fix bootstrap input-group style [SCI-8723] (#5770) 2023-07-14 08:37:29 +02:00
aignatov-bio
9421ef3312
Merge pull request #5764 from aignatov-bio/ai-sci-8788-fix-styling-for-checklist-items 
Fix css for protocol checklists [SCI-8788]
 2023-07-13 15:09:57 +02:00
aignatov-bio
6d00f22657
Merge pull request #5765 from aignatov-bio/ai-sci-8789-fix-canvas-css 
Fix canvas styling [SCI-8789]
 2023-07-13 15:09:44 +02:00
Anton
b623cf8d04 Fix canvas styling [SCI-8789] 2023-07-13 14:21:55 +02:00
Anton
4cc6513f82 Fix css for protocol checklists [SCI-8788] 2023-07-13 13:55:32 +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
Soufiane
6d98b0c235
Reports - Issues after rails upgrade [SCI-8830] (#5758) 
* Fix reports issues after rails upgrade [SCI-8830]

* Fix report image assets [SCI-8830]
 2023-07-12 15:42:34 +02:00
aignatov-bio
c90060dbec
Merge pull request #5757 from aignatov-bio/ai-sci-8762-css-fixes 
Multiple CSS fixes [SCI-8762]
 2023-07-12 14:34:59 +02:00
Anton
24454a0fb9 Multiple CSS fixes [SCI-8762] 2023-07-12 12:25:31 +02:00
G-Chubinidze
ac399e5722
Activities - Issues after rails upgrade [SCI-8824] (#5755) 2023-07-12 11:11:10 +02:00
Soufiane
2f669c93d5
Fix projects issues after rails upgrade [SCI-8827] (#5754) 2023-07-12 11:10:17 +02:00
aignatov-bio
683fe22475
Merge pull request #5753 from aignatov-bio/ai-sci-8716-fix-checklists-drag-n-drop-interactions 
Fix checklists drag/drop interactions in Safari [SCI-8716]
 2023-07-12 09:48:27 +02:00
ajugo
051e686787
Implement automatic check for new notifications [SCI-8654] (#5631) 2023-07-11 16:05:34 +02:00
Alex Kriuchykhin
b852cf92fe
Fix displaying of tinyMCE images in search results [SCI-8823] (#5751) 2023-07-11 14:47:15 +02:00
dependabot[bot]
b9ec8ecc08
Bump semver from 5.7.1 to 5.7.2 (#5752) 
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-07-11 14:46:50 +02:00
Anton
71020c032d Fix checklists drag/drop interactions in Safari [SCI-8716] 2023-07-11 13:42:08 +02:00
Alex Kriuchykhin
e24d5f13fc
Switch to PostgreSQL version 15 [SCI-8633] (#5722) 2023-07-11 13:24:44 +02:00
aignatov-bio
388915b6d9
Fix big decimal number renderer in repository [SCI-8828] (#5746) 2023-07-11 13:24:07 +02:00
aignatov-bio
3de911d714
Merge pull request #5750 from aignatov-bio/ai-sci-8762-css-bugs 
CSS fixes [SCI-8762]
 2023-07-11 10:59:27 +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
Soufiane
6aaa68f320
Fix reports issues after rails upgrade [SCI-8830] (#5748) 2023-07-11 09:20:29 +02:00
Anton
8e1836aa82 CSS fixes [SCI-8762] 2023-07-10 21:09:29 +02:00
artoscinote
5bcf31ed2e
Fix activity filter loading via URL params [SCI-7537] (#5737) 2023-07-10 13:59:15 +02:00
dependabot[bot]
49fd90728b
Bump tough-cookie from 4.1.2 to 4.1.3 (#5742) 
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-07-10 13:57:38 +02:00
Soufiane
e8c62d6cd8
Fix protocol template issues after rails upgrade [SCI-8822] (#5740) 2023-07-10 13:57:13 +02:00
Soufiane
eb4d0f2065
Revert changing .js.erb file [SCI-8810] (#5741) 2023-07-10 09:43:00 +02:00
Soufiane
b44678d09a
Switch to keyword parameters in i18n.t [SCI-8810] (#5739) 2023-07-07 14:55:51 +02:00