Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DataEntryTable] NewEntry refactor #2166

Merged
merged 24 commits into from
May 23, 2023
Merged

[DataEntryTable] NewEntry refactor #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
50997ef
Implement another state to avoid using eslint-disable-next-line
imnasnainaec May 4, 2023
bb3271b
Return <Fragment/> instead of null
imnasnainaec May 8, 2023
681c411
Merge branch 'master' into data-entry-table-eslint-disable
imnasnainaec May 8, 2023
7e9f7d5
Merge branch 'master' into data-entry-table-eslint-disable
imnasnainaec May 8, 2023
779ca36
Merge branch 'master' into data-entry-table-eslint-disable
imnasnainaec May 9, 2023
53b8cce
Retract extra state
imnasnainaec May 9, 2023
88ab374
Retract more
imnasnainaec May 9, 2023
6fdbffc
Revert comments
imnasnainaec May 9, 2023
93d4432
Merge branch 'master' into data-entry-table-defunct
imnasnainaec May 10, 2023
ac3306f
Convert NewEntry to functional component
imnasnainaec May 10, 2023
b90a5a2
Move new entry state into parent
imnasnainaec May 11, 2023
08443d3
Fix tests
imnasnainaec May 11, 2023
b1dcaf6
Remove extraneous Fragment wrapper.
imnasnainaec May 11, 2023
e2faa4d
Fix useEffect deps
imnasnainaec May 11, 2023
326cd97
Fix levDist bug; Investigate vernOpen bug
imnasnainaec May 12, 2023
14d8e87
Merge branch 'master' into data-entry-table-defunct
imnasnainaec May 16, 2023
43f2ddd
Tidy
imnasnainaec May 16, 2023
0bfb2a7
Sort imports
imnasnainaec May 16, 2023
54b0b2d
Merge branch 'master' into data-entry-table-defunct
imnasnainaec May 18, 2023
e766676
Fix mis-merge
imnasnainaec May 18, 2023
52f3249
Fix test with import broken in merge
imnasnainaec May 18, 2023
fdabcf9
Merge branch 'master' into data-entry-table-defunct
imnasnainaec May 23, 2023
366056a
Merge branch 'master' into data-entry-table-defunct
imnasnainaec May 23, 2023
110e0fe
Merge branch 'master' into data-entry-table-defunct
imnasnainaec May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion public/locales/ar/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"selectSense": "حدد الإحساس",
"newEntryFor": "إدخال جديد لـ: ",
"newSenseFor": "معنى جديد عن: ",
"senseInWord": "الكلمة لها هذا المعنى بالفعل في هذا المجال الدلالي",
"deleteRow": "احذف هذا الصف",
"deleteRowWarning": "سيتم حذف هذا الصف بشكل دائم!",
"addNote": "إضافة ملاحظة",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"selectSense": "Select a sense",
"newEntryFor": "New entry for: ",
"newSenseFor": "New sense for: ",
"senseInWord": "The word already has this sense in this semantic domain",
"senseInWord": "The word already has this sense in this semantic domain: {{ val1 }}, {{ val2 }}",
"deleteRow": "Delete this row",
"deleteRowWarning": "This row will be permanently deleted!",
"addNote": "Add a note",
Expand Down
Loading