Skip to content

Commit

Permalink
merge Release v2.1.0 to master (#6619)
Browse files Browse the repository at this point in the history 
* New translations English-en_US.json (Bengali, India)
[ci skip]

* New translations English-en_US.json (Bengali, India)
[ci skip]

* New translations English-en_US.json (Bengali, India)
[ci skip]

* New translations English-en_US.json (Bengali, India)
[ci skip]

* New translations English-en_US.json (Bengali, India)
[ci skip]

* Update repos via translationCore Submodule Updater

* added updates from comments

* added fall back for no getProgress implementation

* removed tool commit

* package-lock.json

* package-lock.json

* Refactor - #6444 - TranslationHelpsWrapper (#6474)

* WIP - Refactor - #6444 - TranslationHelpsWrapper

* Update checking tool wrapper

* Version bump for checking-tool-wrapper

* toolName is default to null

* Refactored VerseCheckWrapper, GroupMenuWrapper & ScripturePaneWrapper (#6470)

* testing

* Rolled back changes to src/js/pages/app.js

* Updated actions to not need the usernmae as parameter

* Fixed unit tests

* Added [email protected]

* package-lock.json

* package-lock.json

* [email protected]

* Fixed lexicon popovers: Added [email protected] & [email protected]

* WIP - Refactor - #6445 - CheckInfoCardWrapper (#6475)

* WIP - Refactor - #6445 - CheckInfoWrapper

* Update

* Updates

* updated checking-tool-wrapper

* merged changes from 3579.2 into dev.

* package-lock.json

* Edit Verse Checking Performance Imporovement (#6480)

* added checking tool wrapper and tc-ui-tool-kit changes

* updated package.json

* updated checking-tool-wrapper.

* updated checking-tool-wrapper.  Fix for updating group menu data

* clear check data on contextId change

* update checking-tool-wrapper

* added sanity check

* Added fix for blank screen on tool reselect (#6483)

* added fix for blank screen on tool reselect

* fixed tests

* added fix for clearing tool data on gl select

* fixed tests

* updated checking-tool-wrapper

* update checking-tool-wrapper

* added sanity check

* removing comments

* changeCurrentContextId() changed to load data from group menu reducer if found

* changeCurrentContextId() changed to load data from group menu reducer if found

* changeCurrentContextId() changed to load data from group menu reducer if found

* Added lagtest tc-tool

* merged w/ dev

* Removed commented code

* backed out async load changes for changeCurrentContextId() when group data is not in reducer.

* Fixed unit tests

* [email protected]

* package-lock.json

* New translations English-en_US.json (Marathi)
[ci skip]

* New translations English-en_US.json (Marathi)
[ci skip]

* performance tweaks for updating group data with latest settings.

* more tests, cleanup

* fixes for nothingToSelect

* fixes for tool progress to not show 100% if any checks missing and to show '<1%' if progress is between 0 and 1%.

* Latest tc-tool

* [email protected]

* fixed typo

* Fixed typo

* checking-tool-wrapper now has its own redux store (#6484)

* testing

* Rolled back changes to src/js/pages/app.js

* Updated actions to not need the usernmae as parameter

* Fixed unit tests

* Refactor out popover action

* Temp removed logger

* tESTING CHECKING-TOOL-WRAPPER BRANCH

* package-lock.json

* package-lock.json

* package-lock.json

* Added lagtest tc-tool

* merged w/ dev

* Removed commented code

* Fixed unit tests

* [email protected]

* package-lock.json

* Latest tc-tool

* [email protected]

* fixed typo

* Fixed typo

* Update repos via translationCore Submodule Updater

* fixing repo links

* Manually added latest commit hash for tools

* Update repos via translationCore Submodule Updater

* Bugfix 6430/User is not warned when Create New Repo or Rename repo functions fail (#6494)

* remove recursion in rename error prompting.

* remove recursion in rename error prompting.

* remove recursion in rename error prompting.

* added logging for debugging

* fix unit tests

* fix unit tests

* fix continue after error

* fix repo name parsing.  Fix create new prompts. remove recursion from handleDcsRenameCollision()

* fix to support project name change

* add waits for screen updates

* add waits for screen updates

* removing unneeded delays.  Andding upload status dialog

* fix upload status dialog

* moving actions from ProjectDetailsHelpers to ProjectDetailsActions

* updated tCore version and updated unit tests.

* removed old snapshots.

* fix for parsing git URLs. Some more refactoring.

* Some more refactoring.

* unit test fixes

* unit test fixes

* fix for empty selection

* fix to only save most recent selections in selections.csv. Updated unit tests

* fix for reminders to only save the most recent if set.  Added unit tests.

* updated wordmap to fix wrong occurrence suggestion (#6502)

* fix issue that old dialog was left on screen during rename.  Added status to show that we are renaming on DCS.

* update snapshot

* add delay to update UI

* add delay to update UI

* doDcsRenamePrompting - removed change git to point to new repo always which caused errors - the create and rename operations will do that when successful. A few changes to return values

* after DCS rename or create new, now pushes latest changes up to D43

* fix unit tests

* changed to reprompt DCS repo choice if user changes changes translation ID.

* fix for automatic behavior that changing translation id closed project

* fix for automatic behavior that changing translation id closed project

* fix unit test

* cleanup

* updated checking-tool-wrapper with fix for `no_selection_needed` on grouped menu filter

* fix logic error where if newer original bible resource present, end up with empty bible folder.

* fix required versions sort.

* fix unit test

* fix to make sure current resource is installed.  fix fs.copySync mock for directories. Fix for extractZippedResourceContent where multiple versions in directory.

* fix fs.copySync mock for directories.

* logging.

* test build

* test build

* test build - updated dependencies.

* Moves all DCS URL references to a constant (#6524)

* Update repos via translationCore Submodule Updater

* Update repos via translationCore Submodule Updater

* Update repos via translationCore Submodule Updater

* Updated .gitmodules

* Update repos via translationCore Submodule Updater

* Just a whitespace edit to kickoff concourse

* Moves all DCS URL references to a constant

* Puts constant in the right place

* Two fixes per PR review

* update snapshot

* updated dependencies.

* updated dependencies.

* fix for missing token.

* fix to close project on upload.

* test build

* updated dependencies.

* updated wordmap (#6515)

* updated wordmap

* bumped wordmap version

* updated wordmap

* updated wordmap

* Converted lhandleDcsRenameCollisionPromise to use callbacks. fixed unit tests.

* fix lint.

* Revert "fix lint."

This reverts commit 22ab4ef

* Revert "Converted lhandleDcsRenameCollisionPromise to use callbacks. fixed unit tests."

This reverts commit 654f902

* Revert "Converted lhandleDcsRenameCollisionPromise to use callbacks. fixed unit tests."

This reverts commit 654f902

* cleaup

* updated tc-ui-toolkit and checking-tool-wrapper

* cleaup

* updated dependencies

* updated dependencies

* fix to update language list after updating source content.

* updated checking-tool-wrapper

* first attempt at unit tests.

* reverted first attempt at unit tests.

* added redraw of busy on project open if

* fix to close alert dialog when project open is finished

* cleanup

* fix unit tests

* fix to prevent double push to DCS

* crowdin updates

* removed callback from reducer.

* cleanup

* moved git save operation into renameRepo() and createNewRepo() - git save is done before push so that we have latest manifest changes.

* cleanup.

* fix unit tests.

* fix unit tests.

* updated dependencies

* cleanup

* updated tc-ui-toolkit and checking-tool-wrapper

* fix move of .git to overwritten project

* merge locale updates from develop.

* updated wordmap (#6557)

* added parameter to select async file loading on loadResourceArticle().

* updated dependencies

* updated tsv-groupdata-parser for testing

* updated dependencies

* locale updated

* updated dependencies

* updated dependencies

* updated wa

* test build

* updated dependencies

* Updated tools

* revert wordmap to tC 2.0.0

* testing

* updated bundled resources.

* minimal bundled.

* testing

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated dependencies.

* updated tools with locale strings updated

* updated tools with locale strings updated

* testing

* testing

* cleanup

* updated dependencies

* update tN with locale updates

* updated dependencies

* updated dependencies

* updated dependencies

* updated change log

* testing

* updated dependencies

* fix crash when search api returns empty message rather than array of repos

* fix crash when search api returns empty message rather than array of repos

* fix problem that after upload of selected project, user is stuck with project selected and tools disabled.

* On upload add invalid login message on 401 error.
For login, on token match only match tokens that have sha1.
On user card add warning on invalid user token.

* Add support if resource folder is empty.

* Add unit tests for empty user resource folders

* Fix for local user - don't prompt with invalid login.
Moved up minCompatibleVersion to 2.1.0.

* Restored minCompatibleVersion to 2.0.0.

* Moved up minCompatibleVersion to 2.1.0.

* Updated CHANGELOG.md for release-v2.1.0 (#6610)

* updated CHANGELOG.md

* updated CHANGELOG.md

* Update Change log (#6617)

* updated CHANGELOG.md

* updated CHANGELOG.md

* updated CHANGELOG.md

* Update Release 2.1.0 change log (#6618)

* updated CHANGELOG.md

* updated CHANGELOG.md

* updated CHANGELOG.md

* updated CHANGELOG.md

Co-authored-by: Manny Colon <[email protected]>
Co-authored-by: Sterling (Jay) Scott <[email protected]>
Co-authored-by: Richard Mahn <[email protected]>
Co-authored-by: Jesse Griffin <[email protected]>
Co-authored-by: Joel <[email protected]>
  • Loading branch information
@PhotoNomad0 @mannycolon
@richmahn @jag3773 @da1nerd
6 people authored Dec 27, 2019
1 parent 050274a commit 1284b78
Show file tree
Hide file tree
Showing 24,698 changed files with 588,222 additions and 909,475 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
36 changes: 0 additions & 36 deletions .eslintrc
View file

This file was deleted.

93 changes: 93 additions & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
module.exports = {
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:import/errors",
"plugin:import/warnings",
"prettier",
"prettier/react"
],
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2018,
"ecmaFeatures": {
"impliedStrict": true,
"classes": true
}
},
"env": {
"browser": true,
"node": true,
"es6": true,
"jest": true
},
"plugins": [
"react",
"jest",
"prettier",
"import",
"react-hooks"
],
"rules": {
"array-callback-return": "error",
"no-await-in-loop": "error",
"object-curly-newline": ["error", { "multiline": true, "minProperties": 3 }],
"brace-style": ["error", "1tbs", {"allowSingleLine": false}],
"no-return-await": "error",
"quote-props": ["error", "consistent"],
"require-await": "error",
"no-async-promise-executor": "error",
"no-throw-literal": "warn",
"no-nested-ternary": "error",
"no-duplicate-imports": ["error", {"includeExports": false}],
"import/order": "error",
"import/first": "error",
"import/default": "off",
"import/namespace": "off",
"indent": ["error", 2],
"react/no-find-dom-node": "warn",
"no-undef": "error",
"no-unused-vars": "error",
"no-debugger": "warn",
"react/prop-types": "error",
"curly": "error",
"semi": ["error", "always", {"omitLastInOneLineBlock": true}],
"semi-style": ["error", "last"],
"no-console": "off",
"react/jsx-uses-react": "error",
"react/jsx-uses-vars": "error",
"no-prototype-builtins": "off",
"react/no-unescaped-entities": "off",
"object-curly-spacing": ["error", "always"],
"quotes": ["error", "single", {"allowTemplateLiterals": true}],
"comma-dangle": ["error", "always-multiline"],
"keyword-spacing": "error",
"no-multi-spaces": "error",
"no-trailing-spaces": "error",
"arrow-body-style": ["error", "as-needed"],
"space-before-function-paren": ["error", {"anonymous": "always", "named": "never", "asyncArrow": "always"}],
"no-return-assign": "error",
"padding-line-between-statements": [
"error",
{ "blankLine": "always", "prev": "*", "next": ["function", "if", "for", "while", "switch", "try", ] },
{ "blankLine": "always", "prev": ["const", "let", "var"], "next": ["block", "block-like", "multiline-expression"] },
{ "blankLine": "always", "prev": ["block", "block-like", "multiline-expression"] , "next":["const", "let", "var"]}
],
"padded-blocks": ["error", "never"],
"no-unused-expressions": "error",
"func-names":"off",
"no-underscore-dangle": "off",
"consistent-return": "off",
"radix": "off",
"guard-for-in": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn"
},
"settings": {
"react": {
"createClass": "createReactClass", // Regex for Component Factory to use, default to "createReactClass"
"pragma": "React", // Pragma to use, default to "React"
"version": "detect" // React version, default to the latest React stable release
}
}
}
15 changes: 9 additions & 6 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
[submodule "tC_apps/translationWords"]
path = tC_apps/translationWords
url = https://github.com/translationCoreApps/translationWords_Check_plugin.git
[submodule "tC_apps/wordAlignment"]
path = tC_apps/wordAlignment
url = https://github.com/translationCoreApps/word-alignment-tool.git
[submodule "tC_apps/translationWords"]
path = tC_apps/translationWords
url = https://github.com/unfoldingWord/translationWords.git
[submodule "tC_apps/wordAlignment"]
path = tC_apps/wordAlignment
url = https://github.com/unfoldingWord/wordAlignment.git
[submodule "tC_apps/translationNotes"]
path = tC_apps/translationNotes
url = https://github.com/unfoldingWord/translationNotes.git
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: true
language: node_js
node_js:
- 8
- 8.16.1
os:
- linux
before_install:
Expand Down
Loading

0 comments on commit 1284b78

Please sign in to comment.