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

[feature/log-info] Log device, version and locale info #468

Merged
merged 3 commits into from
Aug 2, 2019

Conversation

hosy
Copy link
Collaborator

@hosy hosy commented Aug 2, 2019

Description

Merge #446 into Release 1.0.4 branch

Related Issue

Motivation and Context

#444

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

…y log file using new SDK protocol

- Show SDK commit hash in Settings
@CLAassistant
Copy link

CLAassistant commented Aug 2, 2019

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ hosy
❌ felix-schwarz
You have signed the CLA already but the status is still pending? Let us recheck it.

@hosy hosy changed the base branch from master to release/1.0.4 August 2, 2019 06:45
@hosy hosy merged commit b705a2c into release/1.0.4 Aug 2, 2019
@delete-merged-branch delete-merged-branch bot deleted the feature/log-info branch August 2, 2019 06:55
hosy added a commit that referenced this pull request Aug 5, 2019
* [fix/auth] Fix issues in handling and improve handling of auth errors (#459)

* - Authentication error produce only a single alert now
- Added special handling and messages for
	- Account disabled server side
	- Authentication data missing for bookmark (f.ex. after a device restore from an unencrypted backup)
- Fix retain cycle leading to zombie OCCore when hitting Edit

* - If auth fails, replace "Edit" with "Sign in" in the alert and attempt login if updating the bookmark succeeded

* - Move code for editing bookmark and reconnecting to a new ClientRootViewControllerAuthenticationDelegate, so that functionality isn't hardwired to ServerListTableViewController and BookmarkViewController

* - Present different error message for auth failures if the auth method is token based

* - Extend handling of authorization errors to errors re-packaged as OCIssues

* - Enhance UX when editing credentials-based bookmarks following an authorization failure
- Improve handling of .authenticationData reset: now only a soft-reset of the editable copy

* - Update ios-sdk reference to ios-sdk master with fix/auth merged in

* fixed missing semicolon

* fixed UI tests

* [fix/0xdead10cc] Fix dead10cc forced termination (#462)

* - Fix `0xdead10cc` crash by switching SQLite journal mode from DELETE to WAL

* - Switch SDK to release/1.0.4 branch

* changed app version to 1.0.4

* Version Bump to 127

* [feature/log-info] Log device, version and locale info (#468)

* - Log device, version and locale information at the beginning of every log file using new SDK protocol
- Show SDK commit hash in Settings

* using correct release SDK

* Added changelog for version 1.0.4

* Version Bump to 128

* - Update to SDK with fixes for finding (1) in #466

* use tagged and signed master SDK 1.0.3
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.

3 participants