Skip to content

Commit

Permalink
Merge branch 'master' into any-length
Browse files Browse the repository at this point in the history
  • Loading branch information
imnasnainaec authored Apr 17, 2024
2 parents da7c0fe + dea7e6c commit b6d07cf
Show file tree
Hide file tree
Showing 101 changed files with 3,803 additions and 4,232 deletions.
2 changes: 2 additions & 0 deletions .gitlint
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[title-min-length]
min-length=4
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user_guide/assets/images/reviewEntriesColumns.es.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user_guide/assets/images/reviewEntriesColumns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/user_guide/assets/images/reviewEntriesColumns.zh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
541 changes: 173 additions & 368 deletions docs/user_guide/assets/licenses/frontend_licenses.txt

Large diffs are not rendered by default.

42 changes: 30 additions & 12 deletions docs/user_guide/docs/goals.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,47 @@

The Review Entries table shows all of the entries in the selected project.

### Sorting and Filtering Columns
### Columns

The columns are: Edit, Vernacular, Senses, Glosses, Domains, Pronunciations, Note, Flag, and Delete.
The columns are: Edit (no header), Vernacular, Number of Senses (#), Glosses, Domains, Pronunciations
(![Review Entries pronunciations column header](images/reviewEntriesColumnPronunciations.png){width=28}), Note, Flag
(![Review Entries flag column header](images/reviewEntriesColumnFlag.png){width=16}), and Delete (no header).

![Review Entries column headers](images/reviewEntriesColumns.png)

At the top of a column with predominantly text content (Vernacular, Glosses, Domains, Note, or Flag), you can sort
alphabetically or filter with a text search.

At the top of either the Senses or Pronunciations column, you can sort or filter by the number of senses or recordings
that entries have.
To show/hide columns or rearrange their order, click on the
![Review Entries columns edit icon](images/reviewEntriesColumnsEdit.png){width=25} icon in the top corner.

Due to the nature of Rapid Word Collection, [Data Entry](dataEntry.md) in The Combine does not support the addition of
definitions or parts of speech. However, if the project has imported data in which definitions or parts of speech were
already present, additional columns will automatically be added to the Review Entries table.
already present, additional columns will be available in the Review Entries table.

#### Sorting and Filtering

There are icons at the top of each column to
![Review Entries column filter icon](images/reviewEntriesColumnFilter.png){width=20} filter and
![Review Entries column sort icon](images/reviewEntriesColumnSort.png){width=20} sort the data.

In a column with predominantly text content (Vernacular, Glosses, Note, or Flag), you can sort alphabetically or filter
with a text search.

In the Number of Senses column or Pronunciations column, you can sort or filter by the number of senses or recordings
that entries have. In the Pronunciations column, you can also filter by speaker name.

In the Domains column, sorting is numerical by each entry's least domain id. To filter by domain, type a domain id with
or without periods. For example, "8111" and "8.1.1.1" both show all entries with a sense in domain 8.1.1.1. To also
include subdomains, add a final period to your filter. For example, "8111." includes domains "8.1.1.1", "8.1.1.1.1", and
"8.1.1.1.2". Filter with just a period (".") to show all entries with any semantic domain.

### Editing Entry Rows

You can record, play, or delete an entry's audio recordings by using the icons in the Pronunciations column. You can
delete an entire entry by using the icon in the Delete column.
You can record, play, or delete an entry's audio recordings by using the icons in the Pronunciations column.

To edit any other part of an entry, click the ![Review Entries row edit icon](images/reviewEntriesRowEdit.png){width=20}
edit icon in the initial column.

To edit an entry's vernacular form, senses (including glosses and domains), note, or flag, click the icon in the Edit
column.
You can delete an entire entry by clicking the
![Review Entries row delete icon](images/reviewEntriesRowDelete.png){width=20} delete icon in the final column.

## Merge Duplicates {#merge-duplicates}

Expand Down
11 changes: 6 additions & 5 deletions installer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,12 @@ web browsers used to enter and cleanup the data. Having a secure connection prev
to override their security settings.

_The Combine_ refreshes its certificate when it is connected to the Internet via a wired Ethernet connection. A
certificate will be valid for a time between 60 and 90 days. You can use `combinectl` to view when your current
certificate will expire, for example:
certificate will be valid for a time between 60 and 90 days. You can use the command `combinectl cert` to view when your
current certificate will expire, for example:

```console
$combinectl cert
Web certificate expires at Jul 8 08:54:11 2024 GMT
```

## Advanced Installation Options
Expand All @@ -155,6 +156,6 @@ To run `combine-installer.run` with options, the option list must be started wit

| Command | Effect |
| ------------------------------------------ | ------------------------------------------------------------ |
| `./combine-installer.run -- v1.16.0` | Install version `v1.16.0` of _The Combine_. |
| `./combine-installer.run -- update v2.1.0` | Update an existing Combine installation to version `v2.1.0` |
| `./combine-installer.run -- v1.1.6` | Install version `v1.1.6` of _The Combine_. |
| `./combine-installer.run -- update v1.2.1` | Update an existing Combine installation to version `v1.2.1` |
| `./combine-installer.run -- restart` | Restart the current installation process from the beginning. |
Loading

0 comments on commit b6d07cf

Please sign in to comment.