Legal claims defining the scope of protection. Each claim is shown in both the original legal language and a plain English translation.
1. A method of collaboratively authoring a data file, comprising: displaying the data file in an authoring window within a user interface; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control and a reject control; and allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict.
A method for collaborative data file editing presents the file in an authoring window within a user interface. The user interface offers a choice to display or hide editing conflicts. If the user chooses to display conflicts, a conflict summary window appears alongside the authoring window. This summary lists unresolved conflicts and identifies the type of edit for each: insertion, deletion, or revision. Selecting a specific conflict displays "accept" and "reject" controls, enabling the user to either accept or reject the conflicting edit.
2. The method of claim 1 , further comprising displaying the editing conflict within context of non-conflicting content.
The collaborative authoring method from the previous description, where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control and a reject control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict; further includes displaying the conflicting edits within the surrounding context of the non-conflicting parts of the file.
3. The method of claim 2 , further comprising identifying the editing conflict to distinguish the editing conflict from the non-conflicting content.
The collaborative authoring method, where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control and a reject control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, also highlights or otherwise identifies the specific conflicting content to visually distinguish it from the surrounding, non-conflicting content.
4. The method of claim 3 , further comprising displaying an origin of the editing conflict.
The collaborative authoring method, where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control and a reject control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, with visual identification to distinguish them from non-conflicting content, also shows the source or author of the conflicting edit.
5. The method of claim 3 , wherein hiding the editing conflict comprises removing identification of the editing conflict.
The collaborative authoring method, where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control and a reject control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, with visual identification to distinguish them from non-conflicting content, hides a conflict by removing the visual identifiers, so it appears as normal, non-conflicting content.
6. The method of claim 1 , further comprising visually alerting the user when the editing conflict is identified.
The collaborative authoring method from the first description, where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control and a reject control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict; includes a visual alert to the user, such as a flashing icon or highlighted text, when editing conflicts are detected.
7. The method of claim 1 , further comprising allowing the user to toggle between displaying the editing conflict and hiding the editing conflict.
The collaborative authoring method from the first description, where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control and a reject control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict, or the reject control, resulting in rejecting the editing conflict; provides the user with the ability to easily switch (toggle) between showing and hiding identified editing conflicts.
8. A computer readable storage hardware device, not including a propagating signal, storing executable instructions, which perform a method of resolving editing conflicts in a data file, the method comprising: displaying the data file in an authoring window within a user interface; presenting to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, displaying an accept control; and allowing the user to select the accept control, resulting in accepting the editing conflict.
A computer-readable storage device stores instructions for resolving editing conflicts in a data file. The instructions, when executed, cause the system to display the data file in an authoring window within a user interface. The user interface offers a choice to display or hide editing conflicts. If the user chooses to display conflicts, a conflict summary window appears alongside the authoring window. This summary lists unresolved conflicts and identifies the type of edit for each: insertion, deletion, or revision. Selecting a specific conflict displays an "accept" control, enabling the user to accept the conflicting edit.
9. The computer readable storage device of claim 8 , further comprising displaying the editing conflict within context of non-conflicting content.
The computer-readable storage device from the previous description, which stores instructions for resolving editing conflicts in a data file where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict; further includes displaying the conflicting edits within the surrounding context of the non-conflicting parts of the file.
10. The computer readable storage device of claim 9 , further comprising identifying the editing conflict to distinguish the editing conflict from the non-conflicting content.
The computer-readable storage device, which stores instructions for resolving editing conflicts in a data file where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, also highlights or otherwise identifies the specific conflicting content to visually distinguish it from the surrounding, non-conflicting content.
11. The computer readable storage device of claim 10 , further comprising displaying an origin of the editing conflict.
The computer-readable storage device, which stores instructions for resolving editing conflicts in a data file where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, with visual identification to distinguish them from non-conflicting content, also shows the source or author of the conflicting edit.
12. The computer readable storage device of claim 10 , wherein hiding the editing conflict comprises removing identification of the editing conflict.
The computer-readable storage device, which stores instructions for resolving editing conflicts in a data file where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, with visual identification to distinguish them from non-conflicting content, hides a conflict by removing the visual identifiers, so it appears as normal, non-conflicting content.
13. The computer readable storage device of claim 8 , further comprising visually alerting the user when the editing conflict is identified.
The computer-readable storage device from the description of claim 8, which stores instructions for resolving editing conflicts in a data file where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict; includes a visual alert to the user, such as a flashing icon or highlighted text, when editing conflicts are detected.
14. The computer readable storage device of claim 8 , further comprising allowing the user to toggle between displaying the editing conflict and hiding the editing conflict.
The computer-readable storage device from the description of claim 8, which stores instructions for resolving editing conflicts in a data file where the data file is displayed in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, an accept control is displayed, allowing the user to select the accept control, resulting in accepting the editing conflict; provides the user with the ability to easily switch (toggle) between showing and hiding identified editing conflicts.
15. A system for collaboratively editing a data file, the system comprising: a computer processing unit; and a memory encoding instructions that, when executed by the processing unit, cause the processing unit to: display the data file in an authoring window within a user interface; present to a user an interface enabling selection between displaying an editing conflict and hiding the editing conflict; in response to receiving a selection to display an editing conflict, displaying the authoring window and a conflict summary window within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; in response to receiving a selection of one of the unresolved editing conflicts, display a reject control; and allow the user to select the reject control, resulting in rejecting the editing conflict.
A system for collaborative data file editing includes a processor and memory. The memory stores instructions that, when executed, cause the system to display the data file in an authoring window within a user interface. The user interface offers a choice to display or hide editing conflicts. If the user chooses to display conflicts, a conflict summary window appears alongside the authoring window. This summary lists unresolved conflicts and identifies the type of edit for each: insertion, deletion, or revision. Selecting a specific conflict displays a "reject" control, enabling the user to reject the conflicting edit.
16. The system of claim 15 , wherein the processing unit is further caused to display the editing conflict within context of non-conflicting content.
The collaborative editing system from the previous description, where the system displays the data file in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, a reject control is displayed, allowing the user to select the reject control, resulting in rejecting the editing conflict; further includes displaying the conflicting edits within the surrounding context of the non-conflicting parts of the file.
17. The computer readable storage medium of claim 16 , wherein the processing unit is further caused to identify the editing conflict to distinguish the editing conflict from the non-conflicting content.
The collaborative editing system from the previous description, where the system displays the data file in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, a reject control is displayed, allowing the user to select the reject control, resulting in rejecting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, also highlights or otherwise identifies the specific conflicting content to visually distinguish it from the surrounding, non-conflicting content.
18. The computer readable storage medium of claim 17 , wherein the processing unit is further caused to display an origin of the editing conflict.
The collaborative editing system from the previous description, where the system displays the data file in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, a reject control is displayed, allowing the user to select the reject control, resulting in rejecting the editing conflict; and the conflicting edits are displayed within context of non-conflicting content, with visual identification to distinguish them from non-conflicting content, also shows the source or author of the conflicting edit.
19. The computer readable storage medium of claim 15 , wherein the processing unit is further caused to visually alert the user when the editing conflict is identified.
The collaborative editing system from claim 15, where the system displays the data file in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, a reject control is displayed, allowing the user to select the reject control, resulting in rejecting the editing conflict; includes a visual alert to the user, such as a flashing icon or highlighted text, when editing conflicts are detected.
20. The computer readable storage medium of claim 15 , wherein the type of editing operation is associated with one or more indicia including a predetermined color, a strikethrough, underlining, a predetermined opacity, or highlighting.
In the collaborative editing system where a computer displays the data file in an authoring window within a user interface that enables selection between displaying an editing conflict and hiding the editing conflict; and in response to receiving a selection to display an editing conflict, the authoring window and a conflict summary window are displayed within the user interface, the conflict summary window including a listing of unresolved editing conflicts and identifying a type of editing operation for each of the unresolved editing conflicts, wherein the type of editing operation identifies whether an edit was inserted, deleted or revised; and in response to receiving a selection of one of the unresolved editing conflicts, a reject control is displayed, allowing the user to select the reject control, resulting in rejecting the editing conflict; the type of editing operation, such as insert, delete, or revise, is represented visually using a color, strikethrough, underlining, opacity level, or highlighting.
Unknown
September 12, 2017
Browse 5M+ US patents with plain-English claim translations and AI-generated analysis.