scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-27 01:05:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
14938 commits 50 branches 188 tags 169 MiB
Commit graph

14938 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gregor Lasnibat
744082b524
Merge pull request #6618 from lasniscinote/gl_SCI_9649 
Item card inner navigation behavior improvement [SCI-9649]
 2023-11-10 11:53:00 +01:00
Gregor Lasnibat
2e7868ecd3 Removed duplicated header [SCI_9649] 2023-11-10 11:22:20 +01:00
Gregor Lasnibat
563bb61814 Item card inner navigation behavior improvement [SCI-9649] 2023-11-10 11:06:45 +01:00
Gregor Lasnibat
75cc7734f5
Item card inner navigation behavior improvement [SCI-9649] (#6617) 2023-11-10 10:50:32 +01:00
Soufiane
25225043a7
Fix broken items sidebar animation [SCI-9589] (#6614) 2023-11-10 10:15:03 +01:00
Soufiane
7bc7735da0
Smart annotation not working and some CSS issues [SCI-9616] (#6563) 
* Fix SmartAnnotaion and minor style issues for items card components [SCI-9616]

* Improve code readability and organisation [SCI-9616]
 2023-11-07 12:39:07 +01:00
Soufiane
dbff182314
Edit number/text column inside item card [SCI-9600][SCI-9696] (#6546) 
* Refactor Repository Text and Number value component [SCI-9600]

- Refactor text and number components.
- Add number validation.

* Create a Textarea standalone component [SCI-9600][SCI-9618]
 2023-11-07 12:30:49 +01:00
Gregor Lasnibat
a0da544e27
Merge pull request #6575 from lasniscinote/gl_SCI_9601 
Fixed Translation error for Error message on item card [SCI-9601]
 2023-11-03 14:18:20 +01:00
Gregor Lasnibat
68dc671f06 Fixed Translation error for Error message on item card [SCI-9601] 2023-11-03 11:17:55 +01:00
Gregor Lasnibat
ed49fb6251
Merge pull request #6560 from lasniscinote/gl_SCI_9584 
Refactor inner navigation on item card with improved logic [SCI-9584]
 2023-11-02 16:21:00 +01:00
Gregor Lasnibat
46199340aa Rewriting scrolling logic [SCI-9584] 2023-11-02 13:38:04 +01:00
ajugo
256bc0f9e1
Merge pull request #6555 from sboursen-scinote/sb_SCI-9589 
Opening and closing animation [SCI-9589]
 2023-11-02 13:14:56 +01:00
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
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
sboursen-scinote
8a96c2d29e Add opening and closing transitions to the inventory items sidebar [SCI-9589] 2023-10-30 09:28:22 +01:00
Oleksii Kriuchykhin
ee76488f32 Merge branch 'develop' into features/inventory-item-card-edit 2023-10-27 14:25:32 +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
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
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
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
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
Anton
da3c54b7f0 Merge branch 'develop' into features/bugfixes-and-css 2023-10-25 13:26:06 +02:00
Oleksii Kriuchykhin
e4c0ce58b8 Merge branch 'develop' 2023-10-25 11:34:47 +02:00
Oleksii Kriuchykhin
ac56cb429c Bump version to 1.29.1 2023-10-25 11:33:51 +02:00
Martin Artnik
5972140fd0
Merge pull request #6524 from aignatov-bio/ai-sci-9594-fix-marvinjs-in-edit-mode 
Fix marvinJS in tinymce [SCI-9594]
 2023-10-24 16:33:16 +02:00