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.

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

Merge from official #2

Merged
merged 29 commits into from
Jul 24, 2018
Merged

Conversation

paulocoutinhox
Copy link
Collaborator

No description provided.

revolter and others added 29 commits December 30, 2017 17:22
* Replaced func with var on FRBook and renamed smilFileForId(_ to smilFile(forId

* Adjusted the project to conform to changes in FRBook
* Removes forced unwrapping on core. Adjusted FRSpiner and FRMetadata

* Renamed ErrorKind enum options

* Adjusted the project to conform with changes

* Removed forced unwrapping from FRMetadata and adjusting the project to conform with changes
Setting the scroll direction to horizontal on the config was
ignored because the current scroll direction returned 0 instead of
nil on the first run, so it never reaches the guard's else block.
* Fix code style

* Add custom unzip path setting to FolioReaderContainer
- Removed code that sets reader audio session to active immediately after pod init
- Added audio session interruption observer to update player/player menu state
- Closes #321
* Made a new screen for taking notes and modified some other codes

* removed unnecessary chagnes

* commit missing file
…arch for toc reference. (#342)

* Fixed FolioReaderWebView, menu controller still showing colors menu after select any color in menu.
https://github.com/FolioReader/FolioReaderKit/issues/316

* Fixed get chapter name method, applied recursive search for toc reference.

* Fix iOS 11 auto adjust inset bug and closes #332 #312 #261 (reverted from commit 0f161dd)

* Fixed FolioReaderWebView, menu controller still showing colors menu after select any color in menu.
https://github.com/FolioReader/FolioReaderKit/issues/316 (reverted from commit b8cccd7)

* Fixed get chapter name method, applied recursive search for toc reference. (reverted from commit 4577d99)

* Fixed get chapter name method, applied recursive search for toc reference. (reverted from commit 4577d99) (reverted from commit f4e657c)

* Fix iOS 11 auto adjust inset bug and closes #332 #312 #261 (unreverted from commit 525b9b5)
@paulocoutinhox paulocoutinhox merged commit 9b962de into ubook-editora:master Jul 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants