Commit graph

14965 commits

Author SHA1 Message Date
Giga Chubinidze
ceb94f72c0 added always on subgroup 2023-11-27 15:01:23 +04:00
Giga Chubinidze
28921bec47 Default Notifications and migration (notifications revamp) [SCI-9695] 2023-11-27 09:21:34 +04:00
aignatov-bio
8a3f56d09d
Merge pull request #6689 from aignatov-bio/ai-sci-fix-notification-migration-format
Symbolize keys
2023-11-22 15:25:11 +01:00
Anton
c03f71528f Symbolize keys 2023-11-22 15:21:01 +01:00
aignatov-bio
1d1f8bc617
Merge pull request #6685 from aignatov-bio/ai-sci-fix-notification-migration-format
Fix notification migration
2023-11-22 14:15:51 +01:00
Anton
203e28dbfe Fix notification migration 2023-11-22 13:52:27 +01:00
Martin Artnik
720eceb59f
Merge pull request #6557 from artoscinote/ma_SCI_9608
Implement general notification mailer [SCI-9608]
2023-11-21 14:49:06 +01:00
Martin Artnik
e0cd9cf9fd Implement general notification mailer [SCI-9608] 2023-11-21 14:21:55 +01:00
aignatov-bio
7367fd4fba
Merge pull request #6674 from G-Chubinidze/gc_SCI_9562_v2
Implement Task Due Date Reminder notification [SCI-9562]
2023-11-21 12:15:04 +01:00
Martin Artnik
da21a2d840
Merge pull request #6676 from G-Chubinidze/gc_SCI_9678
Fix tests for notifications [SCI-9678]
2023-11-21 10:28:23 +01:00
Giga Chubinidze
94e2541de3 Fix tests for notifications [SCI-9678] 2023-11-21 13:08:12 +04:00
Giga Chubinidze
5f35b4510c added MyModules module 2023-11-21 10:59:16 +04:00
wandji
7a916b7d11
Add activities to inventories [SCI-5578] (#6588)
* Add activities for stock consumption and inventories export and inventory item file edit [SCI-5578]

* Improve check for creating inventory item asset activity [5578]

* Improve query for inventory items in consumption export [SCI-5578]
2023-11-20 13:37:57 +01:00
Martin Artnik
d2662e9274
Merge pull request #6587 from ivanscinote/SCI-9561-implement-repository-date-reminder-notification
Implement repository date reminder notification [SCI-9561]
2023-11-14 09:40:11 +01:00
aignatov-bio
be1c1613f9
Merge pull request #6611 from aignatov-bio/ai-sci-9634-fix-notifications-migration
Fix notifications migration [SCI-9634]
2023-11-09 10:40:31 +01:00
Anton
5c402cae08 Fix notifications migration [SCI-9634] 2023-11-09 10:33:42 +01:00
Ivan Kljun
4481541a9f Implement repository date reminder notification [SCI-9561] 2023-11-07 11:36:23 +01:00
Martin Artnik
08c817299d
Merge pull request #6561 from G-Chubinidze/gc_SCI_9562
Implement Task Due Date Reminder notification [SCI-9562]
2023-11-03 13:23:11 +01:00
Giga Chubinidze
e7958ed40c hound fix 2023-11-03 13:14:10 +04:00
Giga Chubinidze
370a0ecad5 logic / migration updates 2023-11-03 13:09:48 +04:00
Giga Chubinidze
dd2a4a4047 Implement Task Due Date Reminder notification [SCI-9562] 2023-11-02 07:07:35 +04:00
Martin Artnik
6308779668 Merge branch 'develop' into features/notification-revamp 2023-10-27 12:04:07 +02:00
dependabot[bot]
16722727fb
Bump tinymce from 6.5.1 to 6.7.1 (#6509)
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce) from 6.5.1 to 6.7.1.
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md)
- [Commits](https://github.com/tinymce/tinymce/commits/6.7.1/modules/tinymce)

---
updated-dependencies:
- dependency-name: tinymce
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-27 11:13:21 +02:00
dependabot[bot]
32da865a0c
Bump browserify-sign from 4.2.1 to 4.2.2 (#6542)
Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-27 10:47:59 +02:00
Martin Artnik
22c567d6ae
Merge pull request #6541 from scinote-eln/features/bugfixes-and-css
Features/bugfixes and css
2023-10-27 10:29:29 +02:00
Martin Artnik
5a073b1364
Merge branch 'develop' into features/bugfixes-and-css 2023-10-27 10:29:13 +02:00
Martin Artnik
88b8498dc2
Merge pull request #6540 from scinote-eln/master
Merge master
2023-10-26 15:35:23 +02:00
Martin Artnik
dd70adb59f
Merge pull request #6539 from scinote-eln/hotfix/1.29.1.1
Hotfix/1.29.1.1
2023-10-26 15:28:23 +02:00
Martin Artnik
761b2ebf21
Bump version to 1.29.1.1 2023-10-26 15:27:44 +02:00
Martin Artnik
dc24643cf2
Merge pull request #6537 from scinote-eln/revert-6536-ai-sci-9588-add-paste-image
Revert "Break after first image [SCI-9588]"
2023-10-26 14:58:38 +02:00
Martin Artnik
5fb1a00a21
Revert "Break after first image [SCI-9588]" 2023-10-26 14:58:27 +02:00
Martin Artnik
0fb6d8c54d
Merge pull request #6536 from aignatov-bio/ai-sci-9588-add-paste-image
Break after first image [SCI-9588]
2023-10-26 14:35:10 +02:00
Anton
c90aa8ee62 Break after first image [SCI-9588] 2023-10-26 14:33:44 +02:00
Martin Artnik
0696af987c
Merge pull request #6535 from aignatov-bio/ai-sci-9588-add-paste-image
Fix web insert image [SCI-9127]
2023-10-26 14:27:06 +02:00
Anton
a4e48c798d Fix web insert image [SCI-9127] 2023-10-26 14:24:45 +02:00
Martin Artnik
c79669ba3f
Merge pull request #6534 from aignatov-bio/ai-sci-9588-add-paste-image
Fix i18n for clipboard modal [SCI-9588]
2023-10-26 13:34:19 +02:00
Anton
fded38a5a6 Fix i18n for clipboard modal [SCI-9588] 2023-10-26 13:32:17 +02:00
Alex Kriuchykhin
72ef510edc
Update Travis CI config, temporary switch to only API tests for CI (#6528) 2023-10-26 13:29:52 +02:00
Martin Artnik
590648b4b5
Merge pull request #6533 from aignatov-bio/ai-sci-9588-add-paste-image
Fix image ratio
2023-10-26 13:26:29 +02:00
Anton
261f853b03 Fix image ratio 2023-10-26 13:24:29 +02:00
Martin Artnik
605d5bfcb7
Merge pull request #6532 from aignatov-bio/ai-sci-9588-add-paste-image
Add image paster [SCI-9588]
2023-10-26 12:17:41 +02:00
Anton
0ffd3dcee3 Add image paster [SCI-9588] 2023-10-26 12:15:30 +02:00
Martin Artnik
3ff7bde1c2
Merge pull request #6531 from artoscinote/ma_SCI_9587
Remove max with from result and step text fields [SCI-9587]
2023-10-26 10:24:37 +02:00
Martin Artnik
e8299c2851 Remove max with from result and step text fields [SCI-9587] 2023-10-26 10:23:14 +02:00
Martin Artnik
2a5b596e2b
Merge pull request #6515 from G-Chubinidze/gc_SCI_9533
Text doesn't fit in the flyout when a linked PT has been changed [SCI-9533]
2023-10-26 10:11:02 +02:00
Martin Artnik
2888b5309a
Merge pull request #6526 from G-Chubinidze/gc_SCI_9432
[CAPA] - When creating tasks designated user activity is missing - No notification is sent [SCI-9432]
2023-10-26 10:10:39 +02:00
G-Chubinidze
7fc1126aa9
Update my_modules_controller.rb 2023-10-26 11:29:13 +04:00
aignatov-bio
df1b54d5d0
Merge pull request #6530 from aignatov-bio/ai-sci-9599-fix-dropdown-click-away
Fix dropdown click aways [SCI-9599]
2023-10-25 14:31:28 +02:00
Anton
7515c979dd Fix dropdown click aways [SCI-9599] 2023-10-25 14:29:08 +02:00
aignatov-bio
ff667a3a2b
Merge pull request #6529 from scinote-eln/features/navigator-resize
Features/navigator resize
2023-10-25 14:05:14 +02:00