Merge branch 'staging' into develop

frappe/__init__.py

@@ -17,7 +17,7 @@ from faker import Faker
 from .exceptions import *
 from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
 
-__version__ = '10.1.68'
+__version__ = '10.1.69'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/communication/comment.py

@@ -96,15 +96,17 @@ def notify_mentions(doc):
 
 		recipients = [frappe.db.get_value("User", {"enabled": 1, "name": name, "user_type": "System User", "allowed_in_mentions": 1}, "email")
 			for name in mentions]
+		link = get_link_to_form(doc.reference_doctype, doc.reference_name, label=parent_doc_label)
+
 		frappe.sendmail(
 			recipients=recipients,
 			sender=frappe.session.user,
 			subject=subject,
 			template="mentioned_in_comment",
 			args={
-				"sender_fullname": sender_fullname,
+				"body_content": _("{0} mentioned you in a comment in {1}").format(sender_fullname, link),
 				"comment": doc,
-				"link": get_link_to_form(doc.reference_doctype, doc.reference_name, label=parent_doc_label)
+				"link": link
 			},
 			header=[_('New Mention'), 'orange']
 		)

frappe/desk/reportview.py

@@ -213,7 +213,7 @@ def delete_items():
 	"""delete selected items"""
 	import json
 
-	il = sorted(json.loads(frappe.form_dict.get('items')), reverse=True)
+	il = sorted(json.loads(frappe.form_dict.get('items')), reverse=True, key=str)
 	doctype = frappe.form_dict.get('doctype')
 
 	failed = []

frappe/email/receive.py

@@ -553,6 +553,7 @@ class Email:
 
 # fix due to a python bug in poplib that limits it to 2048
 poplib._MAXLINE = 20480
+imaplib._MAXLINE = 20480
 
 class TimerMixin(object):
 	def __init__(self, *args, **kwargs):

frappe/hooks.py

@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.48'
+staging_version = '11.0.3-beta.49'
 
 app_email = "info@frappe.io"
 

frappe/public/js/frappe/chat.js

@@ -1994,7 +1994,7 @@ class extends Component {
 			h("li", null,
 				h("a", { class: props.active ? "active": "", onclick: () => {
 					if (props.last_message) {
-						props.last_message.seen(frappe.session.user);
+						frappe.chat.message.seen(props.last_message.name);
 					}
 					props.click(props)
 				} },

frappe/templates/emails/mentioned_in_comment.html

@@ -1,5 +1,5 @@
 <p>
-	{{ _("{0} mentioned you in a comment in {1}").format(sender_fullname, link) }}
+	{{ body_content }}
 </p>
 <blockquote
 	style="border-left: 3px solid #d1d8dd; padding: 7px 15px; margin-left: 0px;">

frappe/twofactor.py

@@ -50,8 +50,8 @@ def get_cached_user_pass():
 	user = pwd = None
 	tmp_id = frappe.form_dict.get('tmp_id')
 	if tmp_id:
-		user = frappe.cache().get(tmp_id+'_usr')
-		pwd = frappe.cache().get(tmp_id+'_pwd')
+		user = frappe.safe_decode(frappe.cache().get(tmp_id+'_usr'))
+		pwd = frappe.safe_decode(frappe.cache().get(tmp_id+'_pwd'))
 	return (user, pwd)
 
 def authenticate_for_2factor(user):

frappe/utils/change_log.py

@@ -138,7 +138,7 @@ def get_app_last_commit_ref(app):
 
 def check_for_update():
 	updates = frappe._dict(major=[], minor=[], patch=[])
-	apps    = get_versions()
+	apps = get_versions()
 
 	for app in apps:
 		app_details = check_release_on_github(app)
@@ -146,7 +146,9 @@ def check_for_update():
 
 		github_version, org_name = app_details
 		# Get local instance's current version or the app
-		instance_version = Version(apps[app]['branch_version'].split(' ')[0])
+
+		branch_version = apps[app]['branch_version'].split(' ')[0] if apps[app].get('branch_version', '') else ''
+		instance_version = Version(branch_version or apps[app].get('version'))
 		# Compare and popup update message
 		for update_type in updates:
 			if github_version.__dict__[update_type] > instance_version.__dict__[update_type]:

package.json

@@ -22,7 +22,7 @@
     "awesomplete": "^1.1.2",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
-    "frappe-datatable": "^1.7.2",
+    "frappe-datatable": "^1.7.3",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",

requirements.txt

@@ -34,7 +34,7 @@ ndg-httpsclient
 pyasn1
 zxcvbn-python
 unittest-xml-reporting
-oauthlib
+oauthlib==2.1.0
 pdfkit
 PyJWT
 PyPDF2

yarn.lock

@@ -1518,9 +1518,9 @@ forwarded@~0.1.2:
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
 frappe-datatable@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.7.2.tgz#9a2cb3d643959b759b6bc3a883667b58d2ba78fe"
-  integrity sha512-yUSBy46Bkbo4evP4nEcXzPVC0cMLBIcOLV6J509RJfmM+IEoQbhEeOcxta0fQ9RcgvzRHbL+TX+wkib53HsfSw==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.7.3.tgz#dadddf01867723bf0862918dd62cfea4652416a3"
+  integrity sha512-72LUx0ZRRjFPLFQUzgB7Uywpxgk1rFLjyzOq5yQ5Mr2G8u0t3AoUJLRG2lAqFD49JOxezVb6Oa03Qmon1DCExA==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"
@@ -2449,9 +2449,9 @@ lodash@^4.14.0:
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 lodash@^4.17.5:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-  integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
 log-symbols@2.2.0:
   version "2.2.0"