diff --git a/Web/Controls/Help/FAQ/General/GeneralFAQ.ascx b/Web/Controls/Help/FAQ/General/GeneralFAQ.ascx index 1c753e79c..82642c48a 100644 --- a/Web/Controls/Help/FAQ/General/GeneralFAQ.ascx +++ b/Web/Controls/Help/FAQ/General/GeneralFAQ.ascx @@ -98,7 +98,13 @@

-
+
+
What is the database ONLYOFFICE stores documents/projects/emails in?
+
+

ONLYOFFICE Workspace and ONLYOFFICE DocSpace use MySQL; ONLYOFFICE Docs uses PostgreSQL.

+
+
+
I have a question that isn't covered here. How can I contact you?

diff --git a/Web/Controls/Help/GettingStarted/CRM/CRMGettingStarted.ascx b/Web/Controls/Help/GettingStarted/CRM/CRMGettingStarted.ascx index c679676c8..9e66a90d9 100644 --- a/Web/Controls/Help/GettingStarted/CRM/CRMGettingStarted.ascx +++ b/Web/Controls/Help/GettingStarted/CRM/CRMGettingStarted.ascx @@ -65,26 +65,26 @@

Overview

-

CRM, or Customer Relationship Management, is a strategy used by many companies and aimed at getting more information about their customers' needs and behaviors in order to improve their interactions, therefore reducing the company costs and increasing their profitability.

+

CRM, or Customer Relationship Management, is a strategy used by many companies and aimed at getting more information about their customers' needs and behaviors in order to improve their interactions, therefore reducing the company's costs and increasing their profitability.

