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

Verify personal data #3869

Merged
merged 50 commits into from
Apr 29, 2017
Merged
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
1fc05ea
allow admin to configure lookup server
schiessle Feb 22, 2017
c9ccdca
add verification dialog
schiessle Mar 14, 2017
6f41a3e
store verification status in accounts table and update lookup server
schiessle Mar 23, 2017
cbf5acc
check verification proof and update account table
schiessle Apr 21, 2017
866e5d6
use configured lookup server
schiessle Apr 21, 2017
94df091
send local verification status to lookup server
schiessle Apr 21, 2017
86701dc
make sure that we don't lose previous verification status
schiessle Apr 21, 2017
7c309c2
ask lookup server if email address was verified by the user
schiessle Apr 21, 2017
f3c433a
check right location to verify web page and query lookup server for e…
schiessle Apr 21, 2017
391a989
make sure that every data set has a 'verified' status
schiessle Apr 24, 2017
5c20288
pass verified status to template
schiessle Apr 24, 2017
f32304f
remove unused variable
schiessle Apr 24, 2017
71657db
updated unit tests
schiessle Apr 24, 2017
2a07ec8
Add verification icons
jancborchardt Apr 25, 2017
06265fe
make use of verification buttons
schiessle Apr 26, 2017
ebcb847
remove action class once the status changes from 'to verify' to 'veri…
schiessle Apr 26, 2017
46dd549
change status indicator if value was changed
schiessle Apr 26, 2017
17ad812
fix css file
schiessle Apr 26, 2017
08a33cc
Fix styling of verification box to popover
jancborchardt Apr 26, 2017
9a366db
add missing translation and other small fixes
schiessle Apr 26, 2017
67057f7
minor style fixes; use verify-action class only for verification-stat…
schiessle Apr 26, 2017
6a48548
Group verification CSS
jancborchardt Apr 26, 2017
59e8a19
Use individual verification popover dialogs instead of one
jancborchardt Apr 26, 2017
27b676b
only verify-actions should show a mouse pointer
schiessle Apr 26, 2017
ee61570
Fix email verification cursor thing properly
jancborchardt Apr 26, 2017
75c5bec
email doesn't need a verification dialog, verification mail is send a…
schiessle Apr 26, 2017
c1a784e
Fix verification icon positon and cursor
jancborchardt Apr 26, 2017
981c110
Use JS for verification icon tooltip
jancborchardt Apr 26, 2017
5fa0e6d
fix email verification status
schiessle Apr 26, 2017
a0ca1c0
show and hide verification dialog
schiessle Apr 26, 2017
47985a1
only show verification buttons for public fields and field with some …
schiessle Apr 26, 2017
de529b9
Improve placeholders for website and Twitter handle
jancborchardt Apr 26, 2017
e40bdcd
Fix dialog width
jancborchardt Apr 26, 2017
9c0414b
Fix verification button placement on mobile
jancborchardt Apr 26, 2017
ec452a8
only show verify button if scope is public and the input field contai…
schiessle Apr 26, 2017
e9021c1
update message in verify popup
schiessle Apr 26, 2017
4607916
Fix text overflow in website popover
jancborchardt Apr 26, 2017
2d07179
only close verification dialog if the user clicks outside of the dialog
schiessle Apr 26, 2017
072d69f
fix name of website input field
schiessle Apr 26, 2017
68ba857
verification button should be clickable directly after status change,…
schiessle Apr 27, 2017
9480b29
move translatable strings out of the template
schiessle Apr 27, 2017
806ca43
allow to display the verification code also while verification is alr…
schiessle Apr 27, 2017
df1d1c6
use already available instance if l10n
schiessle Apr 27, 2017
4ec05ef
cleanup template
schiessle Apr 27, 2017
7340d6a
don't add multiple retry jobs
schiessle Apr 27, 2017
5464b14
fix path to the website proof
schiessle Apr 27, 2017
9b36f2d
fix unit test
schiessle Apr 28, 2017
e3b10f3
Updated autoloader
rullzer Apr 28, 2017
f488258
send signature to lookup server
schiessle Apr 28, 2017
a0bf706
Fix unit tests
MorrisJobke Apr 29, 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
show and hide verification dialog
Signed-off-by: Bjoern Schiessle <[email protected]>
  • Loading branch information
schiessle authored and MorrisJobke committed Apr 29, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit a0ca1c04c3ce003a2ce0090965261519dddc17b9
2 changes: 1 addition & 1 deletion settings/css/settings.css
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ input#openid, input#webdav { width:20em; }
display: none;
right: -9px;
top: 40px;
width: 200px;
width: 650px;
}
.verification-dialog p {
padding: 10px;
21 changes: 11 additions & 10 deletions settings/js/personal.js
Original file line number Diff line number Diff line change
@@ -201,11 +201,11 @@ $(document).ready(function () {
}
});

var showVerifyDialog = function(howToVerify, verificationCode) {
var dialog = document.getElementById('verification-dialog');
$(".verification-dialog-content .explainVerification").text(howToVerify);
$(".verification-dialog-content .verificationCode").text(verificationCode);
dialog.style.display = "block";
var showVerifyDialog = function(dialog, howToVerify, verificationCode) {
var dialogContent = dialog.children('.verification-dialog-content');
dialogContent.children(".explainVerification").text(howToVerify);
dialogContent.children(".verificationCode").text(verificationCode);
dialog.css('display', 'block');
};

$(".verify-action").click(function () {
@@ -215,18 +215,19 @@ $(document).ready(function () {
OC.generateUrl('/settings/users/{account}/verify', {account: accountId}),
{method: 'GET'}
).done(function(data) {
showVerifyDialog(data.msg, data.code);
var dialog = account.closest('.verify').children('.verification-dialog');
showVerifyDialog(dialog, data.msg, data.code);
account.attr('title', t('core', 'Verifying …'));
account.attr('src', OC.imagePath('core', 'actions/verifying.svg'));
account.removeClass('verify-action');

});

});

// When the user clicks on <span> (x), close the modal
$("#verify-dialog-close").click(function() {
var dialog = document.getElementById('verification-dialog');
dialog.style.display = "none";
$("body").click(function(){
var page = $(this);
page.find('.verification-dialog').css('display', 'none');
});

// When the user clicks anywhere outside of the modal, close it