Skip to content

Commit

Permalink
Merge branch 'develop' into sam/password-generation
Browse files Browse the repository at this point in the history
* develop:
  Fill Add Bookmark modal view with current tab website (#515)
  Fix reloading data in BookmarkListViewController (#514)
  use the page url in the tracker object rather than the current web view url (#509)
  Version 0.22.2
  Revert the change to Arc4RandomUniformVariantRNG and silence SwiftLint warning (#510)
  Revert the change to Arc4RandomUniformVariantRNG and silence SwiftLint warning (#510)
  Version 0.22.1
  Improve Chromium Logins import (#501)
  Revert "New autoconsent rules and move tab cleanup out of onCommitted (#489)" (#502)
  Add fallback icons for password managers (#504)
  Make SwiftLint happy (#508)
  Default to Chrome or Safari when importing Logins and Bookmarks (#503)
  • Loading branch information
samsymons committed Apr 10, 2022
2 parents 3392e22 + e42a741 commit 6e415fa
Show file tree
Hide file tree
Showing 37 changed files with 310 additions and 808 deletions.
92 changes: 12 additions & 80 deletions DuckDuckGo.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "1PasswordIcon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "LastpassIcon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6e415fa

Please sign in to comment.