CRM is a simple customer relationship management tool which helps achieve these goals providing you with:

  • a unique place for your customer database, -

    CRM is a modern alternative to a spreadsheet used by many companies to store their customers' data. Unlike the spreadsheets CRM offers a multi-user access to the stored data, moreover it allows you to restrict access to some contacts making them private so that only the authorized people could view and edit them.

    +

    CRM is a modern alternative to a spreadsheet used by many companies to store their customers' data. Unlike spreadsheets, CRM offers multi-user access to the stored data; moreover, it allows you to restrict access to some contacts making them private so that only authorized people could view and edit them.

  • several ways to add new contacts to your customer database, -

    Add contacts one by one manually entering the available data, or import your contacts all at once from a .csv file, or even add contacts automatically creating a Website Contact Form.

    +

    Add contacts one by one by manually entering the available data, import your contacts all at once from a .csv file, or even add contacts automatically creating a Website Contact Form.

  • a simple way to arrange your contacts,

    Divide your contacts into types and add tags. It helps you create special marketing campaigns, track your contacts and simply facilitate the contact search process.

  • a great opportunity to keep track of the potential sales, -

    Create opportunities and link them with projects to organize the work and make the sale management easier and more effective.

    +

    Create opportunities and link them with projects to organize the work and make sales management easier and more effective.

  • a possibility to bill your customers in seconds, -

    Make an invoice for products and services provided and send it to your customers using the contact information stored in your customer database.

    +

    Make an invoice for the products and services provided and send it to your customers using the contact information stored in your customer database.

  • an effective way to organize a common event for your customers, -

    Use cases to plan and keep track of a common event: add tasks to manage your team work, store all the realated documentation in one place, track the work history.

    +

    Use cases to plan and keep track of a common event: add tasks to manage your team's work, store all the related documentation in one place, and track the work history.

  • an easy and convenient way to call your customers right from a web browser,

    Use the VoIP functionality to receive incoming calls from your customers and make outgoing calls right from your portal.

    @@ -97,36 +97,36 @@

    Adding contacts

    -

    There's no doubt that it's very important to keep all information about clients in order, so that it can be quickly accessible and easily updated. The CRM module allows you to create your own customer database, whether your clients are big companies or single individuals.

    +

    There's no doubt that it's very important to keep all information about clients in order so that it can be quickly accessible and easily updated. The CRM module allows you to create your own customer database, whether your clients are big companies or single individuals.

    To add a new contact to your customer database:

    1. Click the Create button in the upper left corner and select one of two options: Person or Company.
    2. Fill in the obligatory fields: First Name and Last Name for persons, Company Name for companies.
    3. Select a Contact Type or leave the type not specified.
      - The portal and CRM administrators can change the default contact types according to their company needs. Just click the Contact Types link in the Settings >> Contact settings section. For more details please refer to ">this article. + The portal and CRM administrators can change the default contact types according to their company's needs. Just click the Contact Types link in the Settings >> Contact settings section. For more details, please refer to ">this article.
    4. Enter any other available information: Email, Phone, Web Site/Social Networks, Address, Description. <%--

      To facilitate this process, make use of the Find in CrunchBase option. If the company you create is present in this base, you could view and select the information you need after clicking the Find in CrunchBase link below the Company Name field.

      --%> -

      To enter some additional information customize user fields. To do that, first of all save the currently created contact. Otherwise all the entered information will be lost. Then expand the Settings >> Other settings section on the left side panel and click the User Fields link.

      -

      For more details please refer to ">this article.

      +

      To enter some additional information, customize user fields. To do that, first of all, save the currently created contact. Otherwise, all the entered information will be lost. Then expand the Settings >> Other settings section on the left side panel and click the User Fields link.

      +

      For more details, please refer to ">this article.

      This function is available for portal and CRM administrators only.
      5. -
    5. Select the Currency for this contact from the list of the available ones. The selected currency will be used in the invoices you create for this contact.
      6. -
    6. Add some existing Tags selecting them from the list or create a new one.
      7. +
    7. Select the Currency for this contact from the list of available ones. The selected currency will be used in the invoices you create for this contact.
      8. +
    8. Add some existing Tags selecting them from the list, or create a new one.
    9. Upload a photo. -

      To add/change a picture click the Change photo link below the image area. The Choose a profile photo window will open. If you wish to upload a picture from PC click the Browse button, locate a desired picture stored on your hard disk drive and double-click it to load.

      -
      You can upload an image not larger than 200x300 pixels, otherwise resizing will take place. The maximum image size cannot exceed 1 MB.
      -

      If you previously filled the social network user field in the contact profile the images from the social networks will be displayed in the Choose a profile photo window. Click the one you wish to use for a contact.

      +

      To add/change a picture, click the Change photo link below the image area. The Choose a profile photo window will open. If you wish to upload a picture from your PC, click the Browse button, locate the required picture stored on your hard disk drive, and double-click it to load.

      +
      You can upload an image no larger than 200x300 pixels; otherwise, resizing will take place. The maximum image size cannot exceed 1 MB.
      +

      If you previously filled out the social network user field in the contact profile, the images from the social networks will be displayed in the Choose a profile photo window. Click the one you wish to use for a contact.

    10. Assign a contact manager. -

      By default, the contact you create is assigned to you. If you wish to appoint another manager for this contact, click the Add user link and select the necessary user. The selected user will be notified about a new contact assigned to him/her.

      +

      By default, the contact you create is assigned to you. If you wish to appoint another manager for this contact, click the Add user link and select the necessary user. The selected user will be notified about a new contact assigned to them.

    11. Make the contact available to other users. -

      By default, the access to the newly created contact is granted to its managers only. Check the Allow access to the company/person for all CRM users box if you wish to grant access to all CRM users i.e. make the contact public. Specify the access type selecting the necessary option from the drop-down list:

      +

      By default, the access to the newly created contact is granted to its managers only. Check the Allow access to the company/person for all CRM users box if you wish to grant access to all CRM users, i.e., make the contact public. Specify the access type by selecting the necessary option from the drop-down list:

      • for reading - to allow all users to view this contact (this option is selected by default),
      • for reading/writing - to allow all users to view and edit this contact.
        • @@ -142,16 +142,16 @@

    To add several contacts at once,

    -

    Make use of the Import contacts option. This option helps you move all your contacts from a .csv file to CRM module without efforts. To do that, just click the More Actions button" /> button to the right of the Create button, select the Import contacts option and follow the step by step instructions.

    -

    For more details please refer to ">this article.

    +

    Make use of the Import contacts option. This option helps you move all your contacts from a .csv file to CRM module without effort. To do that, just click the More Actions button" /> button to the right of the Create button, select the Import contacts option, and follow the step-by-step instructions.

    +

    For more details, please refer to ">this article.

    To add contacts automatically,

    -

    Use the Website Contact Form. This option allows you to build a form that you can publish on your site. Your potential customers will be automatically added to your customer database when they contact you via the online form embedded on your web page. To do that, click the Website Contact Form link from the Settings list on the left side panel and follow the step by step instructions.

    +

    Use the Website Contact Form. This option allows you to build a form that you can publish on your site. Your potential customers will be automatically added to your customer database when they contact you via the online form embedded on your web page. To do that, click the Website Contact Form link from the Settings list on the left side panel and follow the step-by-step instructions.

    This function is available for portal and CRM administrators only.
    -

    For more details please refer to ">this article.

    -

    Once your clients are manually created through the Create new company/person form, imported from a .csv file, or automatically added via Website Contact Form, they will be all included in the Contacts list of the CRM module.

    +

    For more details, please refer to ">this article.

    +

    Once your clients are manually created through the Create new company/person form, imported from a .csv file, or automatically added via the Website Contact Form, they will all be included in the Contacts list of the CRM module.

    To update the available contact information,

      @@ -170,24 +170,24 @@

      Assigning tasks

      -

      The Tasks section gives you a full overview of coming duties at a glance. Collaborating with a client you can create tasks for yourself or assign them to other colleagues.

      +

      The Tasks section gives you a full overview of coming duties at a glance. When you collaborate with a client, you can create tasks for yourself or assign them to other colleagues.

      To set a task:

      1. Click the Create button in the upper left corner and select the Task option.
      2. Enter a Title for your task.
      3. Select an appropriate task Category from the drop-down list.
        - The portal and CRM administrators can change the default task categories according to their company needs. Just click the Task Categories link in the Settings >> Other settings section. For more details please refer to ">this article. + The portal and CRM administrators can change the default task categories according to their company's needs. Just click the Task Categories link in the Settings >> Other settings section. For more details, please refer to ">this article.
      4. Enter a contact you wish to link your task with.
      5. Set a desired Due date: date and time. -

        To do that, use one of the available options: Today, 3 days, Week, or select it from the calendar, or enter it manually in the following format dd/mm/yyyy.

        +

        To do that, use one of the available options: Today, 3 days, Week, or select it from the calendar, or enter it manually in the following format: dd/mm/yyyy.

      6. Set a task reminder. -

        By default, you will be informed about your task a day before its due date. If you want to change the reminder time, open the Alert drop-down list and select one of the available options: 5 minutes, 15 minutes, half an hour, an hour, 2 hours, a day. To switch the reminder off select the never option from the drop-down list.

        7. +

        By default, you will be informed about your task a day before its due date. If you want to change the reminder time, open the Alert drop-down list and select one of the available options: 5 minutes, 15 minutes, half an hour, an hour, 2 hours, a day. To switch the reminder off, select the never option from the drop-down list.

      7. Select the responsible person you wish to assign this task to from the Assigned to list. -

        By default, the task is assigned to you. To change the responsible person just click the link with your name and select the user you need. Leave the Notify box checked if you wish the responsible person to be notified about the new task assign to him/her.

        +

        By default, the task is assigned to you. To change the responsible person, just click the link with your name and select the user you need. Leave the Notify box checked if you wish the responsible person to be notified about the new task assign to them.

      8. Enter a short Description.
      9. Click the Save button.
        10. @@ -199,24 +199,24 @@

      It's also possible to create a task within an opportunity or a case.

        -
      1. open an appropriate opportunity/case page clicking its title,
        2. +
      2. open an appropriate opportunity/case page by clicking its title,
      3. switch to the Tasks tab below its title,
        4. -
      4. click the Create task link if there is no tasks or use the Create button in the upper left corner and select the Task option,
        5. -
      5. fill in the Create new task form,
        6. +
      6. click the Create task link if there are no tasks, or use the Create button in the upper left corner and select the Task option,
        7. +
      7. fill out the Create new task form,
      8. click the Save button.

      This task will be automatically linked to the selected opportunity/case.

      -

      To add the same task linked with different contacts make use of the Create New Task group operation,

      +

      To add the same task linked to different contacts, make use of the Create New Task group operation,

      1. open the Contacts list,
        2. -
      2. select the contacts you need checking the box to the left,
        3. +
      3. select the contacts you need by checking the box to the left,
      4. click the Create New Task button at the top of the Contacts list,
        5. -
      5. fill in the Create new task form,
        6. +
      6. fill out the Create new task form,
      7. click the Save button.

      The tasks will be added to the Tasks list.

      -

      To learn more about Group Operations available in CRM please refer to ">this article.

      +

      To learn more about Group Operations available in CRM, please refer to ">this article.

      If you need to edit a task,

        @@ -225,7 +225,7 @@
      1. select the Edit task option from the Actions drop-down list,
      2. make all the changes you need and click the Save Changes button.
      -

      Once the task is completed close it right in the Tasks list changing its status from Open to Closed. To do that, just click the arrow Arrow" /> to the left of the task title and select the necessary status from the list.

      +

      Once the task is completed, close it right in the Tasks list by changing its status from Open to Closed. To do that, just click the arrow Arrow" /> to the left of the task title and select the necessary status from the list.

      To delete a task, choose the corresponding option from the Actions drop-down list.

    @@ -233,30 +233,30 @@

    Managing opportunities

    -

    An opportunity is used to keep track of the potential sales, their estimated due date, budget and success probability and help you manage your sales more easily and effectively.

    +

    An opportunity is used to keep track of potential sales, their estimated due date, budget and success probability, and to help you manage your sales more easily and effectively.

    To add an opportunity:

    1. Click the Create button in the upper left corner and select the Opportunity option.
    2. Enter a Title for your opportunity.
      3. -
    3. Enter an opportunity Contact - person or company - selecting it from your customer database.
      4. +
    4. Enter an opportunity Contact (person or company) by selecting it from your customer database.
    5. Add a short Description.
    6. Specify your opportunity Budget currency, amount and type.
    7. Set the Estimated deal due date using the calendar.
    8. Select a Responsible for your opportunity from the drop-down list.
      9. -
    9. Set an opportunity Stage using the drop-down list. The Success probability in percent will set accordingly. +
    10. Set an opportunity Stage using the drop-down list. The Success probability in percent will be set accordingly.
      - The portal and CRM administrators can change the default opportunity stages according to their company needs. Just click the Opportunity Stages link in the Settings >> Other settings section. For more details please refer to ">this article. + The portal and CRM administrators can change the default opportunity stages according to their company's needs. Just click the Opportunity Stages link in the Settings >> Other settings section. For more details, please refer to ">this article.
    11. Enter other requested information, if available. -

      To enter some additional information customize user fields. To do that, first of all save the currently created opportunity. Otherwise all the entered information will be lost. Then explore the Settings >> Other settings section on the left side panel and click the User Fields link.

      -

      For more details please refer to ">this article.

      +

      To enter some additional information, customize user fields. To do that, first of all, save the currently created opportunity. Otherwise, all the entered information will be lost. Then explore the Settings >> Other settings section on the left side panel and click the User Fields link.

      +

      For more details, please refer to ">this article.

      This function is available for portal and CRM administrators only.
      12. -
    12. Restrict access to your opportunity checking the corresponding box. -

      By default, the access to the newly created opportunity is granted to all portal users. Check the Restrict access to the opportunity box and select the users you wish to grant the access to clicking the Add users link. The selected users will be notified about new opportunity added and will be able to view and edit it.

      +
    13. Restrict access to your opportunity by checking the corresponding box. +

      By default, the access to the newly created opportunity is granted to all portal users. Check the Restrict access to the opportunity box and select the users you wish to grant the access to by clicking the Add users link. The selected users will be notified about the new opportunity added and will be able to view and edit it.

    14. Click the Save button or use the Save and Create New Opportunity button to start creating a new opportunity right after saving the current one.
    @@ -265,19 +265,19 @@ Add opportunity" />
    -

    The created opportunity will be added to the Opportunities list. You can access it either from the Opportunities list clicking the corresponding link on the left side panel or clicking the client name in the Contacts list and switching to the Opportunities tab inside.

    +

    The created opportunity will be added to the Opportunities list. You can access it either from the Opportunities list by clicking the corresponding link on the left-side panel, or by clicking the client name in the Contacts list and switching to the Opportunities tab inside.

    -

    To organize the work on your opportunity more efficiently you can create a project. To do that,

    +

    To organize the work on your opportunity more efficiently, you can create a project. To do that,

    1. select the opportunity you need in the Opportunities list,
    2. click the Actions Icon" /> icon to the right of the opportunity title,
    3. select the Create project option from the drop-down list,
      4. -
    4. fill in the form and click the Save button.
      5. +
    5. fill out the form and click the Save button.

    Each time your customer relations take a step forward, the opportunity related to this client goes to a new stage. To change the opportunity stage,

      -
    1. open the opportunity overview page clicking its title,
      2. +
    2. open the opportunity overview page by clicking its title,
    3. select one of the available stages from the corresponding drop-down list.
    @@ -300,30 +300,30 @@
    1. Click the Create button in the upper left corner and select the Invoice option.
    2. Check your Invoice number. -

      By default, the invoice number is generated automatically using the INV prefix and the number in the ####### format starting from 0000001. But you can easily change it while creating an invoice. To do that, just click the Change format link next to the Invoice number field. Enter a necessary Prefix and the Start number.

      +

      By default, the invoice number is generated automatically using the INV prefix and the number in the ####### format, starting from 0000001. But you can easily change it while creating an invoice. To do that, just click the Change format link next to the Invoice number field. Enter the necessary Prefix and the Start number.

      If you don't want the invoice number to be generated automatically, uncheck the automatically generated case. After that you will be able to enter any number you need manually.

      This option is available for portal and CRM administrators only.
      3. -
    3. Set the Invoice date selecting it from the calendar, or entering it manually in the following format dd/mm/yyyy. -

      The Invoice date is the date the invoice is issued.

      +
    4. Set the Invoice date selecting it from the calendar, or entering it manually in the following format: dd/mm/yyyy. +

      The Invoice date is the date the invoice was issued.

    5. Select a Client you wish to create the invoice for using the search field. -

      The system will use the billing address information stored on your customer database. If necessary, you can change it using the Edit billing address link which appears below the client name once it is selected.

      +

      The system will use the billing address information stored in your customer database. If necessary, you can change it using the Edit billing address link that appears below the client name once it is selected.

    6. Select a Consignee using the search field. -

      If the Consignee coincides with the Client, just check the coincides with the client box and add the delivery address using the corresponding link which appears next to the Edit billing address link.

      +

      If the Consignee coincides with the Client, just check the coincides with the client box and add the delivery address using the corresponding link that appears next to the Edit billing address link.

    7. Link the invoice with one of the available opportunities.
      8. -
    8. Set a Due date using one of the available options to the right: Due on receipt, 15 days, 30 days or 45 days, or selecting it from the calendar, or entering it manually in the following format dd/mm/yyyy. +
    9. Set a Due date using one of the available options to the right: Due on receipt, 15 days, 30 days or 45 days, or select it from the calendar, or enter it manually in the following format: dd/mm/yyyy.

      The Due date is the date by which the invoice needs to be paid.

      10. -
    10. Select the Invoice language from the list of the available ones.
      11. -
    11. Select the Currency for your invoice. By default, the currency specified in the profile of the client is used. If the currency is not set in the client's profile, the default currency specified in the CRM settings is used. If necessary, you can select any other currency from the list of the available ones. +
    12. Select the Invoice language from the list of available ones.
      13. +
    13. Select the Currency for your invoice. By default, the currency specified in the profile of the client is used. If the currency is not set in the client's profile, the default currency specified in the CRM settings is used. If necessary, you can select any other currency from the list of available ones.

      If you select a currency that differs from the default currency specified in the CRM settings, the Exchange rate field is also displayed. Set the appropriate conversion rate and click the Save button.

      - The portal and CRM administrators can change the default currency and set conversion rates for the currencies from the list in the Settings >> Currency settings section. For more details please refer to ">this article. + The portal and CRM administrators can change the default currency and set conversion rates for the currencies from the list in the Settings >> Currency settings section. For more details, please refer to ">this article.
    14. Enter a PO Number, if available.
      15. @@ -334,10 +334,10 @@

      These notes will be displayed on your invoice and added to the message body if you send the invoice per ONLYOFFICE Mail.

    15. Fill in the Products & Services section. -

      List the services/products you provided for your client. You can select them from the list, if available, or create right there opening the Select item list and clicking the Create new item link.

      +

      List the services/products you provided for your client. You can select them from the list, if available, or create right there by opening the Select item list and clicking the Create new item link.

      Enter the item Quantity and Discount, if applicable.

      -

      Add the sale Tax or leave this field empty. You can select the tax to apply from the list, if already available, or create a new one right there opening the Tax list and clicking the Create new tax link.

      -

      In the same way you can add as many services/products as you need.

      +

      Add the sales Tax or leave this field empty. You can select the tax to apply from the list, if already available, or create a new one right there opening the Tax list and clicking the Create new tax link.

      +

      In the same way, you can add as many services/products as you need.

    16. Check the Subtotal and Total calculated automatically based on the information provided above.
    17. Click the Add This Invoice button or use the Add and Create New Invoice button to start creating a new invoice right after saving the current one. @@ -348,15 +348,15 @@ Make invoice" />
    -

    To specify your company information for the invoice, expand the Settings list at the left side panel, select the Invoice settings section and click the Organization profile link.

    +

    To specify your company information for the invoice, expand the Settings list on the left-side panel, select the Invoice settings section, and click the Organization profile link.

    This option is available for portal and CRM administrators only.

    Here you can:

    1. enter your company name,
      2. -
    2. add your company logo clicking the Change Logo button below the default image,
      3. -
    3. set your organization billing address filling in the Address section fields.
      4. +
    4. add your company logo by clicking the Change Logo button below the default image,
      5. +
    5. set your organization billing address by filling in the Address section fields.

    All this information will be placed and displayed on your invoices.

    @@ -380,7 +380,7 @@
  • select the Edit invoice option from the Actions drop-down list,
  • make all the changes you need and click the Save Changes button.
    • -

    Using the Actions drop-down menu you can also download, print, send, duplicate or delete the selected invoice.

    +

    Using the Actions drop-down menu, you can also download, print, send, duplicate or delete the selected invoice.

