Skip to content
This repository was archived by the owner on Feb 24, 2025. It is now read-only.
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8095f21
start of ui work
brindy Oct 30, 2017
73a5337
show dashboard modally
brindy Oct 30, 2017
357a27a
use embedded view for navigation controller
brindy Oct 30, 2017
22a19da
add transition for showing privacy protection dashboard under omni bar
brindy Oct 31, 2017
584e9f9
add more privacy protection ui and fix a bug with transitions
brindy Oct 31, 2017
2e08d63
add placeholder for toggle
brindy Oct 31, 2017
81d428f
support kerning of text
brindy Oct 31, 2017
6cb746b
Merge branch 'develop' into feature/privacy_protection_dashboard
brindy Oct 31, 2017
6fc18c4
Merge branch 'develop' into feature/privacy_protection_dashboard
brindy Oct 31, 2017
418a39d
add structure for navigating in the privacy protection screens
brindy Nov 1, 2017
51c0092
add more ui setup for privacy protection
brindy Nov 1, 2017
ac7f3b7
show privacy grade and update it when it changes
brindy Nov 2, 2017
d204970
add additional updates to the ui based on site rating
brindy Nov 2, 2017
dd66963
update trackers info on the overview screen
brindy Nov 3, 2017
80802d0
update privacy practices
brindy Nov 3, 2017
58c73b3
disable table selections
brindy Nov 3, 2017
085a802
show upgraded status of the protection
brindy Nov 4, 2017
2026072
fix broken tests and add one for blocked only
brindy Nov 4, 2017
701e04e
remove unused content blocker ui
brindy Nov 5, 2017
132f47a
Merge branch 'develop' into feature/privacy_protection_dashboard
brindy Nov 5, 2017
0a537ac
remove content blocking toggle from settings
brindy Nov 5, 2017
e589b89
address PR feedback
brindy Nov 7, 2017
1fa54b0
more pr feedback and a rename, as discussed
brindy Nov 7, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into feature/privacy_protection_dashboard
  • Loading branch information
brindy committed Nov 5, 2017
commit 132f47a5bc45231ef03af55a3de11337fd984bdf

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.