-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
Allow importing OBS markdown files #461
Merged
Merged
Conversation
This file contains 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
MimeType enum instead of string literals. Ignore creator if unable to match help RCs otherwise. Unhide the Tree generics. More type safety.
jsarabia
reviewed
Jun 27, 2019
@@ -103,7 +110,7 @@ class ResourceContainerRepository( | |||
private val helpContentTypes = listOf(ContentType.TITLE, ContentType.BODY) | |||
private val dublinCoreIdDslVal = DSL.`val`(dublinCoreId) | |||
|
|||
fun import(node: TreeNode) { | |||
fun import(node: OtterTreeNode<Any>) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should Any change to CollectionOrContent?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Fixed now.
KJoslyn
approved these changes
Jun 28, 2019
KJoslyn
pushed a commit
that referenced
this pull request
Jul 1, 2019
* Allow importing OBS markdown files. MimeType enum instead of string literals. Ignore creator if unable to match help RCs otherwise. Unhide the Tree generics. More type safety. * Narrow down a few more OtterTree<Any> params.
jsarabia
pushed a commit
that referenced
this pull request
Jul 2, 2019
* Resource takes page view * Test app for resource take cards * Added test wav files * Renamed test app * Takes view model * Load test text and takes * Navigate to takes from resources list (load real data) * TakesListView and Play/Pause event handling * Takes page refactor Fix broken Takes Fragment * Support change to Resource * Refactoring to support RecordableItem * Use observable list of Recordables rather than 'title' and 'body' * Better names for Takes fragments * WorkbookViewModel * navigateToTakesPage() uses BookElement * Support change to RecordTake * New take action * Put tab label properties in an enum map * Add sort to tabs * Fixed bug in TakeDao * Proper subscribe handling * Add vgrow to workspace root to fill screen * Dispose takes subscription when Recordable changes * Remove test files to be put in test branch * WorkbookViewModel getters return non-null values or throw error * Remove code dependent on testapp files * Utility function for EnumMap: getNotNull() * Bug fix for TakesTab clear disposables * Restore functionality to TMVM recordContent (sort of) TakeManagementViewModel will be merged with TakesViewModel soon, so these changes will be obsolete when that happens. * PR Comments * PR Comments * PR Comments and applying FileName pattern * Using Recordable Interface and WorkbookFileNamerBuilder * Simplified WorkbookFileNameBuilder * Using simplified FileNamer * Better filenames * Renamed to RecordResourceViewModel Moved recording functionality to TakeManagementViewModel (which needs to be refactored later) * Removed Platform.runLater where it is not necessary * Refactored RecordableTab, added RecordableTabViewModel * Minor improvements * ResourcesViewModel tests and RecordableTab tests * Allow importing OBS markdown files (#461) * Allow importing OBS markdown files. MimeType enum instead of string literals. Ignore creator if unable to match help RCs otherwise. Unhide the Tree generics. More type safety. * Narrow down a few more OtterTree<Any> params. * Test cleanup * Fix broken unit tests * Update travis.yml to include chromeabletabpane * Remove RecordableTabTest until better solution found It used PlatformImpl.startup, which errors on travis
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For #460
Also see WycliffeAssociates/otter-common#106