Skip to content

3.2.0 conflicts#303

Merged
vbuberen merged 2 commits into
developfrom
3.2.0_conflicts
Apr 4, 2020
Merged

3.2.0 conflicts#303
vbuberen merged 2 commits into
developfrom
3.2.0_conflicts

Conversation

@vbuberen

@vbuberen vbuberen commented Apr 4, 2020

Copy link
Copy Markdown
Collaborator

📄 Context

Resolving conflicts with release branch.

vbuberen and others added 2 commits February 9, 2020 12:45
* Remove scroll flags (#210)
* Fix/gradle properties (#211)
* Allow Gradle parallel build
* Fix version name
* Fix for curl command (#214)
* Fix R8 minification crash on TransactionViewModel creation. (#219)
* Big resources renaming (#216)
* Fix clear action crash when application is dead (#222)
* Fix for crash on Save transaction action (#221)
* Show warning is transaction is null, fix crash in Save action
* Uncomment sample transactions
* Replace multiple returning with multiple throw due to detekt issue
* Add message into IOException, update string for request being not ready
* Fix for NPE in NotificationHelper (#223)
* Add additional check fo transaction being not null before getting its notificationText
* Extract transaction item from transactionBuffer
* ViewModel refactoring (#220)
* Update ViewModel dependency, refactor TransactionViewModel
* Dependencies clean up
* Switch to ViewModel on the main screen
* Fix depleting bytes from the response. (#226)
* Use HttpUrl instead of Uri for parsing URL data.
* Do not read image sources directly from the response.
* Simplify gzip logic.
* Move gzip checks from IoUtils to OkHttpUtils.
* Remove unused 'Response.hasBody()' extension.
* Update library/src/main/java/com/chuckerteam/chucker/internal/support/OkHttpUtils.kt
* Revert resource renaming (#227)
* Revert renaming
* Add changelogs for 3.1.2 (#230)
@vbuberen vbuberen merged commit 94b2ea0 into develop Apr 4, 2020
@vbuberen vbuberen deleted the 3.2.0_conflicts branch April 4, 2020 19:12
@vbuberen vbuberen restored the 3.2.0_conflicts branch April 4, 2020 19:15
@vbuberen vbuberen deleted the 3.2.0_conflicts branch April 4, 2020 19:24
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.

1 participant