@@ -388,7 +388,7 @@

Organizing cases

-

The Cases section is aimed to simplify event organization, seminar and meeting arrangement etc. with a group of customers.

+

The Cases section is designed to simplify event organization, seminar and meeting arrangements, etc., with a group of customers.

To plan an event:

  1. Click the Create button in the upper left corner and select the Case option.
    2. @@ -396,20 +396,20 @@
  2. Select your case Participant from the customer database.

    You can add as many participants as you wish using the search field. To delete a participant added by mistake, use the Unlink contact Icon" /> icon.

    3. -
  3. Add tags, if necessary, clicking the Add tag link and selecting one of the available tags or creating a new one.
    4. +
  4. Add tags, if necessary, by clicking the Add tag link and selecting one of the available tags or creating a new one.
  5. Enter other requested information, if available. -

    To enter some additional information customize user fields. To do that, first of all save the currently created case. Otherwise all the entered information will be lost. Then explore the Settings >> Other settings section on the left side panel and click the User Fields link.

    -

    For more details please refer to ">this article.

    +

    To enter some additional information, customize user fields. To do that, first of all, save the currently created case. Otherwise, all the entered information will be lost. Then explore the Settings >> Other settings section on the left side panel and click the User Fields link.

    +

    For more details, please refer to ">this article.

    This function is available for portal and CRM administrators only.
    6. -
  6. Restrict access to your case checking the corresponding box. -

    By default, the access to the newly created case is granted to all portal users. Check the Restrict access to the case box and select the users you wish to grant the access to clicking the Add users link. The selected users will be notified about new case created and will be able to view and edit it.

    +
  7. Restrict access to your case by checking the corresponding box. +

    By default, the access to the newly created case is granted to all portal users. Check the Restrict access to the case box and select the users you wish to grant the access to by clicking the Add users link. The selected users will be notified when a new case is created and will be able to view and edit it.

  8. Click the Save button or use the Save and Create New Case button to start creating a new case right after saving the current one.
