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 PR #147 + changes #152

Merged
merged 5 commits into from
Oct 23, 2018
Merged

Conversation

AlvaroBrey
Copy link
Contributor

@AlvaroBrey AlvaroBrey commented Oct 23, 2018

  • Undid unwanted style changes
  • Fixed a typo
  • Added relevant TODOs
  • Minor improvements

Closes #120

@AlvaroBrey AlvaroBrey merged commit e6ab6f4 into develop Oct 23, 2018
@AlvaroBrey AlvaroBrey deleted the feature-merge-vibrationsettings-pr branch October 23, 2018 11:51
AlvaroBrey added a commit that referenced this pull request Nov 5, 2018
* develop:
  Add Notifications management settings (API 26+) (#156)
  RoutinesActivityCreate/Edit test: Solve autocorrect bug
  RoutinesActivityCreate/Edit tests: add error messages to asserts
  gitlab-ci: add generated DB file as an artifact (#153)
  Merge PR #149 + changes (#151)
  Merge PR #147 + changes (#152)
  InstallDatabaseService: only vibrate once for progress notification
  Use HH format instead of kk to display time (#148)
  Update CONTRIBUTING.md
  DBTest: Clean up exportation
  Features/export db (#140)
  Update versionCode and versionName
AlvaroBrey added a commit that referenced this pull request Nov 13, 2018
* release-2.5.10:
  Bump versionCode and versionName
  CI: simplify script and check for successful cache extraction
  Revert "CI: use api 28 image to avoid re-download of build-tools"
  Update Kotlin to 1.3.0 (#154)
  Add Notifications management settings (API 26+) (#156)
  RoutinesActivityCreate/Edit test: Solve autocorrect bug
  RoutinesActivityCreate/Edit tests: add error messages to asserts
  gitlab-ci: add generated DB file as an artifact (#153)
  Merge PR #149 + changes (#151)
  Merge PR #147 + changes (#152)
  InstallDatabaseService: only vibrate once for progress notification
  Use HH format instead of kk to display time (#148)
  Update CONTRIBUTING.md
  DBTest: Clean up exportation
  Features/export db (#140)
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.

2 participants