From 02e99277146d8bd912f2f19af1d3e94a6181d90d Mon Sep 17 00:00:00 2001 From: alecdwm Date: Tue, 13 Dec 2016 22:31:35 +0100 Subject: Initial support for LDAP server authentication Limitations as of this commit: - tlsOptions can only be specified in config.json, not as env vars - authentication failures are not yet gracefully handled by the UI - instead the error message is shown on a blank page (/auth/ldap) - no email address is associated with the LDAP user's account - no picture/profile URL is associated with the LDAP user's account - we might have to generate our own access + refresh tokens, because we aren't using oauth. The currently generated tokens are just a placeholder. - 'LDAP Sign in' needs to be translated to each locale --- public/views/index.ejs | 5 +++-- public/views/signin-ldap-modal.ejs | 35 +++++++++++++++++++++++++++++++++++ public/views/signin-modal.ejs | 10 ++++++++-- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 public/views/signin-ldap-modal.ejs (limited to 'public') diff --git a/public/views/index.ejs b/public/views/index.ejs index 2bec7de0..baca1417 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -57,7 +57,7 @@ <% if (errorMessage && errorMessage.length > 0) { %>
<%= errorMessage %>
<% } %> - <% if(facebook || twitter || github || gitlab || dropbox || google || email) { %> + <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %>
<%= __('Sign In') %> @@ -93,7 +93,7 @@
style="display:none;"<% } %>> - <% if(facebook || twitter || github || gitlab || dropbox || google || email) { %> + <% if(facebook || twitter || github || gitlab || dropbox || google || ldap || email) { %> @@ -192,6 +192,7 @@
<%- include signin-modal %> + <%- include signin-ldap-modal %> <% if(useCDN) { %> diff --git a/public/views/signin-ldap-modal.ejs b/public/views/signin-ldap-modal.ejs new file mode 100644 index 00000000..6a665f17 --- /dev/null +++ b/public/views/signin-ldap-modal.ejs @@ -0,0 +1,35 @@ + + diff --git a/public/views/signin-modal.ejs b/public/views/signin-modal.ejs index acbad256..ba6c57ff 100644 --- a/public/views/signin-modal.ejs +++ b/public/views/signin-modal.ejs @@ -38,7 +38,13 @@ <%= __('Sign in via %s', 'Google') %> <% } %> - <% if((facebook || twitter || github || gitlab || dropbox || google) && email) { %> + <% if(ldap) { %> + + <%= __('Sign in via %s', 'LDAP') %> + + <% } %> + + <% if((facebook || twitter || github || gitlab || dropbox || google || ldap) && email) { %>
<% }%> <% if(email) { %> @@ -67,4 +73,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 72a0e90f7d09d8a4e06a2629dcb9404eb37c64a0 Mon Sep 17 00:00:00 2001 From: alecdwm Date: Wed, 14 Dec 2016 12:42:42 +0100 Subject: LDAP signin form moved to main signin-modal - previously was a separate modal - now is located on main modal, like email auth --- public/views/index.ejs | 1 - public/views/signin-ldap-modal.ejs | 35 ----------------------------------- public/views/signin-modal.ejs | 27 +++++++++++++++++++++++---- 3 files changed, 23 insertions(+), 40 deletions(-) delete mode 100644 public/views/signin-ldap-modal.ejs (limited to 'public') diff --git a/public/views/index.ejs b/public/views/index.ejs index baca1417..39674b02 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -192,7 +192,6 @@ <%- include signin-modal %> - <%- include signin-ldap-modal %> <% if(useCDN) { %> diff --git a/public/views/signin-ldap-modal.ejs b/public/views/signin-ldap-modal.ejs deleted file mode 100644 index 6a665f17..00000000 --- a/public/views/signin-ldap-modal.ejs +++ /dev/null @@ -1,35 +0,0 @@ - - diff --git a/public/views/signin-modal.ejs b/public/views/signin-modal.ejs index ba6c57ff..e71b09c6 100644 --- a/public/views/signin-modal.ejs +++ b/public/views/signin-modal.ejs @@ -38,12 +38,31 @@ <%= __('Sign in via %s', 'Google') %> <% } %> + <% if((facebook || twitter || github || gitlab || dropbox || google) && ldap) { %> +
+ <% }%> <% if(ldap) { %> - - <%= __('Sign in via %s', 'LDAP') %> - +

Via LDAP

+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
<% } %> - <% if((facebook || twitter || github || gitlab || dropbox || google || ldap) && email) { %>
<% }%> -- cgit v1.2.3 From ff545b268871be7b6552638427a59a9a6eac5dd1 Mon Sep 17 00:00:00 2001 From: neopostmodern Date: Mon, 9 Jan 2017 12:49:23 +0100 Subject: Allow displaying LDAP provider name on sign-in modal --- public/views/signin-modal.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/views/signin-modal.ejs b/public/views/signin-modal.ejs index 7c52e0f3..e9c54b33 100644 --- a/public/views/signin-modal.ejs +++ b/public/views/signin-modal.ejs @@ -42,7 +42,7 @@
<% }%> <% if(ldap) { %> -

Via LDAP

+

Via <% if (ldap.providerName) { %> <%- ldap.providerName %> (LDAP) <% } else { %> LDAP <% } %>

-- cgit v1.2.3 From 89b8ddeabae81fd3a8891ce9d8191fbc9e27c83c Mon Sep 17 00:00:00 2001 From: 蒼時弦也 Date: Tue, 10 Jan 2017 10:02:37 +0800 Subject: Add limited and protected permission --- public/js/index.js | 22 +++++++++++++++++++++- public/views/body.ejs | 2 ++ 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 56766657..5b606242 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -857,7 +857,9 @@ window.ui = { freely: $(".ui-permission-freely"), editable: $(".ui-permission-editable"), locked: $(".ui-permission-locked"), - private: $(".ui-permission-private") + private: $(".ui-permission-private"), + limited: $(".ui-permission-limited"), + protected: $(".ui-permission-protected") }, delete: $(".ui-delete-note") }, @@ -2247,6 +2249,14 @@ ui.infobar.permission.locked.click(function () { ui.infobar.permission.private.click(function () { emitPermission("private"); }); +//limited +ui.infobar.permission.limited.click(function() { + emitPermission("limited"); +}); +//protected +ui.infobar.permission.protected.click(function() { + emitPermission("protected"); +}); // delete note ui.infobar.delete.click(function () { $('.delete-modal').modal('show'); @@ -2285,6 +2295,14 @@ function updatePermission(newPermission) { label = ' Private'; title = "Only owner can view & edit"; break; + case "limited": + label = ' Limited'; + title = "Signed people can view and edit" + break; + case "protected": + label = ' Protected'; + title = "Signed people can view"; + break; } if (personalInfo.userid && owner && personalInfo.userid == owner) { label += ' '; @@ -2302,6 +2320,7 @@ function havePermission() { bool = true; break; case "editable": + case "limited": if (!personalInfo.login) { bool = false; } else { @@ -2310,6 +2329,7 @@ function havePermission() { break; case "locked": case "private": + case "protected": if (!owner || personalInfo.userid != owner) { bool = false; } else { diff --git a/public/views/body.ejs b/public/views/body.ejs index 83a82fa3..79e36141 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -19,6 +19,8 @@
  • Editable - Signed people can edit
  • Locked - Only owner can edit
  • Private - Only owner can view & edit
    • +
  • Limited - Signed people can edit & view
    • +
  • Protected - Only owner can edit
  • Delete this note
    • -- cgit v1.2.3 From 7b02c48d93d05e3ced0a030a13d620559710c9cd Mon Sep 17 00:00:00 2001 From: 蒼時弦也 Date: Tue, 10 Jan 2017 14:13:30 +0800 Subject: Adjust permission order to more clarly --- public/js/index.js | 14 +++++++------- public/views/body.ejs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 5b606242..4cbc6b93 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2287,22 +2287,22 @@ function updatePermission(newPermission) { label = ' Editable'; title = "Signed people can edit"; break; - case "locked": - label = ' Locked'; - title = "Only owner can edit"; + case "limited": + label = ' Limited'; + title = "Signed people can view & edit" break; case "private": label = ' Private'; title = "Only owner can view & edit"; break; - case "limited": - label = ' Limited'; - title = "Signed people can view and edit" - break; case "protected": label = ' Protected'; title = "Signed people can view"; break; + case "locked": + label = ' Locked'; + title = "Only owner can edit"; + break; } if (personalInfo.userid && owner && personalInfo.userid == owner) { label += ' '; diff --git a/public/views/body.ejs b/public/views/body.ejs index 79e36141..988d4f5b 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -17,10 +17,10 @@ -- cgit v1.2.3 From 758607d37808b7fee2957bdb33eeda44e02233d4 Mon Sep 17 00:00:00 2001 From: 蒼時弦也 Date: Tue, 10 Jan 2017 15:15:12 +0800 Subject: Add fa-stack style to public/js/index.js --- public/js/index.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 4cbc6b93..7ddc696a 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2288,16 +2288,22 @@ function updatePermission(newPermission) { title = "Signed people can edit"; break; case "limited": - label = ' Limited'; - title = "Signed people can view & edit" + label = ' Limited'; + title = "Signed people can edit & guest can't view" break; case "private": label = ' Private'; title = "Only owner can view & edit"; break; case "protected": - label = ' Protected'; - title = "Signed people can view"; + label = '' + + '' + + '' + + ' Protected'; + title = "Only owner can edit & guest can't view"; break; case "locked": label = ' Locked'; -- cgit v1.2.3 From a9fe43ac3a38f036d4f9baa27c50fc9b5fea8c1f Mon Sep 17 00:00:00 2001 From: 蒼時弦也 Date: Tue, 10 Jan 2017 17:22:57 +0800 Subject: Update limited/protected permission icon --- public/js/index.js | 10 ++-------- public/views/body.ejs | 4 ++-- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 7ddc696a..057ddd9d 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2288,10 +2288,7 @@ function updatePermission(newPermission) { title = "Signed people can edit"; break; case "limited": - label = ' Limited'; + label = ' Limited'; title = "Signed people can edit & guest can't view" break; case "private": @@ -2299,10 +2296,7 @@ function updatePermission(newPermission) { title = "Only owner can view & edit"; break; case "protected": - label = '' + - '' + - '' + - ' Protected'; + label = ' Protected'; title = "Only owner can edit & guest can't view"; break; case "locked": diff --git a/public/views/body.ejs b/public/views/body.ejs index 988d4f5b..6500e607 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -17,9 +17,9 @@
    • style="display: none;"<% } %>> Freely - Anyone can edit
    • Editable - Signed people can edit
      • -
    • Limited - Signed people can edit & view
      • +
    • Limited - Signed people can edit & view
    • Private - Only owner can view & edit
      • -
    • Protected - Only owner can edit
      • +
    • Protected - Only owner can edit
    • Locked - Only owner can edit
    • Delete this note
      • -- cgit v1.2.3 From d6be0cf755e31002d6265b706785c06e06a0ae56 Mon Sep 17 00:00:00 2001 From: 蒼時弦也 Date: Tue, 10 Jan 2017 20:22:06 +0800 Subject: Update limite icon to fa-id-card --- public/js/index.js | 2 +- public/views/body.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 057ddd9d..91dc8f0d 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2288,7 +2288,7 @@ function updatePermission(newPermission) { title = "Signed people can edit"; break; case "limited": - label = ' Limited'; + label = ' Limited'; title = "Signed people can edit & guest can't view" break; case "private": diff --git a/public/views/body.ejs b/public/views/body.ejs index 6500e607..86469ce9 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -17,7 +17,7 @@
      • style="display: none;"<% } %>> Freely - Anyone can edit
      • Editable - Signed people can edit
        • -
      • Limited - Signed people can edit & view
        • +
      • Limited - Signed people can edit & view
      • Private - Only owner can view & edit
      • Protected - Only owner can edit
      • Locked - Only owner can edit
        • -- cgit v1.2.3 From 42d684329fbd1b139b253d448e444349e891d775 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 12 Jan 2017 17:13:52 +0800 Subject: Workaround text shadow for font antialias might cause cut off in Edge --- public/css/site.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/css/site.css b/public/css/site.css index 3685149b..d88f8429 100644 --- a/public/css/site.css +++ b/public/css/site.css @@ -3,7 +3,7 @@ body { font-smoothing: subpixel-antialiased !important; -webkit-font-smoothing: subpixel-antialiased !important; -moz-osx-font-smoothing: auto !important; - text-shadow: 1px 1px 1.2px rgba(0, 0, 0, 0.004); + text-shadow: 0 0 1em transparent, 1px 1px 1.2px rgba(0, 0, 0, 0.004); /*text-rendering: optimizeLegibility;*/ -webkit-overflow-scrolling: touch; font-family: "Source Sans Pro", Helvetica, Arial, sans-serif; -- cgit v1.2.3 From 0432fef26762cfa62338a11b864488a4d525b233 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 12 Jan 2017 17:14:32 +0800 Subject: Fix history list might check pagination on clear and open --- public/js/cover.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'public') diff --git a/public/js/cover.js b/public/js/cover.js index 2f35bd28..a8d8ecfe 100644 --- a/public/js/cover.js +++ b/public/js/cover.js @@ -107,9 +107,11 @@ $(".ui-history").click(function () { function checkHistoryList() { if ($("#history-list").children().length > 0) { + $('.pagination').show(); $(".ui-nohistory").hide(); $(".ui-import-from-browser").hide(); } else if ($("#history-list").children().length == 0) { + $('.pagination').hide(); $(".ui-nohistory").slideDown(); getStorageHistory(function (data) { if (data && data.length > 0 && getLoginState() && historyList.items.length == 0) { -- cgit v1.2.3 From ffa14cfeefb9afcc6f177a9ecfe710ffb3227242 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 12 Jan 2017 17:17:36 +0800 Subject: Fix sortOnlineUserList might not check property existence before comparsion --- public/js/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 91dc8f0d..7effcbd7 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2946,14 +2946,14 @@ function sortOnlineUserList(list) { else if (usera.idle && !userb.idle) return 1; else { - if (usera.name && usera.name.toLowerCase() < userb.name.toLowerCase()) { + if (usera.name && userb.name && usera.name.toLowerCase() < userb.name.toLowerCase()) { return -1; - } else if (usera.name && usera.name.toLowerCase() > userb.name.toLowerCase()) { + } else if (usera.name && userb.name && usera.name.toLowerCase() > userb.name.toLowerCase()) { return 1; } else { - if (usera.color && usera.color.toLowerCase() < userb.color.toLowerCase()) + if (usera.color && userb.color && usera.color.toLowerCase() < userb.color.toLowerCase()) return -1; - else if (usera.color && usera.color.toLowerCase() > userb.color.toLowerCase()) + else if (usera.color && userb.color && usera.color.toLowerCase() > userb.color.toLowerCase()) return 1; else return 0; -- cgit v1.2.3 From 5f65795e79561f7b787767b7c184f66b65f74c5f Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 12 Jan 2017 19:04:17 +0800 Subject: Fix permission order and keep wording consistency --- public/js/index.js | 12 ++++++------ public/views/body.ejs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 7effcbd7..1dfb02e1 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2291,17 +2291,17 @@ function updatePermission(newPermission) { label = ' Limited'; title = "Signed people can edit & guest can't view" break; - case "private": - label = ' Private'; - title = "Only owner can view & edit"; + case "locked": + label = ' Locked'; + title = "Only owner can edit"; break; case "protected": label = ' Protected'; title = "Only owner can edit & guest can't view"; break; - case "locked": - label = ' Locked'; - title = "Only owner can edit"; + case "private": + label = ' Private'; + title = "Only owner can view & edit"; break; } if (personalInfo.userid && owner && personalInfo.userid == owner) { diff --git a/public/views/body.ejs b/public/views/body.ejs index 86469ce9..f0444bef 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -17,10 +17,10 @@ -- cgit v1.2.3 From 747629e549fb5c32e1acf18e24bfc6a7e1cd5b0c Mon Sep 17 00:00:00 2001 From: Sheogorath Date: Thu, 12 Jan 2017 04:25:58 +0100 Subject: Add `allowemailregister` option --- public/views/signin-modal.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/views/signin-modal.ejs b/public/views/signin-modal.ejs index e9c54b33..a8af62e7 100644 --- a/public/views/signin-modal.ejs +++ b/public/views/signin-modal.ejs @@ -84,7 +84,7 @@
        - + <% if(allowemailregister) { %><% }%>
        -- cgit v1.2.3 From 8b378d7847b82f34ceedfdfbf27d5fe324ab1944 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 12 Jan 2017 23:36:23 +0800 Subject: Update to use shorter wording in limited and protected permissions --- public/js/index.js | 4 ++-- public/views/body.ejs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'public') diff --git a/public/js/index.js b/public/js/index.js index 1dfb02e1..14235bc3 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -2289,7 +2289,7 @@ function updatePermission(newPermission) { break; case "limited": label = ' Limited'; - title = "Signed people can edit & guest can't view" + title = "Signed people can edit (forbid guest)" break; case "locked": label = ' Locked'; @@ -2297,7 +2297,7 @@ function updatePermission(newPermission) { break; case "protected": label = ' Protected'; - title = "Only owner can edit & guest can't view"; + title = "Only owner can edit (forbid guest)"; break; case "private": label = ' Private'; diff --git a/public/views/body.ejs b/public/views/body.ejs index f0444bef..5ad1733e 100644 --- a/public/views/body.ejs +++ b/public/views/body.ejs @@ -17,9 +17,9 @@