-

Once a case is created, you can schedule events, assign tasks, manage participants, store the related documentation.

+

Once a case is created, you can schedule events, assign tasks, manage participants, and store the related documentation.

For more information, please refer to ">this article.

Add case" /> @@ -424,7 +424,7 @@
  • select the Edit case option from the drop-down list,
  • make all the changes you need and click the Save Changes button.
    • -

    After your case took place you can close it in the system. To do that, just check the box to the left of the case title.

    +

    After your case took place, you can close it in the system. To do that, just check the box to the left of the case title.

    To delete a case, choose the corresponding option from the Actions drop-down list.

    @@ -433,18 +433,18 @@

    Using VoIP

    The VoIP feature allows you to receive incoming calls from your customers and make outgoing calls right from a web browser.

    -

    To use the IP telephony functionality, you need to sign up for a Twilio account and connect it to your portal specifying API credentials: Account SID and Auth token. They can be found at the Twilio Console page in the 'Account Summary' section.

    +

    To use the IP telephony functionality, you need to sign up for a Twilio account and connect it to your portal specifying API credentials: Account SID and Auth token. They can be found on the Twilio Console page in the 'Account Summary' section.

    The ability to connect a Twilio account is available for portal administrators only.
    -

    Click the Settings Icon" /> icon at the top of the page to go to your portal settings and open the Integration -> Third-Party Authorization section. Click the switcher next to the Twilio service, specify API credentials in the appropriate fields and click the Enable button.

    +

    Click the Settings Icon" /> icon at the top of the page to go to your portal settings and open the Integration -> Third-Party Authorization section. Click the switcher next to the Twilio service, specify API credentials in the appropriate fields, and click the Enable button.

    Once you connect your Twilio account to the portal, you will be able to add and manage virtual numbers.

    To add a virtual number,

    1. In the CRM module, go to the Settings section on the left-side panel and click the VoIP Settings option.
    2. Click the Buy phone number link.
      3. -
    3. In the Number purchase window, select the necessary number from the list of the available ones and press the Buy phone number button. +
    4. In the Number purchase window, select the necessary number from the list of available ones and press the Buy phone number button.

      If you already have some phone numbers purchased earlier in your Twilio account, you can use the Link purchased number option. In a new window, select one of the available Twilio virtual numbers and click the Link purchased number button.

    @@ -457,8 +457,8 @@
    1. In the Virtual numbers and operators list, select the number you want to set up.
    2. Click the Outgoing calls switcher to enable the possibility to not only receive incoming calls but also make outgoing calls using this number.
      3. -
    3. Click the Call recording switcher to enable the possibility to record all incoming and outgoing calls for this number so that you will be able to listen to the necessary call recording later.
      4. -
    4. Click the Arrow Icon" /> arrow to the left of the necessary number to Add operators who should be able to use this virtual number. Check the necessary portal users in the list and click the Save button. Once operators are added, the VoIP VoIP Icon" /> icon will be available for them on the top of the page. +
    5. Click the Call recording switcher to enable the possibility of recording all incoming and outgoing calls for this number so that you will be able to listen to the necessary call recording later.
      6. +
    6. Click the Arrow Icon" /> arrow to the left of the necessary number to Add operators who should be able to use this virtual number. Check the necessary portal users in the list and click the Save button. Once operators are added, the VoIP VoIP Icon" /> icon will be available for them at the top of the page.

      You can also set up Outgoing calls and Call recording for each of the added operators separately using the switchers next to the operator's name. To remove an added operator from the virtual number operator list, click the Actions Actions Icon" /> icon to the right of the operator's name and select the Delete option.

    @@ -472,7 +472,7 @@

    To start accepting and making calls,

      -
    1. Click the VoIP VoIP Icon" /> icon on the top of the page. The VoIP client opens in a new window.
      2. +
    2. Click the VoIP VoIP Icon" /> icon at the top of the page. The VoIP client opens in a new window.
    3. Choose the Online status next to your name.
    @@ -485,7 +485,7 @@

    If a person whose phone number is stored in your CRM customer base calls you, the contact name is displayed in this window. You can click it to open the customer profile in a new browser tab and easily find all the necessary information about the client that can be useful during the phone conversation.

    To end the call, click the Disconnect button.

    The Missed Calls button" /> button in the VoIP window allows to view the list of missed calls during the current session. If you want to call back to the person who called you, move the mouse cursor over the missed call Missed Call icon" /> icon in the list so that it turns into the Call Back button" /> icon and click it.

    -

    The operators who have been granted sufficient permissions can make outgoing calls. To make a call,

    +

    Operators who have been granted sufficient permissions can make outgoing calls. To make a call,

    1. Click the Dial pad Icon" /> button to open the dial pad.
      @@ -496,18 +496,18 @@
    2. Click the Select contact Icon" /> icon to open the list of all existing CRM contacts. To facilitate searching for a contact, you can enter the contact name, entirely or partially, in the search field above the contact list. Select the necessary CRM contact from the list.
      - Alternatively, you can right-click the necessary contact in the complete list of Companies/Persons on the Contacts tab and choose the Make a VoIP call option in the context menu. Currently, you cannot call a contact from his/her profile page. + Alternatively, you can right-click the necessary contact in the complete list of Companies/Persons on the Contacts tab and choose the Make a VoIP call option in the context menu. Currently, you cannot call a contact from their profile page.

      The selected contact phone number will be displayed in the corresponding field.

      Phone number" />

      If the contact profile contains several phone numbers (mobile, work, home), click the Arrow" /> arrow in the right part of the phone number field to choose the necessary number. To remove the number, click the Remove number" /> icon.

      -

      To call to the number that is not stored in your customer base, select the country code from the Country Code" /> list and enter the phone number using the keypad or your PC keyboard.

      +

      To call the number that is not stored in your customer base, select the country code from the Country Code" /> list and enter the phone number using the keypad or your PC keyboard.

    3. Click the Call button.
    -

    If you call a contact stored in the CRM module, the link to the contact profile is displayed in this window, so that you can open the profile in a new browser tab.

    -

    If you make a call to a new number that is not stored in the CRM contacts or if you receive a call from such a number, this number will be automatically saved to your CRM contacts as a new contact. A new Outgoing or Incoming call event is also automatically added to the history for this contact.

    -

    All the incoming, outgoing and missed calls are displayed in the Calls section. Click the Calls link on the left-side panel to open the call list. It provides the following information about calls: date and time, agent (operator name), client (customer name stored in the CRM base), call duration and cost. If a call has been recorded, click the Playback Icon" /> icon to playback the recording.

    +

    If you call a contact stored in the CRM module, the link to the contact profile is displayed in this window, so you can open the profile in a new browser tab.

    +

    If you make a call to a new number that is not stored in the CRM contacts or if you receive a call from such a number, this number will be automatically saved to your CRM contacts as a new contact. A new Outgoing or Incoming call event is also automatically added to the history of this contact.

    +

    All the incoming, outgoing and missed calls are displayed in the Calls section. Click the Calls link on the left-side panel to open the call list. It provides the following information about calls: date and time, agent (operator name), client (customer name stored in the CRM base), call duration and cost. If a call has been recorded, click the Playback Icon" /> icon to play back the recording.

    For more details on viewing the call list and adding information about calls to your customer database, please refer to ">this article.

    @@ -515,21 +515,21 @@

    Generating reports

    -

    To keep up with what everyone is doing you need to constantly monitor the sales progress. You can view reports on successfully closed opportunities, evaluate sales forecast, build sales funnel, receive detailed statistics on contacts, tasks, opportunities, invoices and VoIP calls by managers, as well as get summary reports for a specified period.

    +

    To keep up with what everyone is doing, you need to constantly monitor the sales progress. You can view reports on successfully closed opportunities, evaluate sales forecast, build sales funnel, receive detailed statistics on contacts, tasks, opportunities, invoices and VoIP calls by managers, as well as get summary reports for a specified period.

    Make use of the online office Reports system that allows you to easily analyze your data and visualize the information using charts and tables.

    To generate a report:

      -
    1. open the Reports list clicking the corresponding link on the left-side panel,
      2. +
    2. open the Reports list by clicking the corresponding link on the left-side panel,
    3. select the type of the report you wish to generate from the Reports list,
    4. configure the available report parameters:
      • select the necessary Time period from the list,
        • -
      • select Managers whose productivity you wish to assess. Click the Add user link and check the necessary users in the list. Use the filter field at the top to facilitate the search. You can also check the necessary group or the Select All option to add the users from the selected group or all the portal users respectively. Сlick the Save button. If you want to delete a user added by mistake, place the mouse cursor over the needed user and click the Delete user icon" /> icon.
        • +
      • select Managers whose productivity you wish to assess. Click the Add user link and check the necessary users in the list. Use the filter field at the top to facilitate the search. You can also check the necessary group or the Select All option to add the users from the selected group or all the portal users, respectively. Click the Save button. If you want to delete a user added by mistake, place the mouse cursor over the needed user and click the Delete user icon" /> icon.
    5. click the Generate Report button.
      - If you use different currencies for your opportunities and invoices and the exchange rates are not yet specified in the CRM settings, a new window opens where you will be prompted to set up the used currency exchange rates. For more details on how to set an exchange rate please refer to ">this article. + If you use different currencies for your opportunities and invoices and the exchange rates are not yet specified in the CRM settings, a new window opens where you will be prompted to set up the used currency exchange rates. For more details on how to set an exchange rate, please refer to ">this article.
    @@ -538,7 +538,7 @@ CRM Reports" />
    -

    Once the report is generated, click the Open link at the bottom right corner to view the report. The file will open in the ">Spreadsheet Editor and you will be able to edit it, print or download if necessary.

    +

    Once the report is generated, click the Open link in the bottom right corner to view the report. The file will open in the ">Spreadsheet Editor and you will be able to edit it, print or download if necessary.

    • To print the report, click the Print icon" /> Print icon at the top toolbar.
    • To download the report, switch to the File tab at the top toolbar, select the Download as... option at the left sidebar and choose the necessary file format.
      • @@ -548,7 +548,7 @@ CRM Reports" />
    -

    All the generated reports can be found in the Generated reports list (they are only accessible to the user who generated them). To manage your reports, move the mouse cursor over the necessary report in the list and use the icons next to the file:

    +

    The reports from the CRM module are saved in CRM -> Reports -> Generated reports (they are only accessible to the user who generated them). To manage your reports, move the mouse cursor over the necessary report in the list and use the icons next to the file:

    • Edit report icon" /> - to open the report using the ">Spreadsheet Editor.
    • Download report icon" /> - to download the report as the .xlsx file.
      • @@ -561,13 +561,13 @@

      Changing CRM module settings

      By default, all portal users can access the CRM module. There are 2 different access levels inside it: user and CRM administrator.

      -

      Being a user you may perform the following operations:

      +

      Being a user, you may perform the following operations:

      • view all content (except private one);
      • create contact, task, case, opportunity with a possibility to restrict access to them;
      • edit contact, task, case, opportunity having the corresponding access rights;
      -

      Being a CRM administrator you may perform the following operations:

      +

      Being a CRM administrator, you may perform the following operations:

      • read and moderate all content;
      • organize mass mailing; @@ -594,7 +594,7 @@
      -

      But being a portal owner/full access administrator you can restrict access to the CRM for some users or even disable this module, if you don't need it at all. To do that,

      +

      But being a portal owner/full access administrator, you can restrict access to the CRM for some users or even disable this module, if you don't need it at all. To do that,

      1. click the Settings link at the left-side panel,
      2. select the Portal Access Rights subsection,
        3. diff --git a/Web/Controls/Help/GettingStarted/Docspace/GettingStartedDocspace.ascx b/Web/Controls/Help/GettingStarted/Docspace/GettingStartedDocspace.ascx index 47f322135..823adac86 100644 --- a/Web/Controls/Help/GettingStarted/Docspace/GettingStartedDocspace.ascx +++ b/Web/Controls/Help/GettingStarted/Docspace/GettingStartedDocspace.ascx @@ -59,6 +59,7 @@

      In the Options icon" /> menu located next to the user name in the lower left corner, users can view their profiles and helpful information, such as Hotkeys or Help center articles. Admins can also access the DocSpace Settings using this menu.

      +

      ONLYOFFICE DocSpace uses the MySQL database.

    diff --git a/Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx b/Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx index 5de399e97..aedf15232 100644 --- a/Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx +++ b/Web/Controls/Help/GettingStarted/Documents/GettingStartedDocuments.ascx @@ -74,6 +74,7 @@
    It's also possible to access project documents within the 'Projects' module clicking the 'Documents' link at the left-side panel.
    +

    Documents are stored in the PostgreSQL database.

    diff --git a/Web/Controls/Help/GettingStarted/Mail/GettingStartedMail.ascx b/Web/Controls/Help/GettingStarted/Mail/GettingStartedMail.ascx index 597c37905..d9dff5df5 100644 --- a/Web/Controls/Help/GettingStarted/Mail/GettingStartedMail.ascx +++ b/Web/Controls/Help/GettingStarted/Mail/GettingStartedMail.ascx @@ -83,6 +83,7 @@
  • create custom folders and apply filters to automatically perform certain actions on messages.

    • To access Mail just click the Mail" /> icon available at the top of each portal page.

    +

    E-mails are stored in the MySQL database.

    diff --git a/Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.ascx b/Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.ascx index 9bf4bb7b4..c672aad9a 100644 --- a/Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.ascx +++ b/Web/Controls/Help/GettingStarted/Projects/GettingStartedProjects.ascx @@ -117,6 +117,7 @@

    Projects is a project management tool developed to help you successfully carry out the project through all these stages: schedule your workflow, manage your project team and distribute tasks between its members, track and report project progress in order to achieve the main goal of the created project.

    To access the Projects module from any portal page, use the drop-down list in the top left corner of the page and select the corresponding option.

    +

    Projects are stored in the MySQL database.

    @@ -155,6 +156,7 @@
  • Check the Save this project as private box.

    This option is enabled by default. Use this option if you'd like to restrict access to the newly created project. In this case the project will be available only to the project administrator, the project manager and its members with corresponding rights. If you uncheck this box, the project will be available to all users who have access to the Projects module.

    +

    It is possible to disable one of the project sections if it is a private project. To do that, go to the Team tab of your private project and hide the required sections for specific users.

  • Check the Follow this project box, if you don't plan to participate in this project but need to keep track of it.
  • Check the Notify Responsibles box to notify the persons who are responsible for the added milestones and tasks. If no responsibles have been assigned when adding milestones and tasks to the project structure, this option is grayed out.
    • diff --git a/Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx b/Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx index 2fca242c3..98b6d87c2 100644 --- a/Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx +++ b/Web/Controls/Help/Guides/Documents/ShareDocuments/ShareDocuments.ascx @@ -433,7 +433,7 @@

    A user with Read Only permissions to the .docx/.xlsx/.pptx/.oform files or .docxf form templates can do the following:

      -
    • View the file and existing comments. In this case, editing options are not available and the file cannot be modified.
      • +
    • View the file and existing comments. In this case, editing options are not available and the file cannot be modified. Please note that you can still take screenshots.
    • Using the File tab, the user can:
      1. print or download the file;
        2. diff --git a/Web/Controls/Help/Guides/Projects/ReportTypes/ReportTypes.ascx b/Web/Controls/Help/Guides/Projects/ReportTypes/ReportTypes.ascx index 91b0a27ca..fdf7b92e6 100644 --- a/Web/Controls/Help/Guides/Projects/ReportTypes/ReportTypes.ascx +++ b/Web/Controls/Help/Guides/Projects/ReportTypes/ReportTypes.ascx @@ -33,7 +33,7 @@

        Introduction

        -

        Need to know the full details of the current status of all projects? In the Projects module, you can get this information using the Reports. Reports provide extensive and detailed information in a convenient format - in a .xlsx file, which can be opened in the ">Spreadsheet Editor.

        +

        Are the full details of the current status of all projects required? In the Projects module, you can get this information using the Reports. Reports provide extensive and detailed information in a convenient format - in a .xlsx file, which can be opened in the ">Spreadsheet Editor.

        There are many different settings and parameters available for generating a report. This guide will help you quickly understand and learn how to generate reports in a suitable format.

        @@ -57,13 +57,13 @@

        Step 2. Configure the Report

        -

        Click the Reports link on the left-side panel. A new page opens with the list of all generated reports. If you have not created reports before, this list will be empty.

        +

        Click the Reports link on the left-side panel. A new page opens with a list of all generated reports. If you have not created reports before, this list will be empty.

        Report Project Progress" /> Report Project Progress" />
        -

        select a report type you wish to generate from the Reports list and configure the available parametrs:

        +

        Select a report type you wish to generate from the Reports list and configure the available parameters:

        • Overdue Milestones (Tags, Project) - to display a list of overdue milestones.
          @@ -72,7 +72,7 @@
          • -
        • Upcoming Milestones (Tags, Proejct, Time Period) - to display a list of upcoming milestones. +
        • Upcoming Milestones (Tags, Project, Time Period) - to display a list of upcoming milestones.
          Report types Upcoming Milestones" /> Report types Upcoming Milestones" /> @@ -110,14 +110,14 @@
          • -
        • Project List (View by group, View by user, Time period, Show closed projects) - to display a for a specific user/group for a specific period of time. +
        • Project List (View by group, View by user, Time period, Show closed projects) - to display a list of projects for a specific user/group for a specific period of time.
          Report types Project List" /> Report types Project List" />
          • -
        • Time Tracking - to display a list of users with their total work time calculated basing on a time register: +
        • Time Tracking - to display a list of users with their total work time calculated based on a time register:
          • View by user (View by group, View by user, Payment statuses, Time period).
          • View by user tasks (View by group, View by user, Payment statuses, Time period).
            • @@ -151,9 +151,10 @@
    -

    Once all setitngs have been configured, click the Generate Report button.

    -

    A status window will open in the bottom right corner showing the generated reports. Then you can open them in the ">Spreadsheet Editor by clicking the Open button.

    -

    To simplify the work with reports, you can Report templates. This allows you to automatically create reports and them by e-mail. Please, visit ">this page to find out more.

    +

    Once all settings have been configured, click the Generate Report button.

    +

    The reports from the Project module are saved in the My Documents section by default.

    +

    A status window will open in the bottom right corner, showing the generated reports. Then you can open them in the ">Spreadsheet Editor by clicking the Open button.

    +

    To simplify the work with reports, you can use Report templates. This allows you to automatically create reports and send them by e-mail. Please, visit ">this page to find out more.

    \ No newline at end of file diff --git a/Web/Controls/Help/Guides/Projects/RestrictAccess/RestrictAccess.ascx b/Web/Controls/Help/Guides/Projects/RestrictAccess/RestrictAccess.ascx index 70854ab1f..0779e5541 100644 --- a/Web/Controls/Help/Guides/Projects/RestrictAccess/RestrictAccess.ascx +++ b/Web/Controls/Help/Guides/Projects/RestrictAccess/RestrictAccess.ascx @@ -104,6 +104,7 @@

    Check the Save the project as private box.

    Once this option is checked you can proceed to ">setting access rights for your team members.

    Apply all the changes you made clicking the Save Project button.

    +

    It is possible to disable one of the project sections if it is a private project. To do that, go to the Team tab of your private project and hide the required sections for specific users.

    diff --git a/Web/Controls/Help/TipsTricks/General/ManageableNotifications/manageablenotifications.ascx b/Web/Controls/Help/TipsTricks/General/ManageableNotifications/manageablenotifications.ascx index b0b191923..fef0c660c 100644 --- a/Web/Controls/Help/TipsTricks/General/ManageableNotifications/manageablenotifications.ascx +++ b/Web/Controls/Help/TipsTricks/General/ManageableNotifications/manageablenotifications.ascx @@ -75,6 +75,7 @@ <%--
  • Document version updated
    If you were granted access to a document, you will be notified about changes in it.
    • --%> +

    Edited files get a NEW icon next to them when there are changes that you have not seen yet. If you are mentioned in a comment, you will receive an E-mail notification.

  • Projects

    This type includes notifications about new comments within project-related discussions, milestones, your tasks, etc.

    diff --git a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Commenting.htm b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Commenting.htm index 409d79899..ad6aa69d2 100644 --- a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Commenting.htm +++ b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Commenting.htm @@ -17,20 +17,21 @@

    Commenting documents

    The Document Editor allows you to maintain a constant team-wide approach to work flow: share files and folders, collaborate on documents in real time, communicate right in the editor, save document versions for future use, review documents and add your changes without actually editing the file, compare and merge documents to facilitate processing and editing.

    In Document Editor, you can leave comments to the content of documents without actually editing it. Unlike chat messages, the comments stay until deleted.

    +

    Added comments will remain in third-party editors.

    Leaving comments and replying to them

    To leave a comment,

    1. select a text passage where you think there is an error or problem,
    2. - switch to the Insert or Collaboration tab of the top toolbar and click the
      Comment button, or
      - use the
      icon on the left sidebar to open the Comments panel and click the Add Comment to Document link, or
      + switch to the Insert or Collaboration tab of the top toolbar and click the
      Comment button, or
      + use the
      icon on the left sidebar to open the Comments panel and click the Add Comment to Document link, or
      right-click the selected text passage and select the Add Сomment option from the contextual menu,
    3. enter the required text,
    4. click the Add Comment/Add button.

    The comment will be seen on the Comments panel on the left. Any other user can answer the added comment, asking questions or reporting on the work they have done. For this purpose, click the Add Reply link situated under the comment, type in your reply in the entry field and press the Reply button.

    -

    If you are using the Strict co-editing mode, new comments added by other users will become visible only after you click the icon in the left upper corner of the top toolbar.

    +

    If you are using the Strict co-editing mode, new comments added by other users will become visible only after you click the icon in the left upper corner of the top toolbar.

    Disabling display of comments

    The text passage you commented will be highlighted in the document. To view the comment, just click within the passage. To disable this feature,

      @@ -38,23 +39,24 @@
    1. select the Advanced Settings option,
    2. uncheck the Turn on display of the comments box.
    -

    Now the commented passages will be highlighted only if you click the  icon.

    +

    Now the commented passages will be highlighted only if you click the  icon.

    Managing comments

    You can manage the added comments using the icons in the comment balloon or on the Comments panel on the left:

    • - sort the added comments by clicking the
      icon: + sort the added comments by clicking the
      icon:
      • by date: Newest or Oldest. This is the sort order by default.
      • by author: Author from A to Z or Author from Z to A.
      • by location: From top or From bottom. The usual sort order of comments by their location in a document is as follows (from top): comments to text, comments to footnotes, comments to endnotes, comments to headers/footers, comments to the entire document.
        • -
      • by group: All or choose a certain group from the list. This sorting option is available if you are running a version that includes this functionality. -

        Sort comments

        +
      • + by group: All or choose a certain group from the list. This sorting option is available if you are running a version that includes this functionality. +

        Sort comments

      -
    • edit the currently selected comment by clicking the
      icon,
      • -
    • delete the currently selected comment by clicking the
      icon,
      • -
    • close the currently selected discussion by clicking the
      icon if the task or problem you stated in your comment was solved, after that the discussion you opened with your comment gets the resolved status. To open it again, click the
      icon. If you want to hide resolved comments, click the File tab on the top toolbar, select the Advanced Settings option, uncheck the Turn on display of the resolved comments box and click Apply. In this case, the resolved comments will be highlighted only if you click the
      icon,
      • +
    • edit the currently selected comment by clicking the
      icon,
      • +
    • delete the currently selected comment by clicking the
      icon,
      • +
    • close the currently selected discussion by clicking the
      icon if the task or problem you stated in your comment was solved, after that the discussion you opened with your comment gets the resolved status. To open it again, click the
      icon. If you want to hide resolved comments, click the File tab on the top toolbar, select the Advanced Settings option, uncheck the Turn on display of the resolved comments box and click Apply. In this case, the resolved comments will be highlighted only if you click the
      icon,
    • if you want to manage comments in a bunch, open the Resolve drop-down menu on the Collaboration tab. Select one of the options for resolving comments: resolve current comments, resolve my comments or resolve all comments in the document.

    Adding mentions

    @@ -70,7 +72,7 @@

    Removing comments

    To remove comments,

      -
    1. click the
      Remove button on the Collaboration tab of the top toolbar,
      2. +
    2. click the
      Remove button on the Collaboration tab of the top toolbar,
    3. select the necessary option from the menu:
        @@ -80,7 +82,7 @@
    -

    To close the panel with comments, click the icon on the left sidebar once again.

    +

    To close the panel with comments, click the icon on the left sidebar once again.

    \ No newline at end of file diff --git a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm index e39b312d1..d1147a5c6 100644 --- a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm +++ b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Comparison.htm @@ -100,6 +100,10 @@

    Documents are compared by words. If a word contains a change of at least one character (e.g. if a character was removed or replaced), in the result, the difference will be displayed as the change of the entire word, not the character.

    The image below illustrates the case when the original file contains the word 'Characters' and the document for comparison contains the word 'Character'.

    Compare documents - method

    +

    Difference between comparison and combining

    +

    When comparing documents, the resulting document will be a redlined one. Document comparison is most commonly used to compare an original version and an edited version without the Track Changes feature enabled.

    +

    When combining documents, the resulting document will contain all Tracked Changes with their respective authors. If one and the same part of the document has been revised by multiple people, all changes will be displayed simultaneously.

    +

    The main difference lies in the Track Changes feature. If it is enabled by all co-authors, then Combining documents is better; if it is disabled, then Comparing documents might be more preferable.

    Authorship of the document

    When the comparison process is launched, the second document for comparison is being loaded and compared to the current one.

    diff --git a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Password.htm b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Password.htm index ab0fb5b19..bd70426f9 100644 --- a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Password.htm +++ b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/Password.htm @@ -16,7 +16,7 @@

    Protecting documents with a password

    -

    You can protect your documents with a password that is required to enter the editing mode by your co-authors. The password can be changed or removed later on.

    +

    You can protect your documents with a password that is required to enter the editing mode by your co-authors. The password can be changed or removed later on. The document will remain protected in third-party editors.

    The password cannot be restored if you lose or forget it. Please keep it in a safe place.

    You can also protect your documents by restricting access rights.

    diff --git a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/VersionHistory.htm b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/VersionHistory.htm index 5058816dd..dab00a945 100644 --- a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/VersionHistory.htm +++ b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/HelpfulHints/VersionHistory.htm @@ -16,7 +16,7 @@

    Version history

    The Document Editor allows you to maintain a constant team-wide approach to work flow: share files and folders, collaborate on documents in real time, communicate right in the editor, comment certain parts of your documents that require additional third-party input, review documents and add your changes without actually editing the file, compare and merge documents to facilitate processing and editing.

    -

    In Document Editor, you can view the version history of the document you collaborate on.

    +

    In Document Editor, you can view the version history of the document you collaborate on. The versions are stored separately and can be viewed individually, so there cannot be a conflict.

    Viewing version history:

    To view all the changes made to the document,

      diff --git a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm index 3ebc2ad2a..a8bfd6858 100644 --- a/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm +++ b/Web/OfficeWeb/apps/documenteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm @@ -72,6 +72,7 @@

      To open the folder, where the file is stored, in a new browser tab in the online editor in the file explorer window in the desktop editor, click the Open file location icon on the right side of the editor header. Alternatively, you can switch to the File tab on the top toolbar and select the Open file location option.

      +

      ONLYOFFICE offers a form gallery where you can find templates in different languages and download them directly onto your hard drive. The gallery is constantly updated, and you can participate and upload your own templates. Currently, the gallery is available for ONLYOFFICE DocSpace and for ONLYOFFICE Desktop Editors.

      \ No newline at end of file diff --git a/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Commenting.htm b/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Commenting.htm index 2329971e8..3daf6d402 100644 --- a/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Commenting.htm +++ b/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Commenting.htm @@ -17,6 +17,7 @@

      Commenting

      The Presentation Editor allows you to maintain constant team-wide approach to work flow: share files and folders, collaborate on presentations in real time, communicate right in the editor, save presentation versions for future use.

      In Presentation Editor you can leave comments to the content of presentations without actually editing it. Unlike chat messages, the comments stay until deleted.

      +

      Added comments will remain in third-party editors.

      Leaving comments and replying to them

      To leave a comment to a certain object (text box, shape etc.):

        diff --git a/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Password.htm b/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Password.htm index 5a516ccdc..0d8596b81 100644 --- a/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Password.htm +++ b/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/HelpfulHints/Password.htm @@ -16,7 +16,7 @@

        Protecting presentations with a password

        -

        You can protect your presentations with a password that is required to enter the editing mode by your co-authors. The password can be changed or removed later on.

        +

        You can protect your presentations with a password that is required to enter the editing mode by your co-authors. The password can be changed or removed later on. The presentation will remain protected in third-party editors.

        The password cannot be restored if you lose or forget it. Please keep it in a safe place.

        Setting a password

        diff --git a/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm b/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm index c46126dac..bf138bbfb 100644 --- a/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm +++ b/Web/OfficeWeb/apps/presentationeditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm @@ -72,6 +72,7 @@

        To open the folder where the file is stored in a new browser tab in the online version, in the file explorer window in the desktop version, click the Open file location icon on the right side of the editor header. Alternatively, you can switch to the File tab of the top toolbar and select the Open file location option.

        +

        ONLYOFFICE offers a form gallery where you can find templates in different languages and download them directly onto your hard drive. The gallery is constantly updated, and you can participate and upload your own templates. Currently, the gallery is available for ONLYOFFICE DocSpace and for ONLYOFFICE Desktop Editors.

        \ No newline at end of file diff --git a/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/Commenting.htm b/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/Commenting.htm index 54e681ed7..d5c70d5ca 100644 --- a/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/Commenting.htm +++ b/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/HelpfulHints/Commenting.htm @@ -17,6 +17,7 @@

        Commenting

        The Spreadsheet Editor allows you to maintain constant team-wide approach to work flow: share files and folders, collaborate on spreadsheets in real time, communicate right in the editor, save spreadsheet versions for future use.

        In Spreadsheet Editor you can leave comments to the content of spreadsheets without actually editing it. Unlike chat messages, the comments stay until deleted.

        +

        Added comments will remain in third-party editors.

        Leaving comments and replying to them

        To leave a comment,

          diff --git a/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm b/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm index c38befa5f..e8cd3ca12 100644 --- a/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm +++ b/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/OpenCreateNew.htm @@ -72,6 +72,7 @@

          To open the folder, where the file is stored , in a new browser tab in the online version or in the file explorer window in the desktop version, click the Open file location icon on the right side of the editor header. Alternatively, you can switch to the File tab on the top toolbar and select the Open file location option.

          +

          ONLYOFFICE offers a form gallery where you can find templates in different languages and download them directly onto your hard drive. The gallery is constantly updated, and you can participate and upload your own templates. Currently, the gallery is available for ONLYOFFICE DocSpace and for ONLYOFFICE Desktop Editors.

          diff --git a/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/Password.htm b/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/Password.htm index 710a71490..19c975633 100644 --- a/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/Password.htm +++ b/Web/OfficeWeb/apps/spreadsheeteditor/main/resources/help/en/UsageInstructions/Password.htm @@ -16,7 +16,7 @@

          Protecting spreadsheets with a password

          -

          You can control access to a spreadsheet by setting a password that is required to enter the editing mode by your co-authors. The password can be changed or removed later on. There are two ways to password protect your spreadsheet: using the Protection tab or the File tab.

          +

          You can control access to a spreadsheet by setting a password that is required to enter the editing mode by your co-authors. The password can be changed or removed later on. The spreadsheet will remain protected in third-party editors. There are two ways to password protect your spreadsheet: using the Protection tab or the File tab.

          The password cannot be restored if you lose or forget it. Please keep it in a safe place.

          Setting a password using the Protection tab.