Commit graph

14691 commits

Author SHA1 Message Date
Martin Artnik
51a2b3902b
Merge pull request #6485 from artoscinote/ma_SCI_9522
Implement low stock notification [SCI-9522]
2023-10-19 11:41:57 +02:00
Martin Artnik
a952f3ba70 Implement low stock notification [SCI-9522] 2023-10-19 11:33:40 +02:00
Martin Artnik
21ad72248d
Merge pull request #6494 from aignatov-bio/ai-sci-fix-notification-migration
Fix notifications migration
2023-10-19 10:04:59 +02:00
Anton
2a8e6fef94 Fix notifications migration 2023-10-19 08:51:59 +02:00
aignatov-bio
c25d65a7ab
Merge pull request #6482 from aignatov-bio/ai-sci-include-other-notifications-type-to-migration
Reset column information after adding columns
2023-10-18 13:31:12 +02:00
Anton
8f41e72ea1 Reset column information after adding columns 2023-10-18 13:23:55 +02:00
aignatov-bio
7094d8828c
Merge pull request #6480 from aignatov-bio/ai-sci-include-other-notifications-type-to-migration
Include other notification types to migration
2023-10-18 12:49:38 +02:00
Anton
c70bc67347 Include other notification types to migration 2023-10-18 12:47:44 +02:00
Martin Artnik
3bf218b5f6
Merge pull request #6469 from aignatov-bio/ai-sci-9512-implement-acitvity-notifications
Implement acitvity notifications [SCI-9512]
2023-10-18 09:28:30 +02:00
Anton
db3f217bba Implement acitvity notifications
[SCI-9512]
2023-10-17 14:59:50 +02:00
aignatov-bio
bb0bb7088a
Merge pull request #6450 from aignatov-bio/ai-sci-9513-migrate-user-settings-to-vue
Refactor user settings page [SCI-9513]
2023-10-16 15:21:54 +02:00
Martin Artnik
dd4ea9be8a
Merge pull request #6449 from G-Chubinidze/gc_SCI_9390
Smaller changes in activity grouping [SCI-9390]
2023-10-16 10:03:04 +02:00
Anton
225193387a Update notifications settings saving 2023-10-16 09:41:38 +02:00
Anton
16b5df353f Refactor user settings page [SCI-9513] 2023-10-16 09:41:37 +02:00
Giga Chubinidze
9e86f23858 cleanup 2023-10-16 11:33:53 +04:00
Giga Chubinidze
ee6da5b0d6 Smaller changes in activity grouping [SCI-9390] 2023-10-16 11:27:44 +04:00
Martin Artnik
33e86d60c4
Merge pull request #6439 from scinote-eln/features/notifications-improvements
Features/notifications improvements
2023-10-13 14:55:25 +02:00
Martin Artnik
1912337376
Merge branch 'features/notification-revamp' into features/notifications-improvements 2023-10-13 14:55:16 +02:00
aignatov-bio
2db189ab95
Merge pull request #6422 from aignatov-bio/ai-sci-9384-migrate-to-noticed-gem
Migrate to noticed gem [SCI-9384]
2023-10-13 14:01:26 +02:00
Anton
96e063b91e Drop user notifications table [SCI-9384] 2023-10-13 10:14:16 +02:00
aignatov-bio
9079252fba
Merge pull request #6425 from aignatov-bio/ai-sci-9511-add-new-notifications-structure
Add new general notifications structure [SCI-9511]
2023-10-12 11:58:34 +02:00
Anton
c2b85d8981 Add new general notifications structure [SCI-9511] 2023-10-12 11:51:01 +02:00
Anton
2434cca42c Clean notification model [SCI-9384] 2023-10-12 11:47:29 +02:00
Anton
726ff5e238 Remove old notification extends [SCI-9384] 2023-10-12 11:38:19 +02:00
Anton
f2b834cc14 Improve migration performance [SCI-9384] 2023-10-12 11:06:10 +02:00
Anton
0ad8b9f978 Migrate to noticed gem [SCI-9384] 2023-10-11 14:03:59 +02:00
Martin Artnik
9fa918a810
Merge pull request #6397 from G-Chubinidze/gc_SCI_9473
CSS:  Various issues on task page [SCI-9473]
2023-10-10 13:11:12 +02:00
Giga Chubinidze
cad028bd1a CSS: Various issues on task page [SCI-9473] 2023-10-10 12:28:26 +04:00
Alex Kriuchykhin
472e573011
Merge pull request #6393 from okriuchykhin/ok_SCI_9494
Fix repository export job for snapshots [SCI-9494]
2023-10-10 09:12:49 +02:00
Oleksii Kriuchykhin
144c3ce12f Fix repository export job for snapshots [SCI-9494] 2023-10-09 15:40:19 +02:00
Martin Artnik
763ede050d
Merge pull request #6392 from ivanscinote/SCI-9430-move-result-does-not-work
Fix moving result elements [SCI-9430]
2023-10-09 15:11:30 +02:00
Ivan Kljun
7c0e8221c1 Fix moving result elements [SCI-9430] 2023-10-09 14:54:22 +02:00
Martin Artnik
b30d5577ac
Merge pull request #6391 from lasniscinote/gl_SCI_9487
Fixed checklist boxes getting bulletpoints [SCI-9487]
2023-10-09 12:49:51 +02:00
Martin Artnik
ec4662c484
Merge pull request #6390 from artoscinote/ma_SCI_9440
Copy fixes [SCI-9440]
2023-10-09 11:43:45 +02:00
Martin Artnik
a9b629bdf7 Copy fixes [SCI-9440] 2023-10-09 11:40:12 +02:00
Gregor Lasnibat
30ded70f7b Fixed checklist boxes getting bulletpoints [SCI-9487] 2023-10-09 11:39:22 +02:00
Martin Artnik
7a01020a2d
Merge pull request #6389 from aignatov-bio/ai-sci-small-css-fixes
CSS fixes
2023-10-09 11:34:57 +02:00
Anton
c39ba5afe6 Css fixes 2023-10-09 11:29:28 +02:00
Alex Kriuchykhin
efa0149c9f
Merge pull request #6386 from rekonder/aj_SCI_9484
Fix unsharing of repository rows [SCI-9484]
2023-10-09 11:06:23 +02:00
Andrej
30295a313b Fix unsharing of repository rows [SCI-9484] 2023-10-09 11:05:33 +02:00
Martin Artnik
e6834d0b74
Merge pull request #6387 from ivanscinote/SCI-9464-missing-content-to-exported-project-report-pdf-docx-file
Fix pdf reports [SCI-9464]
2023-10-09 11:01:33 +02:00
Ivan Kljun
879b03ad3d Fix pdf reports [SCI-9464] 2023-10-09 10:49:07 +02:00
Alex Kriuchykhin
8e420181ac
Merge pull request #6385 from okriuchykhin/ok_SCI_9461
Fix file preview generation in projects export jobs [SCI-9461]
2023-10-09 10:17:25 +02:00
Oleksii Kriuchykhin
b3759ff150 Fix file preview generation in projects export jobs [SCI-9461] 2023-10-09 09:52:31 +02:00
Martin Artnik
252479a748
Merge pull request #6380 from aignatov-bio/ai-sci-9448-fix-tinymce-header-bug
Fix tinymce header bug [SCI-9448]
2023-10-09 09:43:21 +02:00
Martin Artnik
9bf5903c54
Merge pull request #6384 from aignatov-bio/ai-sci-9491-fix-acitvity-type-selector
Fix activity type selector [SCI-9491]
2023-10-09 09:42:50 +02:00
Martin Artnik
1df8ad6f87
Merge pull request #6383 from G-Chubinidze/gc_SCI_9424
CSS:  Various issues [SCI-9424]
2023-10-09 09:41:48 +02:00
Anton
6b6ecf1b43 Fix activity type selector [SCI-9491] 2023-10-09 09:40:42 +02:00
Giga Chubinidze
9b9b486324 CSS: Various issues [SCI-9424] 2023-10-09 11:35:52 +04:00
Anton
4db213b331 Fix tinymce header bug [SCI-9448] 2023-10-09 09:15:43 +02:00