From 590e62ca9809640bf06c22c52275b72fdf1fec9b Mon Sep 17 00:00:00 2001 From: Build Automaion Date: Fri, 31 May 2024 17:20:59 +0530 Subject: [PATCH] Integrated latest changes at 05-31-2024 4:30:28 PM --- ej2-react-toc.html | 8 ++++++-- ej2-react/common/globalization/internationalization.md | 1 + .../using-dot-net.md} | 0 .../using-java.md} | 0 4 files changed, 7 insertions(+), 2 deletions(-) rename ej2-react/document-editor/{collaborative-editing.md => collaborative-editing/using-dot-net.md} (100%) rename ej2-react/document-editor/{collaborative-editing-java.md => collaborative-editing/using-java.md} (100%) diff --git a/ej2-react-toc.html b/ej2-react-toc.html index e72d4822e..993a6f363 100644 --- a/ej2-react-toc.html +++ b/ej2-react-toc.html @@ -863,8 +863,12 @@
  • How to Publish DocumentEditor Web API Application in Azure App Service from Visual Studio
  • -
  • Collaborative Editing
  • -
  • Collaborative Editing using Java
  • +
  • Collaborative Editing + +
  • Images
  • Shapes
  • Text Wrapping Style
  • diff --git a/ej2-react/common/globalization/internationalization.md b/ej2-react/common/globalization/internationalization.md index 926ba3198..b15b7e447 100644 --- a/ej2-react/common/globalization/internationalization.md +++ b/ej2-react/common/globalization/internationalization.md @@ -266,6 +266,7 @@ A custom format string must contain one or more of the following standard date/t | h / H | Denotes the hour. *h* for 12 hour and *H* for 24 hours format. | | m | Denotes minutes. | | s | Denotes seconds. | +| f | Denotes milliseconds. | | a | Denotes the am/pm designator it will only be displayed if hour is specified in the h format. | | z | Denotes the time zone. | | ' (single quotes) | To display words in the formatted date you can specify the words with in the single quotes | diff --git a/ej2-react/document-editor/collaborative-editing.md b/ej2-react/document-editor/collaborative-editing/using-dot-net.md similarity index 100% rename from ej2-react/document-editor/collaborative-editing.md rename to ej2-react/document-editor/collaborative-editing/using-dot-net.md diff --git a/ej2-react/document-editor/collaborative-editing-java.md b/ej2-react/document-editor/collaborative-editing/using-java.md similarity index 100% rename from ej2-react/document-editor/collaborative-editing-java.md rename to ej2-react/document-editor/collaborative-editing/using-java.md