Commit graph

15191 commits

Author SHA1 Message Date
wandji
4fd3933bdb
Fix wrong placeholders for item card fields in edit mode [SCI-9615] (#6553)
* Fix wrong placeholders for item card fields in edit mode [SCI-9615]

* Refactor date time range className [SCI-9615]
2023-10-30 17:30:23 +01:00
Alex Kriuchykhin
d3ba70c2bf
Fix file previews in project exports [SCI-9619] (#6548) 2023-10-30 17:28:53 +01:00
Anton
70bbc0af47 Add new datetime picker [SCI-9127] 2023-10-30 15:19:39 +01:00
Ivan Kljun
6dd917552e Add timestap to bypass Chrome cache for TinyMCE images [SCI-9597] 2023-10-30 15:01:14 +01:00
ajugo
e73543dd90
Fix team permission scope for service API [SCI-9611] (#6554) 2023-10-30 12:54:55 +01:00
wandji
a16de72611
Mange stock modal improvements [SCI-9591] (#6545)
* Mange stock modlla improvements [SCI-9591]

* Fix manage stock modal close button [SCI-9591]

* Update manage stock url after update stock value [SCI-9591]
2023-10-30 09:47:10 +01:00
ajugo
c1e3472d46
Fix failing api test because of randomness [SCI-9569] (#6549) 2023-10-30 09:42:49 +01:00
sboursen-scinote
8a96c2d29e Add opening and closing transitions to the inventory items sidebar [SCI-9589] 2023-10-30 09:28:22 +01:00
Martin Artnik
9fbbb185e0
Merge pull request #6550 from sboursen-scinote/sb_SCI-9557
Replace Scinote Icons [SCI-9557]
2023-10-30 08:57:44 +01:00
Martin Artnik
81bc7bd2db
Merge pull request #6551 from G-Chubinidze/gc_SCI_9596
Filter by archived result does not find anything [SCI-9596]
2023-10-30 08:57:06 +01:00
Giga Chubinidze
9cb1e45302 Filter by archived result does not find anything 2023-10-30 04:53:55 +04:00
sboursen-scinote
b93baeb730 Replace Scinote Icons [SCI-9557] 2023-10-28 12:51:11 +02:00
Oleksii Kriuchykhin
ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +02: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
Alex Kriuchykhin
ccd2d0b4df
Add compatibility with ActiveDirectory Federation Services (#6543) 2023-10-27 11:06:48 +02:00
Oleksii Kriuchykhin
a7c587ca1c Revert chages to shared inline editing component [SCI-9412] 2023-10-27 10:59:28 +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
wandji
c22d1e226b
Add new stock management modal and edit itemm card stock fields [SCI-9415] (#6474)
* Add edit fetaure to item card stock field [SCI-9415]

* Replace manage stock modal [SCI-9415]

* Fix issue displaying item card [SCI-9415]

* Minor improvements [SCI-9415]

* Enable stock modal in assigned inventories [SCI-9415]

* Use toggleable reminder value [SCI-9415]
2023-10-27 10:31:38 +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
mvrazic
e4f49a86ab
e2e - modified tags where names were used [SCI-9620] (#6538) 2023-10-26 16:03:58 +02:00
Oleksii Kriuchykhin
6235a03595 Merge branch 'develop' into e2e 2023-10-26 15:36:36 +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
Anton
226d189789 Add new datetime pciker [SCI-9127] 2023-10-26 15:01:26 +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
ajugo
7c54509c58
Add editing of asset files for repository items sidebar [SCI-9413] (#6448) 2023-10-26 12:59:11 +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
Soufiane
e8cb940665
Fix 500 error when clicking on another item [SCI-9595] (#6527) 2023-10-25 13:47:06 +02:00