Conversation
…tium-html-tools into suggestions-Kira-D
Suggestions interface
Deconflicts #78
* Add file download workaround for Safari (fixes #97) * Changed Download_Browser_Warning * Added workaround for Safari Fixed translator.js Fixed wierd bugs that I have no idea how I had made. * Moved .fadeIn out of conditional block * Added comments to increase code readability * Allow right-click to download even if workaraound is used * Revert string changes * Fix multiple download in Safari >10 Fix es-lint Fix es-lint * Removed Download_Browser_Warning * Change way we check for Safari version Instead of looking at specific version (10, 11) look for one digit version (9, 8 and earlier) * Remove unused global varaibles * Extended comment about Safari workaround * Run cleanup * Fixes #201 (Chrome audit improvements) * Improved Chrome audit performance * Update Makefile * Fixed formatting errors * Fixed more formatting errors * Revised "start_url" * Removed sw.js * Removed script for registering service worker * Revised makefile, manifest.json, and index.html * Improved Chrome audit performance further * Improved audit performance further * Fixed errors * fixed houndci error * Fixed final errors * Added whitespace * Fix <html> localisation * Disentangle JS modules and fix Flow (fixes #80) * [WIP] Disentangle JS modules (#225) * Disentangle JS modules * Fix imports * Use flow on individual files * Declare modules to Flow * Run Flow directly * Cleanup * Fix some import/export issues * Make the build work * Tweak flow decl * Move around the config decl to make build work * Delete extra line * Fix make debug (fixes #220) * Improvements to Flow coverage * Better flow coverage * Doesn't look like the stubs actually belong to jQuery 3 so I'm reverting these changes * Remove unnecessary var * This name makes a lot more sense * Remove unnecessary type annotations (clutter code & are obvious e.g. string literals) * More unnecessary type annotations * Remove more unnecessary annotations * Prefer literal union type * Add a type and remove one * More fixes * Fix persist choices * Remove more redundant annotations * Remove more unnecessary annotations * Switch to Array<...> shortform * Undo one of my 'fixes' * Final flow fix * Convert Object to {} shorthand * Remove a couple more unnecessary annotations * Some final cleanup * Implement requested changes * Add/Remove/Fix types * Adapt config types * Un-Flow strict.js * Allow subtitle to be null * Final tweaks * Simplify progress bar update * Split CSS into multiple files and improve organization (fixes #212) * Split CSS into multiple files * Better organization * Minor tweaks * Bring all the coverage over 90% * Fix buggy UI with detect-language (fixes #236) * Refactor repeated code into a function * Fix the locale selector I probably broke * Show translation not available less often * Remove a warn that gets triggered all the time * More generic port configuration with Docker * Less awkward input label placement * Slightly more sane language sorting with variants * Significantly more sane translation language column computation * Fix typo * Store docker pair data in persistent volume and add update all script * Include language modules download in deploy script (fixes #244) * Minify JS and CSS (towards #130) * Minify all.js and all.css * Make minification fail gracefully * Update README section on compression * Use command line interfaces * Update Dockerfile * Update README.md * Update README.md * Fix dockerfiles * Fix debug HTML * Fetch monolingual modules before pairs in deploy-all script * Merge handleTranslateSuccessResponse * Update imports/exports * Add JQuery modal/tooltip stubs * Add config.SUGGESTIONS stubs * Fix remaining Flow issues
Merge Issue 55 suggestions
sushain97
commented
Jan 4, 2018
| WORKDIR /source | ||
|
|
||
| ADD https://raw.githubusercontent.com/unhammer/apertium-get/master/apertium-get . | ||
| ADD https://raw.githubusercontent.com/sushain97/apertium-get/master/apertium-get . |
Member
Author
There was a problem hiding this comment.
@Androbin still seem to be some unrelated things in the diff?
Contributor
There was a problem hiding this comment.
This change was on issue-55-suggestions and it was more recent than master.
So I thought I'd better not remove it.
Member
Author
There was a problem hiding this comment.
It should be unhammer. I think I just made the change in master? There's also more unrelated stuff in localization.js.
Contributor
There was a problem hiding this comment.
The changes in localization.js include some minor fixes e.g. imports/exports or linting which previously broke the build on the merge.
Member
Author
There was a problem hiding this comment.
Ah, I'm not sure I understand why it broke the build. Regardless, this should be fixed. Do you want to try completing this feature or were you just trying to de-conflict?
Contributor
There was a problem hiding this comment.
I was just trying to de-conflict the existing work.
I did my best to figure out how to merge the two branches.
|
@sushain97 @Androbin I've merged master with this branch, made a few UI fixes and opened a new PR #393. Was this PR ready to land? |
thehanimo
added a commit
to thehanimo/apertium-html-tools
that referenced
this pull request
Mar 24, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.