From 867e9997d2f354d6b4bd6e9ee6c25aeae2ab2afa Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Fri, 22 Sep 2017 15:05:48 +0530
Subject: [PATCH 01/31] [MINOR] added --make-copy-force to force copy assets

---
 .vscode/settings.json    |  3 +++
 frappe/build.py          | 25 +++++++++++++++++--------
 frappe/commands/utils.py |  5 +++--
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..fe7159848b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.linting.pylintEnabled": false
+}
\ No newline at end of file
diff --git a/frappe/build.py b/frappe/build.py
index 2a201fee6f..77f42fc59d 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals, print_function
 from frappe.utils.minify import JavascriptMinify
 import subprocess
+import warnings
 
 from six import iteritems, text_type
 
@@ -25,12 +26,12 @@ def setup():
 		except ImportError: pass
 	app_paths = [os.path.dirname(pymodule.__file__) for pymodule in pymodules]
 
-def bundle(no_compress, make_copy=False, verbose=False):
+def bundle(no_compress, make_copy=False, make_copy_force=False, verbose=False):
 	"""concat / minify js files"""
 	# build js files
 	setup()
 
-	make_asset_dirs(make_copy=make_copy)
+	make_asset_dirs(make_copy=make_copy, make_copy_force = make_copy_force)
 
 	# new nodejs build system
 	command = 'node --use_strict ../apps/frappe/frappe/build.js --build'
@@ -60,7 +61,7 @@ def watch(no_compress):
 
 	# 	time.sleep(3)
 
-def make_asset_dirs(make_copy=False):
+def make_asset_dirs(make_copy=False, make_copy_force=False):
 	assets_path = os.path.join(frappe.local.sites_path, "assets")
 	for dir_path in [
 			os.path.join(assets_path, 'js'),
@@ -80,11 +81,19 @@ def make_asset_dirs(make_copy=False):
 
 		for source, target in symlinks:
 			source = os.path.abspath(source)
-			if not os.path.exists(target) and os.path.exists(source):
-				if make_copy:
-					shutil.copytree(source, target)
-				else:
-					os.symlink(source, target)
+			if os.path.exists(source):
+				if os.path.exists(target):
+					if make_copy_force:
+						if not make_copy:
+							os.unlink(target)
+							shutil.copytree(source, target)
+						else:
+							warnings.warn('Target {target} already exists.'.format(target = target))
+							pass # if exists, don't make copy.
+					else:
+						os.symlink(source, target)
+			else:
+				warnings.warn('Source {source} does not exists.'.format(source = source))
 
 def build(no_compress=False, verbose=False):
 	assets_path = os.path.join(frappe.local.sites_path, "assets")
diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index 7c18bdbc78..9fa1ff3dbe 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -7,13 +7,14 @@ from frappe.commands import pass_context, get_site
 
 @click.command('build')
 @click.option('--make-copy', is_flag=True, default=False, help='Copy the files instead of symlinking')
+@click.option('--make-copy-force', is_flag=True, default=False, help='Copy the files instead of symlinking with force')
 @click.option('--verbose', is_flag=True, default=False, help='Verbose')
-def build(make_copy=False, verbose=False):
+def build(make_copy=False, make_copy_force = False, verbose=False):
 	"Minify + concatenate JS and CSS files, build translations"
 	import frappe.build
 	import frappe
 	frappe.init('')
-	frappe.build.bundle(False, make_copy=make_copy, verbose=verbose)
+	frappe.build.bundle(False, make_copy=make_copy, make_copy_force = make_copy_force, verbose=verbose)
 
 @click.command('watch')
 def watch():

From 21b822424b01cc78fdd6dd10ec701b87889589bd Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Fri, 22 Sep 2017 15:34:32 +0530
Subject: [PATCH 02/31] [FIX] build - for symlinks, --make-coppy - for copy (if
 symlinks doesn't exists, else no copy), --make-copy-force (force copy, cleans
 symlinks or dirs)

---
 frappe/build.py | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/frappe/build.py b/frappe/build.py
index 77f42fc59d..9421ca7e47 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -62,6 +62,7 @@ def watch(no_compress):
 	# 	time.sleep(3)
 
 def make_asset_dirs(make_copy=False, make_copy_force=False):
+	# don't even think of making assets_path absolute - rm -rf ahead.
 	assets_path = os.path.join(frappe.local.sites_path, "assets")
 	for dir_path in [
 			os.path.join(assets_path, 'js'),
@@ -82,16 +83,25 @@ def make_asset_dirs(make_copy=False, make_copy_force=False):
 		for source, target in symlinks:
 			source = os.path.abspath(source)
 			if os.path.exists(source):
-				if os.path.exists(target):
-					if make_copy_force:
-						if not make_copy:
+				if make_copy_force:
+					if os.path.exists(target):
+						if os.path.islink(target):
 							os.unlink(target)
-							shutil.copytree(source, target)
 						else:
-							warnings.warn('Target {target} already exists.'.format(target = target))
-							pass # if exists, don't make copy.
+							shutil.rmtree(target)
+						shutil.copytree(source, target)
+				elif make_copy:
+					if os.path.exists(target):
+						warnings.warn('Target {target} already exists.'.format(target = target))
 					else:
-						os.symlink(source, target)
+						shutil.copytree(source, target)
+				else:
+					if os.path.exists(target):
+						if os.path.islink(target):
+							os.unlink(target)
+						else:
+							shutil.rmtree(target)
+					os.symlink(source, target)
 			else:
 				warnings.warn('Source {source} does not exists.'.format(source = source))
 

From a6056ea510358c41447a49df6eff973f0044f2f6 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Sun, 24 Sep 2017 17:23:35 +0530
Subject: [PATCH 03/31] added .vscode to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 75bee9a091..4dd4f3f6ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ locale
 dist/
 build/
 frappe/docs/current
+.vscode

From 6b517126594a68ea09719a77fb838e89420a9ec9 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 12:38:56 +0530
Subject: [PATCH 04/31] [MINOR, UX] added color contrast to color picker

---
 frappe/public/js/frappe/form/controls/color.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js
index d13c22d19d..646f7de2f1 100644
--- a/frappe/public/js/frappe/form/controls/color.js
+++ b/frappe/public/js/frappe/form/controls/color.js
@@ -34,12 +34,15 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
 		return `<div class="color-box" data-color="${hex}" style="background-color: ${hex}"></div>`;
 	},
 	set_formatted_input: function(value) {
-		this._super(value);
+		this._super(value)
+
+		if (!value) value = '#FFFFFF'
+		const contrast    = frappe.ui.color.get_contrast_color(value)
 
-		if(!value) value = '#ffffff';
 		this.$input.css({
-			"background-color": value
-		});
+			"background-color": value,
+					   "color": contrast
+		})
 	},
 	bind_events: function () {
 		var mousedown_happened = false;

From ed8b4afde8b6e4d79abb519ffa7268b9f9817eb4 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 12:46:41 +0530
Subject: [PATCH 05/31] fixed codacy

---
 frappe/public/js/frappe/form/controls/color.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js
index 646f7de2f1..7b14b45aca 100644
--- a/frappe/public/js/frappe/form/controls/color.js
+++ b/frappe/public/js/frappe/form/controls/color.js
@@ -34,15 +34,15 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
 		return `<div class="color-box" data-color="${hex}" style="background-color: ${hex}"></div>`;
 	},
 	set_formatted_input: function(value) {
-		this._super(value)
+		this._super(value);
 
-		if (!value) value = '#FFFFFF'
-		const contrast    = frappe.ui.color.get_contrast_color(value)
+		if (!value) value = '#FFFFFF';
+		const contrast    = frappe.ui.color.get_contrast_color(value);
 
 		this.$input.css({
 			"background-color": value,
 					   "color": contrast
-		})
+		});
 	},
 	bind_events: function () {
 		var mousedown_happened = false;

From 6a4dcb58af03f379cc572be92dee97f322bcce16 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 19:15:14 +0530
Subject: [PATCH 06/31] Wiggle Desktop Icons to have them removed, works for
 current user only - the iOS feel

---
 frappe/core/page/desktop/desktop.js           | 109 +++++++++++++++++-
 .../desk/doctype/desktop_icon/desktop_icon.py |  13 +++
 frappe/public/build.json                      |   3 +-
 frappe/public/js/lib/jquery.jrumble.min.js    |   2 +
 4 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 frappe/public/js/lib/jquery.jrumble.min.js

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index eae5b7a35d..b5dc7f7aac 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -112,13 +112,17 @@ $.extend(frappe.desktop, {
 	},
 
 	setup_module_click: function() {
+		var wiggling = false; // wiggle, wiggle, wiggle.
+
 		if(frappe.list_desktop) {
 			frappe.desktop.wrapper.on("click", ".desktop-list-item", function() {
 				frappe.desktop.open_module($(this));
 			});
 		} else {
 			frappe.desktop.wrapper.on("click", ".app-icon", function() {
-				frappe.desktop.open_module($(this).parent());
+				if ( !wiggling ) {
+					frappe.desktop.open_module($(this).parent());
+				}
 			});
 		}
 		frappe.desktop.wrapper.on("click", ".circle", function() {
@@ -127,6 +131,109 @@ $.extend(frappe.desktop, {
 				frappe.ui.notifications.show_open_count_list(doctype);
 			}
 		});
+
+		// Wiggle, Wiggle, Wiggle.
+		const DURATION_LONG_PRESS = 1000;
+		// lesser the antidode, more the wiggle (like your drunk uncle)
+		// 75 seems good to replicate the iOS feels.
+		const WIGGLE_ANTIDODE     = 75;
+
+		var   timer_id      = 0;
+		const $cases        = frappe.desktop.wrapper.find('.case-wrapper');
+		const $icons        = frappe.desktop.wrapper.find('.app-icon');
+		const $notis        = $(frappe.desktop.wrapper.find('.circle').toArray().filter((object) => {
+			// This hack is so bad, I should punch myself.
+			const doctype   = $(object).data('doctype');
+			
+			return doctype;
+		}));
+		
+		const clearWiggle   = ($close) => {
+			const $closes   = $cases.find('.module-remove');
+			$closes.hide();
+			 $notis.show();
+
+			 $icons.trigger('stopRumble');
+		};
+
+		// initiate wiggling.
+		$icons.jrumble({
+			speed: WIGGLE_ANTIDODE // seems neat enough to match the iOS way
+		});
+
+		frappe.desktop.wrapper.on('mousedown', '.app-icon', () => {
+			timer_id     = setTimeout(() => {
+				wiggling = true;
+				// hide all notifications.
+				$notis.hide();
+				
+				$cases.each((i) => {
+					const $case    = $($cases[i]);
+					const template = 
+					`
+						<div class="circle module-remove" style="background-color:#E0E0E0; color:#212121">
+							<div class="circle-text">
+								<b>
+									&times
+								</b>
+							</div>
+						</div>
+					`
+
+					$case.append(template);
+					const $close  = $case.find('.module-remove');
+					const name    = $case.data('name');
+					$close.click((event) => {
+						// good enough to create dynamic dialogs?
+						const dialog = new frappe.ui.Dialog({
+							title: __(`Hide ${name}`)
+						});
+						dialog.set_primary_action(__('Hide'), () => {
+							frappe.call({
+								  method: 'frappe.desk.doctype.desktop_icon.desktop_icon.hide',
+								    args: { name: name },
+							  	  freeze: true,
+								callback: (response) => 
+								{
+									if ( response.message ) {
+										location.reload();
+									}
+								}
+							})
+
+							dialog.hide();
+							
+							clearWiggle();
+						});
+						// Hacks, Hacks and Hacks.
+						var $cancel = dialog.get_close_btn();
+						$cancel.click(() => {
+							clearWiggle();
+						});
+						$cancel.html(__(`Cancel`));
+
+						dialog.show();
+					});
+				});
+			
+				$icons.trigger('startRumble');
+			}, DURATION_LONG_PRESS);
+		});
+		frappe.desktop.wrapper.on('mouseup mouseleave', '.app-icon', () => {
+			clearTimeout(timer_id);
+		});
+
+		// also stop wiggling if clicked elsewhere.
+		$('body').click((event) => {
+			if ( wiggling ) {
+				const $target = $(event.target);
+				// our target shouldn't be .app-icons or .close
+				const $parent = $target.parents('.case-wrapper');
+				if ( $parent.length == 0 )
+					clearWiggle();
+			}
+		});
+		// end wiggle
 	},
 
 	open_module: function(parent) {
diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py
index 1319ffba49..59118b09b8 100644
--- a/frappe/desk/doctype/desktop_icon/desktop_icon.py
+++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py
@@ -404,3 +404,16 @@ palette = (
 	('#4F8EA8', 1),
 	('#428B46', 1)
 )
+
+@frappe.whitelist()
+def hide(name, user = None):
+	if not user:
+		user = frappe.session.user
+
+	try:
+		set_hidden(name, user, hidden = 1)
+		clear_desktop_icons_cache()
+	except:
+		return False
+
+	return True
\ No newline at end of file
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 913adfe735..cf6e784ba5 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -130,7 +130,8 @@
 		"public/js/lib/jSignature.min.js",
 		"public/js/frappe/translate.js",
 		"public/js/lib/datepicker/datepicker.min.js",
-		"public/js/lib/datepicker/locale-all.js"
+		"public/js/lib/datepicker/locale-all.js",
+		"public/js/lib/jquery.jrumble.min.js"
 	],
 	"js/desk.min.js": [
 		"public/js/frappe/class.js",
diff --git a/frappe/public/js/lib/jquery.jrumble.min.js b/frappe/public/js/lib/jquery.jrumble.min.js
new file mode 100644
index 0000000000..71de6ffb7c
--- /dev/null
+++ b/frappe/public/js/lib/jquery.jrumble.min.js
@@ -0,0 +1,2 @@
+/* jRumble v1.3 - http://jackrugile.com/jrumble - MIT License */
+(function(f){f.fn.jrumble=function(g){var a=f.extend({x:2,y:2,rotation:1,speed:15,opacity:false,opacityMin:0.5},g);return this.each(function(){var b=f(this),h=a.x*2,i=a.y*2,k=a.rotation*2,g=a.speed===0?1:a.speed,m=a.opacity,n=a.opacityMin,l,j,o=function(){var e=Math.floor(Math.random()*(h+1))-h/2,a=Math.floor(Math.random()*(i+1))-i/2,c=Math.floor(Math.random()*(k+1))-k/2,d=m?Math.random()+n:1,e=e===0&&h!==0?Math.random()<0.5?1:-1:e,a=a===0&&i!==0?Math.random()<0.5?1:-1:a;b.css("display")==="inline"&&(l=true,b.css("display","inline-block"));b.css({position:"relative",left:e+"px",top:a+"px","-ms-filter":"progid:DXImageTransform.Microsoft.Alpha(Opacity="+d*100+")",filter:"alpha(opacity="+d*100+")","-moz-opacity":d,"-khtml-opacity":d,opacity:d,"-webkit-transform":"rotate("+c+"deg)","-moz-transform":"rotate("+c+"deg)","-ms-transform":"rotate("+c+"deg)","-o-transform":"rotate("+c+"deg)",transform:"rotate("+c+"deg)"})},p={left:0,top:0,"-ms-filter":"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)",filter:"alpha(opacity=100)","-moz-opacity":1,"-khtml-opacity":1,opacity:1,"-webkit-transform":"rotate(0deg)","-moz-transform":"rotate(0deg)","-ms-transform":"rotate(0deg)","-o-transform":"rotate(0deg)",transform:"rotate(0deg)"};b.bind({startRumble:function(a){a.stopPropagation();clearInterval(j);j=setInterval(o,g)},stopRumble:function(a){a.stopPropagation();clearInterval(j);l&&b.css("display","inline");b.css(p)}})})}})(jQuery);
\ No newline at end of file

From dae76e27a80b4fd84e04658680a0eadb9de85707 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 19:25:34 +0530
Subject: [PATCH 07/31] [FIX] fixed for desktop titles

---
 frappe/core/page/desktop/desktop.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index b5dc7f7aac..7e55301d20 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -182,11 +182,11 @@ $.extend(frappe.desktop, {
 
 					$case.append(template);
 					const $close  = $case.find('.module-remove');
-					const name    = $case.data('name');
+					const name    = $case.attr('title');
 					$close.click((event) => {
 						// good enough to create dynamic dialogs?
 						const dialog = new frappe.ui.Dialog({
-							title: __(`Hide ${name}`)
+							title: __(`Hide ${name}?`)
 						});
 						dialog.set_primary_action(__('Hide'), () => {
 							frappe.call({

From a38b6913cef1ac8a418d0330e8d6f6eca3cfec4c Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 19:33:54 +0530
Subject: [PATCH 08/31] added a Makefile for faster dev, and clean command to
 remove eggs, wheels, builds, dist - anything that clutters devspace

---
 Makefile |  2 ++
 setup.py | 38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..f30645229e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+clean:
+	python setup.py clean
\ No newline at end of file
diff --git a/setup.py b/setup.py
index bbcf6cfb37..797d8e4826 100644
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,7 @@
+# imports - standard imports
+import os, shutil
+from distutils.command.clean import clean as Clean
+
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 import re, ast
@@ -11,6 +15,34 @@ with open('frappe/__init__.py', 'rb') as f:
 
 requirements = parse_requirements("requirements.txt", session="")
 
+class CleanCommand(Clean):
+    def run(self):
+        Clean.run(self)
+
+        basedir = os.path.abspath(os.path.dirname(__file__))
+
+        for relpath in ['build', '.cache', '.coverage', 'dist', 'frappe.egg-info']:
+            abspath = os.path.join(basedir, relpath)
+            
+            if os.path.exists(abspath):
+                if os.path.isfile(abspath):
+                    os.remove(abspath)
+                else:
+                    shutil.rmtree(abspath)
+
+        for dirpath, dirnames, filenames in os.walk(basedir):
+            for filename in filenames:
+                _, extension = os.path.splitext(filename)
+                
+                if extension in ['.pyc']:
+                    abspath = os.path.join(dirpath, filename)
+                    os.remove(abspath)
+                
+            for dirname in dirnames:
+                if dirname in ['__pycache__']:
+                    abspath = os.path.join(dirpath,  dirname)
+                    shutil.rmtree(abspath)
+
 setup(
 	name='frappe',
 	version=version,
@@ -21,5 +53,9 @@ setup(
 	zip_safe=False,
 	include_package_data=True,
 	install_requires=[str(ir.req) for ir in requirements],
-	dependency_links=[str(ir._link) for ir in requirements if ir._link]
+	dependency_links=[str(ir._link) for ir in requirements if ir._link],
+	cmdclass         = \
+	{
+		'clean': CleanCommand
+	}
 )

From eb152073a73d2fa6e68ea6c3757ce843416f39d4 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 19:48:18 +0530
Subject: [PATCH 09/31] fu codacy

---
 frappe/core/page/desktop/desktop.js              | 16 ++++++++--------
 frappe/desk/doctype/desktop_icon/desktop_icon.py |  2 +-
 frappe/public/js/frappe/form/controls/color.js   |  3 +--
 setup.py                                         |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index 7e55301d20..f70f58fe75 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -148,12 +148,12 @@ $.extend(frappe.desktop, {
 			return doctype;
 		}));
 		
-		const clearWiggle   = ($close) => {
+		const clearWiggle   = () => {
 			const $closes   = $cases.find('.module-remove');
 			$closes.hide();
-			 $notis.show();
+			$notis.show();
 
-			 $icons.trigger('stopRumble');
+			$icons.trigger('stopRumble');
 		};
 
 		// initiate wiggling.
@@ -178,21 +178,21 @@ $.extend(frappe.desktop, {
 								</b>
 							</div>
 						</div>
-					`
+					`;
 
 					$case.append(template);
 					const $close  = $case.find('.module-remove');
 					const name    = $case.attr('title');
-					$close.click((event) => {
+					$close.click(() => {
 						// good enough to create dynamic dialogs?
 						const dialog = new frappe.ui.Dialog({
 							title: __(`Hide ${name}?`)
 						});
 						dialog.set_primary_action(__('Hide'), () => {
 							frappe.call({
-								  method: 'frappe.desk.doctype.desktop_icon.desktop_icon.hide',
-								    args: { name: name },
-							  	  freeze: true,
+								method: 'frappe.desk.doctype.desktop_icon.desktop_icon.hide',
+								args: { name: name },
+							  	freeze: true,
 								callback: (response) => 
 								{
 									if ( response.message ) {
diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py
index 59118b09b8..52461db009 100644
--- a/frappe/desk/doctype/desktop_icon/desktop_icon.py
+++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py
@@ -413,7 +413,7 @@ def hide(name, user = None):
 	try:
 		set_hidden(name, user, hidden = 1)
 		clear_desktop_icons_cache()
-	except:
+	except Exception as e:
 		return False
 
 	return True
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js
index 7b14b45aca..6e8880a72a 100644
--- a/frappe/public/js/frappe/form/controls/color.js
+++ b/frappe/public/js/frappe/form/controls/color.js
@@ -40,8 +40,7 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
 		const contrast    = frappe.ui.color.get_contrast_color(value);
 
 		this.$input.css({
-			"background-color": value,
-					   "color": contrast
+			"background-color": value, "color": contrast
 		});
 	},
 	bind_events: function () {
diff --git a/setup.py b/setup.py
index 797d8e4826..2589c6cd0d 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@ setup(
 	include_package_data=True,
 	install_requires=[str(ir.req) for ir in requirements],
 	dependency_links=[str(ir._link) for ir in requirements if ir._link],
-	cmdclass         = \
+	cmdclass = \
 	{
 		'clean': CleanCommand
 	}

From c1ab7eab450ef0a046155c45e088c419ba37e8eb Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 20:56:15 +0530
Subject: [PATCH 10/31] codacy fix

---
 frappe/core/page/desktop/desktop.js              | 2 +-
 frappe/desk/doctype/desktop_icon/desktop_icon.py | 2 +-
 setup.py                                         | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index f70f58fe75..2c8210c364 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -192,7 +192,7 @@ $.extend(frappe.desktop, {
 							frappe.call({
 								method: 'frappe.desk.doctype.desktop_icon.desktop_icon.hide',
 								args: { name: name },
-							  	freeze: true,
+								freeze: true,
 								callback: (response) => 
 								{
 									if ( response.message ) {
diff --git a/frappe/desk/doctype/desktop_icon/desktop_icon.py b/frappe/desk/doctype/desktop_icon/desktop_icon.py
index 52461db009..291a8404a1 100644
--- a/frappe/desk/doctype/desktop_icon/desktop_icon.py
+++ b/frappe/desk/doctype/desktop_icon/desktop_icon.py
@@ -413,7 +413,7 @@ def hide(name, user = None):
 	try:
 		set_hidden(name, user, hidden = 1)
 		clear_desktop_icons_cache()
-	except Exception as e:
+	except Exception:
 		return False
 
 	return True
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 2589c6cd0d..8b02d8f856 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,6 @@ class CleanCommand(Clean):
 
         for relpath in ['build', '.cache', '.coverage', 'dist', 'frappe.egg-info']:
             abspath = os.path.join(basedir, relpath)
-            
             if os.path.exists(abspath):
                 if os.path.isfile(abspath):
                     os.remove(abspath)
@@ -58,4 +57,4 @@ setup(
 	{
 		'clean': CleanCommand
 	}
-)
+)
\ No newline at end of file

From 5ac8b500a4b6f39c4b5f6de63beae4479279906d Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 21:22:17 +0530
Subject: [PATCH 11/31] fixed codacy

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8b02d8f856..87c0116832 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@ class CleanCommand(Clean):
         for dirpath, dirnames, filenames in os.walk(basedir):
             for filename in filenames:
                 _, extension = os.path.splitext(filename)
-                
                 if extension in ['.pyc']:
                     abspath = os.path.join(dirpath, filename)
                     os.remove(abspath)

From f7a82e727d21ffb8676947a8136a49871bc15554 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 21:41:40 +0530
Subject: [PATCH 12/31] updated README.md, we need better readmes

---
 .github/logo.png                              | Bin 0 -> 12673 bytes
 README.md                                     |  15 +++-
 frappe/public/build.json                      |  14 +++-
 .../js/frappe/form/controls/text_editor.js    |  19 ++++-
 frappe/public/js/frappe/ui/camera.js          |  67 ++++++++++++++++++
 frappe/public/js/lib/webcam.min.js            |   2 +
 6 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 .github/logo.png
 create mode 100644 frappe/public/js/frappe/ui/camera.js
 create mode 100644 frappe/public/js/lib/webcam.min.js

diff --git a/.github/logo.png b/.github/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..258408edfa524a4b4dfd968b70344cb257ade492
GIT binary patch
literal 12673
zcmdUWcT|%>ux|tfK@d@CD$+}&_a;T9g)TiHpi)8yL+@Asksf+gBtcLjN+<#bP?S!P
zfFNCkfOP2{?gsBW_nmw0Iq&`X-r)qY`|ZxoH#<A?o7o}O$Uuvp_7W`w0-=X#s~bZg
z6bSG+f0_#P#M(I9gFjUFb+yzXN93Ou_*bc*hsIkQ?gM5Fl0PSI3g!laPHJD6z6SL#
z8a4)bCbd3l0tCVdfvMjx4IEw^3(C4ex;L{jVf}ru%UN`6OQcD=P4cciT{Vr$`KB!I
z1pG>s|9%!P;k|#C;$SMD!GMB4yTJHHY887cLY$F;?eT+9E(3e<yL9I{c@vg=q;pK9
z`n0~+M^v6W?NaCF6kPmf;xN1ban-)Gzi;DBO?|kHnN9g^dN{KEyTvxK+q_QOxCpRl
zAj3WDV!s|mh*>@~5P2I}nl4bcKnysDD%){uxdMSaHAi+G&4*5fG+Mj$jFd+S)c)4D
zu=8|mFxPcF4}qADMJ?(QmKMg=eoIxYqw!XOsKVZeqO22;ND17oI#$`ST(e;2RJ<qz
zB7U|UzfjS6J`JZM<$B*8j9Br_SEj_dzSatKmjbMGuz_EKK-Q2na#KCc+r@DjzayJ{
z@&Yvka!&3>a$iH3q4~N*YW?ADT3i|~_~#yR6mG1@<+q_t+1h>*P;~9mmKsTrJd|Ek
z5l4rr@LueIOSfoe+6v+i?w6JpZX*iQ3nsWc_EY+m)HETGcubnjn*Xd{dCGM$=<M|b
z2g)&@i5ngt0-ir=I!|Qt?j92QxQCq0>9iAdLQS!`Z0O7~sBl)vrZPexx24gTq(;NK
zyH!*8mmUtp2G0-o3lIM^zj4Ugi$R)qR74ST#jYGITj$1or3de{MbJenNNFAI#q~Td
z1fLs5X}DgSK-(Qh^YUxqK$Z}`j;IuZok@6Y=eT_CJ3&NI?swa8wu#K*niM7o1S9QW
zfLC{xUYl_^9fvfp3)D#Y+fECKMD2AvwUg81FX1{C+kcay5m35+LVb~U0s@imnvLzT
z5J?xc66(%}@|j>VJ@T0sB~$~krl;o+k*qwk=|0b+jPV90Ay&-h6&b>9kAw}JR_2oS
z{qmxCvlR)S;{yM@!t#|K?PU+9-{F5=qZsI5$#8uD(;DGdCW`c}$YbNNS(BY5p1F4P
z<F+o)AVG`Y@zY(xs=7^|gXn_~++NN1zN*{ku^TDo^sX;d2(nuH?U!oO1%aqBZ7t9A
z7`2+kjf!F4Vv{9^Bce_aO32Tb0X8az*_9(cP(=$uag8>%o6Z&jxs#?7WYzE?7HO_~
z9!3QeOjMVDtYPShk6S>QVF!ur0|fG+&B|r@Ay)@nq<sb>AS)Gk0^;49+Ozq`(kl^Z
z?zV)tQ}oU{K?jM{txI&=AdM*I+ZhUU4rv?g{>Bn-H6}-Eu>!vOH^Y_t!&H@Csvhhi
zzE5u7mTLdSMp2<K`*sgqznp26!`rAwfAG_f_-Kg4v6UO3vzPQiS@2R0pDO#WuacZh
z6`qKc0)9Rz#tPOn+Qf)++A_=$9qsf?5qaU0db-)CCuqguFSbT^?)$DN7v*sZ&~GUf
zXxwyl7HZ5B(QXYHBfPAI?H(|s*}bh%EpObOz?5sy-h4BDm`5A6n|+__*Dh^zVZYM3
zU;35j7FTu?b;rUy5d(ry#$UQj&0)slE65BQjOmm25~E_I7<RGOr=aYb+jpe}9h2(w
zH6(dtvQ|4uG3Z|>YH)x1j7^>h)52ZaR<;aOxnwkcyonBS`L-fVd#{r8`P<yz+XfHt
zmo7Y~gg}nfN=*TLJ65YmBruN0O$dn&0y%E}JJ00izw`WGig`Tc|0N3iZ@EPDy)ukx
zDj)>jUo3V!`fL@DmIFm@iWeWFaF~EQmiu-*P&$mq9)?3zl>IU%$BWwA!6T=LwYqVq
z^igNoQ)QL;JVvxsnk>Di=maMhG>9?bx2$|$X2DQ1Oh@}g7P`3M_R||!3~aZ}j5y3B
z#v%pFQL+hM9>J{jaPt6pnQHU%;rEQ&w=|FT+{D6aD^G0vc^!utD3&_PPx1Y#VLT#@
zq!2`?ohq}v{gF_XRx5=*<<myHQR<jeiM%)K7-|<hHso;1h!9De#lDh88l82BQVdJb
zOY)xzlr3i@uW*z5w}sPrSjEjSon6Mv$$7;8&0cLpEA_<RUK1`ITd58H_{4#`e^Xtj
z;vT(cv*zr+88L6x_+?ix!8u_wE3-fh>$iXQPmAF2m?qXi1m3U9oRIC@DU!nzw*MHD
zNpq|8jbU(bZojfo?&N1(&C4w9RIOX-3G1gihA!$jp)Wo*Kurz)`~#P<tDD>C^~z)W
z9-r}>AyUdsTeovM-OlqX#Vq}dw(3s$`kVZ-jS-6BldglEGY*rL)9p#u)qmCvVTs>U
zjk+MFfvr=pWlI4OM}pN>06scjj8tZNZsA@2R*TQG3*wX|QTf%rv$az{4;wNs-Bb`-
zgVB3hOUBVfT1nRA^NcMmhYal)6O0D40@+GLG>xyp&c4X|E;877`_$|Y2pgozL0*8~
zvHjCxn3$4X2b|`f8r9p8k1=3+g`*rt-q^%e^b<7&q26&e4nl})Ol5uCl}M{^-vyLc
zuPeyg5pMc7q)GMf<VO0o_Mq+DQ&+D*Pu+)}Mk4}rCxVPRnA#{eVs+82&M$Q56s9&6
zopN|p&BALJUYNEGj_-Pm@{FY>J5^;i*6;9@rxI+94<#ZR;K82tBa@#EVeP&<q*XYy
zO`$-eBJkE+g$9pBSF>Z>jILM2tsT;408BL$y)N0TF#AUWnp@s2eBI9VskhYJJ5G9~
zaC&#~ga$Q*+?zX$P`Rn?7uwf|65sc=7ncH&sKl*IJI{>{=cIt`lJ!yZnpTZEn2uIp
zbN5-Dp-Eufy0qyTi#IzMY8x+Xa*y9y-+s4O&Zx@hL6t4Od>GE#BVxqAS;tKQEWv*n
z0kX4-e7!Sear9>pN_P4Zy^6R4soaI)oSpN$WV0dP9XP#UPpPY-PPQ{oW53Nw1#rlJ
zvpmz2PBu4r2=q>Eaf+ca*~8uctRpuu)aXS;p2&ICs;olJ<X^wl+Fk&?KcSH9{l45X
zQ4xP$eEc=~U`(m5Mg;w@pI>h~Lg#oH8lJHA!~z1}F@J&DQ3Z!e$29rl*GB@_C#0T}
z*FMKE8`|)fhWs{acUTXWum{$NV?KTtLOoI=wEs~OI{4L6kni!2k~4i+Sp4za3$k=a
z-uN-p%j2aVN}Sn0jNUpnhxb2Qjk#lGjwi^AD|+3sn;{)HKCDX>ss7{pRlz|^w0*wY
zKbg58bpA~K8}csrXtx31cig}7?N9b-1ST&%7*(*sCIErl?XX<l@_b)?O&PjLazFS<
zsBPD)OSuiUr1)Jv*0OJ6=W-g(V#q;`Z~qa#+j|$_4ZSe^*BvaB_icjf_A>UdGQmQR
z!8YhAhkVUHP$Im{%l8iHNu0m<`0^(J<?0+ie+x}R^1IxcNHlAaI^u5^2Oe4N`*3z|
z%yQKT(a(l3FoLJAm_7@`($N6_p>Lj}FgjyrGf3*<XbZE|oRI)fK~0!8r#G!&INnU5
zz9?d_Y9J?<6-b*?bNu~##0;@c2r(bCDf&)!pLT=;>}EVm@FtI+8Nu`YfK=3HIlk_@
zdz4i?`Mi{njZap4DH{U@?eQA1@@0R6!t$S2x7;BVQ~xe^%<<h(oXz7iz6K@H63^6Q
z_9CDgXHg6gEjC<}7=iWgLHnVZnJTh6{O(rmKvtu}8_E^AH#WOJz7vPjzuxDEl|HHT
zk6Q12gHc#?IN4-lKK<BaCFHdgL3T)=MvSh33);+2{rj-+cHJS?cv3K6&qYsn(2hSy
zubQgKW_kPv4%a=4^skIqvD2<g_MrbVu^L5Oko1B{S!0;aw9`i7BnxlH;7IOaJp@0^
z>7E}1HIFPMsbS=r6N(8E0Jj%7=yx*f7|L9@0PCrlNd6LlkGzzUxV=%xTkZ<+4C&i#
zSQN?^LP+fmtMa|6a<>DrwvQKBJMpSxh#g;_X>EV_$m0wI;#&DUtjWqP4~i(HY2YkP
zp(pqCSI|=`iTc0H8yl}#!)w+(^8ithYxeu`5Z8u0tZH@9_qOnYZm@k<yeA#>XQUlT
zU2ENTIys%yCn1otS($%ERt9oJ5CRRz-3Qe?5Qw+NAALe;H#B>DG<D|@y7J8BmqB&?
z%yr5?_R$X9S4uW6py)>l+>8(Ui!WoUFI^YS)7E~IsdL5&Mqf(oBs`P%njXfXgK$?O
zv}94StGxp{11no`E{u)iG7%Z;BaZ&|wQ7n;z2Q+PJ4flKd%s}e*E%jor)k$Ji{{Kv
zxka?hwQTrza`<L_ug$rJsM%T$%q*+@oKBzOjv~TUL_V7SzB8loF^4k+MeMGs^2Cjx
z-6jO9Ot<xYo!nNa<uPAmw9Da_?tNk+TH6X7%v>PGQC|r^(yPbgP3Siy-eUWgHW1^Y
zv*XW}LipEU5$!4|(gUH1HGG`5m->kGnWha{C(@G*v@IHM<f!Hg8=cYnIy0QtkCZKn
z*wsf7UPn3OPd1;~nA~`SE|yl{Y*}tESfBnr^;1#xSN*$7gJm_=*MeUL6FY|F7}#A=
z>oYQaA<DMAB^;g8$tQk$_3E`Jgvn`&{W4ex9XTIH&vY;_jm8kaiLb-Hf5S@Al{5CI
z(50ppF^^}`+cQ;hNly>|$i!Li)exkKuUw&)Zfti-IPkX|BDXu4(UYMkI$Z`*^2^il
zOU!OU1Eu_!JU)-#J$zODrt|cHDKEmWH^$JNix69we2km_{4F7*o7II7#FXcT`~A<J
zwB+QvzTJrasBNTLFeb97aP#cb@&>NiLXoMTp$cb4hjy&yZCFN-PLKZfNxI%`J0TH%
ztCGl`q+=Mse02F~D&ZCp%b?wyM^yKyC0JRf=>8B2ri`tpQkt2f4C^9IQP*R}n>~}>
z`r21s?wU^2je0Z!zsS9GrQ(+Ha^bLb<H(loM345F8SPTZWhyrd*qhAEh%S+OG@`mr
zS#)2$Qt2c0snTR0rMOc*=$bO2#?eonvxfp5AIB+Xy=(fVjB??D1!=Ls8Hy)sQn4RF
zewb#G+-Dc@^|nH@vzF<&&>PQDDSb6nUG%V_6E#|y%Njl0%i97YC4=0|$SNh#3QA)`
ziye|vjfM~+rXDTu+&|<FuaxnvC-8Htw}|g1msy5<UZ&$7PA(;#QN4ZTvg3rs>e8~-
zl_NdLYm-B7gl-eA`CF|K4#T7z)|G%+E@?&b+nB|+mRc&{I>L;J(y}0iEHNo>bbIIX
zxn}3BwnF`0(?d-+zY8Pa?Db2Cu?!2@-zHS(^Khg{KlT6==CWz<0cQBT{0}@!9Pbr?
zlU(d-ShKAcvH6ayuB%y-<HI_*fnMj~6_tpa7YYqO<OLP%oE$j;nY$<_L1kdy^`)Uo
zp%7W!fS6GfvgvSwMDF^A@(v>(H#<btt<IYXAsXIu2t+_i?Dp!>?oX5wmqrcEON0>R
z%VSmU9i2nF_DWXR-Uu%8h#Q>B+j_H(b;0OvC4gGLW`?z<WlBxRaisOD??a3x!U2d`
zsFgYz>s6Vpey(#v+n_|upW>Blt8z_o)ovEuFG`3K*KAA@ivZrP{$|d&u;ZHXO!(|9
z``02jwK0j!MY{?^UN1?O=~rlAye4*>;8?C8NR#d+JM<8e%v)8-P-(|I`|JH-^Mm{W
z=|UCtY4GNJyC|7S#VUnqWcB!xM{;k1`dMHtU*;vO)!`&Er5aTOuxMs(kb4lE-H%uv
z8&jDjb#;U$mjNWvv1($wodFX;kRgE`aiskch=i`&H{0d*BQwONCV1KfTmim0T~-@v
z+?nm5s11+;r>h?^hpf?hI>5b!jNF8=q(}m%w;r4!<g7QCuOW(%{WT^i0o*mDDQh@e
z!oF@v7^xs7IXVJB&E2krthY*Wri1~8MVq@Ax%0rkHf809wXWE#U9%$SsRSg*V}NNE
zSK0ZC>d24^vPiiGMr>Q!i(xGlti85mwKpa2pMpSGIe5yEq^{*28`07fOYkl&tsQUc
z-^@o%KTDJ9gz5vfV^@9J`@b?l5hy(BIvBy<BK6GI73ZK}JuwkfjpqA8UPt0~<3*#2
zyr4pSo*)==jYtq32Ka&Blu(8^&f=u^{`g+++x?+4yJ{fNJTnD21T{z2qPP|tg6Hzs
z2FO70YJ$Z&{z^YYPVaENk|tAW%kkbP=@pLaJpockcd*61M<7PFJF+Fbc-6>*t8tHL
z#8`a*C-rXG=-Mf;J4P$v{=He9*$9fn96&-(Q${Md8MGb7)qMex)Zc#gq6p3D`$zy^
zvM$CAGPvi;4BHjRMl}W3^EvJ<22D{xo_1_u2A}g_ZA7bTw1@KggN%Z=Er{<=te!9s
zy8E!vfSAOSF4b7>k|1;M*$<HWL7yjj;Z3Zr?~zn>1u%X>7@th-nlS;72@QiLp;MAG
zN#+CtC9DhnE_=!e$jji?c|#GWR~Kv0zRixt{Q6)Fo4po(X<;4dL=VvAIT*hP*4ivM
zyQOly4%bc_nEr><CA3BlPO+_IM8;GIDbu=1ue<3DcGrKaI-`QrW#v{@nema#NNR7!
zWF^1%rM_h8nRF50<Q8qOl}3R_5Pl2RT{oZ!Jtxb#fGR|`BjS~7+!a!L71V(mi0_n1
zkdpFX(aU{ctlkNGk0(fG<P=%co^`48NgKQhx9)q&g8&arzKHP-#sh@2x!^8EymB9~
zmBnovXr-W}P~+s>g={}>%$9&P_8~0#>7n_=Zig%M@kc$JeD2IW-V9Ao$#MJ3pWC7>
z#H@V=p-a=aUJ*B=8Pa8@i*YOW4!Of>C>g#(au<ZR+VL!6doyxn@cSQ5-z<HjHC(6F
z!Q$!z%qU}vhOz7B=v5Yd{q?AlG6Pk&9i#&8ld(M=An%fL>C6--EH-U#p0z5EPs-Rn
z!~<(>ow~jhhgR@N4;$6MJyUIh@_FX?!oFDNF`U)i+P^s*(m!?`Mepgg98J}-&)P8r
zFF(Ykj*V?w>8PuPX$xR3i(x}0D6ieKdhC0^N7VC-O;o(AlP(3vp$nQ<La9#AwVo1+
z(;`HE(Agzg4<tXH4}G3rj@Fo89FLaDkb1MLf^=f#DB%&BMgdnn<Q^MVGr4Em!*jB|
zZ)LOtjIf{km?t4`q;)C#$)&1yt*hv0UIlslvg3?(7gxC%LKsnDW!dw|vZ3UeqNMyy
zs;7-NIq6Al55v4{()w`*LWr$l4;R?t#uYtQNqHmH>LmfnFB8?2ALZ&BmmMi}Q7Hkz
z3Z0w$)1`!-h1zg2?w{%5Ls0fPF6u9X-sZt~&yXWg3jYR_1KxYqg(STGh4e{{orYp|
zQwzOF-A=LM^TA@5@R-<i4*tS+I9maLfoBoLwR&gIbsLpSd-sElc6`}=E}0{RqSdSI
z@>G#X=H<8e2NImKxzy-v58}(AuOYhW7557(LvQS~js+PFH?%H3xcAXnPVg)x)OTM-
z@{NsEfcXxoZV&USKn&mIZJ;<RvN->`+b!j~p^l8^4~7`yftBAbAIy3zMecZEC+_Ka
zSL8wa?=-w+?QV;dp4y##VGd=yM~g}chd#&T!M<K`^}Dk$o3gne+&IdVsUeKmLvxHT
zZ+_5rLPwwOWB$(+m!*%v7v#YF;fKE$dR2Zz2W@Tfz?_I|J`QuUcQ{>=)`>MT2~Md1
z3#+Afgb{_qW*ZGhb(#sB%;5Z7qp6xoLpt#~{Q!of#7ZtCND{LAh2uDKd;JAx6{@2k
z<rhwA1%|rPCQRoW6C4!C0iThGW=@2w!kRpi>V@=l6J;bUG)Wno2bZ~UCek>X$3RUP
z#U}(|72@e8+fQ3jgfY*1h@fM@m(l`%4o>idy4)?0bOp9LU_Gy^gQAHvKI;z?TN1)|
zB_0qPcpOeaCV$QNtnsy*4EoT2Il=jCS(%re)$wfaV=YVq1Bww6pDVG(3oVQ`eSC8j
zVl-}KzB|l-1~zL@IHg!d=kYD#fHKi!1kK6G17Q^tQZhlEFU@Pec>W{>XAWm_!Kl^#
z35Y2wn+s-}C7m|_&_;>BjFQA)t$@AB7hrFVY|Nd4-{&!1e=ZMf#cSc~53F#U_S!&3
zFX{{m2G$c+o*sWMGZjXdpCHH5FNWi-_}Zm3{}Bt8>yw79mR(OIhr_1X={bDuXB<Ty
z09vLtzuo*1Eo(Q$41xS1-!rea>93`=%{&DL=*8}(NBz=0xGTq@_Tx}V_f5T@56I?=
zlj>uW+xqJ4Nv-1q0H^dlqKWwD6mq(ORr`r738VFh@g*Qv((r8?wwx)|qaqp`l7GCm
z%spcL*DNEV`0?uS7ij`8^Gloncty^w#%Hecw*T8}QR#cXF|Z!$*yH!Q-rnFlbsX6n
zITn8W`$Yy({7({{IDy1G*e2^SvCMR3IHB&}jCkMGO8#R(bO4<I*#v<CmWz#8m+sp{
zGGC&XhYK&flKH1Qeg)ANP!8BZ4?3Ucl!9U@$)fVQ!QJOeYhiP$q8?*B%J0ptU2LO<
z@b`C@vBR`cC`ELn8YFEXEoFSmz-4JY^QbH=r_v#@(i5}3$N__Uy3j)=o$&7ht=4Lb
zF<QJU*(_?X#+_-CxFMl#&&;=BXV^|Osb_J@EWn5&El<o9Z}LJkad)dL@86hp%;-*K
z?&bm-S%YQ|clqrTBuNcB+2qXJlkj0Qw1OgX<<ix54plgzOqfL1R3cg0AxaIA*Z&pP
zXK^-97$FG~9<1pS4!|Yvst9ddvR~-bB9tks36uBs9>x}?2q(nL?8O4-^g=OSZvsl{
z(y9N~Ds%4vt*r&o`(U3+&KH>^<!#7>gz!qlTmVOv$?{F}t27)#t|JfXEF;*irhX~O
z7(VEOIS$v%^l8SPKa$<X_Vpw4SsmK8+&7s;jEO6-#(jrM5^8psoy7-1c1-k+ONQ0%
z_bOYhtBrOyI<G`fZoEuL5Kq1d{1T2kagWV|)T*J9eAZ95o&i=()iVj=g{R)nRdc-~
zREgiz?O0i?Kh7+?@&Dvs;~>hP-z!rM>*i9>HkO<`RMZqflv0%jIVIqOiZMcB$r(M^
zg-Ov|i~SP@P=p9kN%UFuLT~tNft|KZ*x88Fp1vU=ax&u6t%HB#5aM`~*V!xnDRe&@
zo{0I~vD&#$W%{{`c^2=LVRgBkVuLSqLk59zaHtvdfN!u}Ea8|bPj;$7QT`T6MUB@*
zU%4~0w-9OvH9O5vU{1I>`!$&UOCTL>f0CJ=LE@!%$bzZ0@rCV%O#1zfOBuNZ$_H)P
z8(r0P?3`VfpDId<+@gA_Iw5wX!Srs~FS?3ascUZ3g;ZugTyYDvJ12Fa<<wlOQ3i+$
zZwS)Qv;*&imo{6T($jy%ZYVA37c`blx|~(QGr~Z2f;0D^r`wLRrV|!FWLy<+e!*k#
zw#$&Yw$u?!!40HZD9Fb=&TaqXcVcmmbm&-FudZ;$j+eXXfPEt3x-h%ECiBzhAfnui
z!7QDq0N%<@6!B_|dOX#3>f+x&n!A|7t2KiXDT%VT)b4#b;7PpkW!`3$r%FyVIv5=>
zCMc3GAd<&}=^XVA=)L2zvap&|U!yxbx$R;y3FH6F4*6dQ1myHP#0I4Vl?UO|ex}KZ
z>)K*V*zUgUmQ)m@XM^kG-yz_p=1SPTuF2Mqp;l{^Ht%S<nLFjIwI&KTV3b;8wyiC|
zG5s0|ZN`JUmouG38MsmH#l$#7qE63s>+o73(KvHL^&)Bs-?RAOICHvmA(I0Y&91tO
zo6d74mCa{Wu23hkpq}(g7wseO*<SM9FR5zHOl+|wlm)CNvc3BLPS5)9BQ%8sI175Q
zDKGq1{tV{XxR^WgdGLVPArg9b{eFzZrxKDLs;rk8MMi5B=3*aLj|z6?B>&|NO^DqK
zYmNXi(+6Y%Dp?eo!&cRKrwR)A$UqT#E=vSF%*ph~{4VZ7UgfoWz~1}SS29ZRG!E-@
zK_?(OY_Wm3UdE-6Q+X*VL!qg);&#<}Ohb0(*&r{{9^3RTO*fXul|@PoV*B<6N=RLn
zNx;wvy6_4p!<{szCwYi{*6p<N_Ht6eiU7&cKIfJM*GH;B#={C7p|6MXeD}h74I?Nv
zTC)CDB4y{+2Pm=Q)6?O(nQ6R=kS1r^Q?mmcx--xDur|;tIo+X;{k3+%+wfAa<oL+j
zCu7}zWw((Qnw^H)q7Ml(j#U{8AlBOwFI<mfd8P{CmK+Z4F7u(XJ!rLUk8t?vM~1km
zpN6%1)?007Z@v<Mfhh3qdDi6_5H>tqXKe=pFtv4ltOXK?{gV5YXvW`U|9^#t9sl0(
zYobIZ?krAGAV2&F7#>Lc^Yp7SEk8i#g`+%^T+ow_MdWJk<(?+R&y)Spwe~aJVGX%2
z-a{aa6y#cfNl`=#|G#*t??7*)0?}$ic<W_Nbip)Fodz)dLCc>8>v$T_%iFG<bb$|8
zw=Yox<92h)Md?!ZSNV0ohQ;Dq_I*E-giVjH;Icjt5;I8F0(S`RKASYKTT|p{jd61c
zsjGes!S3W|U~YI$kQ^EY4TLsw11)h_KbHcuB!1*>u}t8*`=qW5cC>(1RyntDUkp4Q
zgpWcee-)u9P~_;5T5LZY{q?1aZR<Ky7^;8^4%V0G4AGe|>qYv1=C2@+!R@_uga5Eu
zK{_R1$X-1@MP~S%-;hK)&Q$g&5`CQ!2vFVp9sdWRxzG035QANc2sL7=190Bw64GV;
zq|4`WKrWdHVJzSTsF#pn^Q{%zAfmhZRtd~}>decSMQ^`D4ff{%JKl`aY$HeCS8yxC
zn~wNYD}su9Mnc=4nI~XFjB?U<1}u*f<lfp{oNN6;?s=Ux`?o72-+oDNQV2mCp*;m&
zwMfc*VpnF(EeZ-n^i;jw#-Mq=04)%wRo&hVJRJJaF$8=eYKNv2ET8xAeXggoZIxq3
z2Ye-SPK%cTBs!yWE(Y6OT5e<yP&lJ}V1(ie2aKEe%2YBpD3SgdOv&I30Hh$cPVo&$
zAl3X;BtJ~H@~E93tS=A!OR<(7d%fvNM>Zmie67$#GvGW~wb<!zhRxIW8rexk+sXpb
zMoz)kYH3tk)DKr;FTZ(k3xG|dt@!o78`w_%>t8Vz4`+}Jxq!)jB{%-?{xWW$6RWnc
zQ?ft>O6>FRtr6=%l1R~tg<Xo+GXz$CVaw)r*wCEC$qe-1rki{f7&!NR{Dt42`Sjp-
zAR#cxLe|X}qVS={dGR+s>A@e>`L0eyPn%iGt}l*q4Kcm-iZm@s^Yjm4zrfaRsM+~h
zw>Cd&MypGh1VA=-gY|a1VqgMq5nj_>Q>XLb0VCg;(zCWaww1#1GvUmo#lfyl{zrG;
zY<V$-C6)e6tvAt>t8bt$?oJ-2dw!l5`u*pjB0u*Myf49c<W6-BFQ3#BLL#H<Qfy(#
z4OeHb=uC%Vg@$tXlA;8cj}hDN;IhWOFYQXHX_dWr#N>c%#L9d*-C>~^Vv_ZHq`&<d
z>UpQL-6FFc6%esW`<h$G%shO}g59at+r2YeqNQW*?Jzs%M{QsdiDBgyeWZo2Mc6UB
z+_XE_cJ2-g=O|aXd`JZK0?_fTfhEGA<-v~r^ykq1PWb%lUV?8W^R4QSngEbU8{QeL
zTS#mV{`)Kgch;T)?h_zV?0!oVsHq8*&edne4SR6Gz6;GhSi0SA>-L#mMnNr${UV^t
zbn=FX%3{5jyY)(6`~E2=F~pdNvT8<ucQV-2#P*<;aMy|m*h?ZqATYU&g^g=x;bC20
zu_#qhN9xh5LE*-dj1BlpQ+$^{<ZG}#IG|P7YSlQmQZe}MXE<|9lKd^TbINivxYHQU
znLy@(DXnZ7KH&z$2Vv5mhEJ?}JM&iNA1!@=CVUj%Px=;Ukb!$>Z@kP^V`rLx{R++N
zU|ULGh1cK&)$cSeB=1dfbF3T=*52E~kz=fZ)7kW}=C=`9y1M!vy|%iy@QH|&<QymU
zKTbg|f3rs5mej9aRS<u@d(oKxY(fSq#|o`{8>mLS0nUVc6YCy=z0YF(ySu`?IDfLQ
zQZA^6k^lL=ySuYd#jMet=-KV2zs=#U3$}EU*0v<qQ^KiZX-~q1v=BYbl%zA<O+Fk|
z9jph<ev6$EGU<(dxgXOd23QZ2a=}$rf63wvpH;8o-AseI_@amF`qe_<JZKbrU-rw=
zXf{a4k?kd)a?3OzBJ*|b&0v+t(E~G`Ul;ciz1~NifT%5Al&V)1I+}Jp*oBE93Q-d&
zX^y&-kVvZ%r-Bug-G*vDWkLonaX_QBtZJ(Q3uY{^g^}t89FO4LuYT&c2M1rZ1J(`l
zpeBTuWAx6VfCL{&*!^mq1(C5@0a&zB&h@UCaaDV>2%EHHck;&T-58*9g>4qc-rafi
zX|vBt@f^zzZ3Az6#SVDT^=xQT%R2GE?@mEaS~|{c#C%cQoIw%<XKL~5rv^fn$$B}K
zE(N1aIH0u$D}RYf-^ov`#wbm$=M`7x$y7bL9PgV}2%fy|+3!ric6!E*;Btsae_)!b
zh*&x*AZf=&XLo2QccNie?(PI@C_GdG3^(nOxG>iu)cx9$a95f{mcN;`!@@y4h?$K}
z6{c?;&W~g+C(d73e|;gYp$+89ASOMB-3eITh;uUt%XB1jwdm1X^cdYaU|#+3UEu*f
zovV${_WH_nj<=qv<~w=H_pXA=G@lv9?(1nQT-NwQZI>ba`7Y3u)RE2w3Hu8ct@p;e
zEHiP5(`Gg(S@HY8UOLRFd|P`sKa$})(6P4hdZ+W&?2$N#HJTiDXC`)Lv|ML*%&YSJ
zDn%nkwHc(`!6NsKfJ?o!rXUNBmYQD2(DXEBB6Xc27q~)BD$)Y8{Z07ZDY9Ov(RF0=
zVqz{e+(Q?+1Gk{25clxSOb-WYUF<)bu}{jyI$X2#!Bjzngm-r(DF)lySOEj8kc9bB
zQGX*~9q)ms1TCs?pOy}M#q@|fh-m>O8oQ_-oonx0{ylu_VO`bSCds7;Y;N9Hji2*4
zlyELJ5G~>U3;W?`2y8FA`_+H*-1d*Spm#3-p>)9Me5J*L2--F8WB;v45mocl%M)<Z
z0l)5B`F2#)t)blsG}CZd;sfE)-9S$OpAW+JR>y8|-PHl85pWWBQ&jbH@xM{;Mw0=1
z|5J_5e=F;Wv_f${dJl6#n-)zz=H}apb%wJx$_`58r%iXI89NT(unNPI-PzFmkm`}i
z`<fx^qz=cFZdgnmCiK(d;8XqDqwrsRMUGt7)bQ=z3UQ=roC9UpL!@j}4g$8QqEMna
zaR)^+E8>P86iwNu^=y@U3q4c|UhMd7sIa3J>>9J)=3{)WZts$dgLYp3HytXm_R0_V
z@IFCAniMDPM5gBlbu0PD!uM~dh0VUip|eGZEn0k?*Eu1av2FwdN#0){*D_7Iemj4?
z<Fdhxgv?bu30w$;A~27Bnqt-n);d%Vs+?%pARD#Im}nz{j(9ZPoxuThst4ay66hj#
zN4F~0z$JSVNpz``sV&lj5(s!0ir`}V;JL*pd3OZzG*#STMpr>dMvX$!d#p%I`&6~h
zg2Nhda-{7<iPj0Pjx-!fzI^s$(E-sW2?jSP{MzDeUbluYJ~{^nw-+CJhFD2j=)6g#
z^J0vP1KjrtHw~y8zd;ujII-4T-AUrNn&Qn%`99mI*Y9BtCq0wmHl0dEK1c209~<|m
z%{pqX5)Vbmmn1_Jt_ds8%2O+z?|l9}|HaW^<(aVFgO(?P)Rd1tPVVW<QIOoP(fh)b
zsYj3FmlSB@sCRi<&%pTZhW2nH&v1pDEuYQBUxXtDRX*kQtdYsz&pOdHHm2dVuL?5B
zp^Pvp+c}`VhXK}1>52ID3R7IY+R0QwG%BBj^P-DSZyD3A5r0b5;7;d8(fq6=V;*t>
z<iA&jkt-SgX`LV<a*vkLD<`}Bv6ATY;|?b(a;2HQKkx4ZZU(>l=NkQfWii6!N;A{;
zX?Ef_?ODf7j`Xuv9;n6<@Wl6$0rkslY1PY)qvVCMc!xe#u5dwFNonKXp01C@@B(!^
zS?D`M`Bjg=o0%!AA|7l`E>1CGRNB<F+k05K_QJui^4(2Nk0EFn>1t_xd3c4qx9RSj
zGBGYB&QTxr*=V@haCdGC6J`_70?88OSE1(4KzSV)>F}Xj;-%&92s>~5aenSQVu(?{
z=}OS1<Ov1H3e<0<Pth8CCSO6{=bGm_11XU=a03VKe>!LXpH|a}KYOw!^hei2#F*bE
zxYkq>9R32)Q-vehj>WL>x_#tOrD<DjKDmC#f!iS^g%-dGZ5i$M7EpwE88Zs*NrhaX
z%GiBm6eDzG%AYx0r$ai^PP7fi!`6!Xi_x<NR|PjN>D1<bt!#N(&Ntz_^P4D!a+fu=
zFf^|P=VT&S5RqN!``wXv>P-<#x!|}DQ^Hk9q>i(T!QAqZgU1d-*p5+>a+u!4=m%?M
zyuysngVjo>TbjEETe>XeZ`>t-FEA0yUiY1yN6dM7sTfL)m=Ma#Q%MW2JJGdLY+azJ
z)Il>uhhq=Rl!miP)zM+e>x582nl$DK9zKVEvVBNpcrzX3HISDQVB-<V8vL`asAxt=
zWMDUmh+yDhfk0wv54-hWb-)9*{5{4FA0=*1vDN~x<IKzQ+NXz;RF+{WH1=RwMN<rv
zRMhRYQm2vH;EOx$JTV*i=U48Y1og1V)EvviXpRpNkd~p`Z{hQVvEbj?SMiJbIGG5~
z$DuuGcft=xsT_?-^>YtzHD4+%s=v6`AT}8yi7Kn2ePkp{H@~X?X-zq(Awn`v{4~>m
z4|9Qly`DszxG8JD3;5onni6Gth2@4(CY-e=_2`+f`?+f+Bf@$s2WuGN&qg;2!z;A6
zHRD*)8l4-@SuPH#nj+aQTd^xDzKpr5`dUD4u+@)bU^ub94+>`+@v6j%qqS)nMK}14
zf_B3;mOc2v41@#JrLcZouTE=NA3D<^I;fgF`08khjUr?tMui*Lfd5lfX%{r=Q9|V%
zQI7M#P4R7&_HL%{Q0$q4a=bkT2CZw}G4-0K&p;y2Qzf$Wt7eJSk2c(DexjjpdF&v`
zzdb`CaC6Ph-%bAVIr3~v>(O$}p{++q+1D%qXVdb8@$;7Ec8&Hd0Ggir6dkhVGT1O#
zba?PMDPZ>ft9qJeNb}(uxut<juSHX@qt2N7kDKNYhW_(Chri$(8#6RC;NCYH_wcZF
zrsmJ9q$>)fOO=ziPK^Z*UJYBhJknY4{<TFh0N)k5<xA;iZndOUT~%n%Y^<C)PxteY
z7txjF2QgaG(s%Bn0YWm!t}H*bb}6kVW;nvx@`h2idB*5Ql5v)Zoxi4}N50|sxP?#<
zAFJf6GuX;yP8KKy#E6DxNKMI~{=B+!25#zYghLz!Br>N(hMeX2-_0v%dcV$N6KePk
z5JU@)<>;ti9@5;!yzwr%H2=Xi>0oQZ&O}Za8;f*uR1u5aI}Pyed%x3eDi&@%L*O3)
zhUx?6mo~p5I5OAIes3!Sfbm6L{JNo1gufigeU)}NPSwpOl<>Gf+L}lQqo-4XK>l7k
p(A<SPFK{dePZdPG{>rp{6lwVD{#L>l3&0HoreUD|_U7G3{{cE>2O$6e

literal 0
HcmV?d00001

diff --git a/README.md b/README.md
index 9621b58b46..5e3c1f83e0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,17 @@
-## Frappé Framework
+<div align="center">
+    <img src=".github/logo.png" height="256">
+    <h1>
+        <a href="https://frappe.io">
+            frappé
+        </a>
+    </h1>
+    <h3>
+        a web framework with <a href="https://www.youtube.com/watch?v=LOjk3m0wTwg">"batteries included"
+    </h3>
+    <h5>
+        it's pronounced - <em>fra-pay</em>
+    </h5>
+</div>
 
 [![Build Status](https://travis-ci.org/frappe/frappe.png)](https://travis-ci.org/frappe/frappe)
 
diff --git a/frappe/public/build.json b/frappe/public/build.json
index cf6e784ba5..410f398ab2 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -23,6 +23,9 @@
 		"public/js/frappe/misc/rating_icons.html"
 	],
 	"js/control.min.js": [
+
+		"public/js/frappe/ui/camera.js",
+
 		"public/js/frappe/form/controls/base_control.js",
 		"public/js/frappe/form/controls/base_input.js",
 		"public/js/frappe/form/controls/data.js",
@@ -55,12 +58,17 @@
 	"js/dialog.min.js": [
 		"public/js/frappe/dom.js",
 		"public/js/frappe/ui/modal.html",
+
+
 		"public/js/frappe/form/formatters.js",
 		"public/js/frappe/form/layout.js",
 		"public/js/frappe/ui/field_group.js",
 		"public/js/frappe/form/link_selector.js",
 		"public/js/frappe/form/multi_select_dialog.js",
 		"public/js/frappe/ui/dialog.js",
+
+		"public/js/frappe/ui/camera.js",
+
 		"public/js/frappe/form/controls/base_control.js",
 		"public/js/frappe/form/controls/base_input.js",
 		"public/js/frappe/form/controls/data.js",
@@ -131,7 +139,8 @@
 		"public/js/frappe/translate.js",
 		"public/js/lib/datepicker/datepicker.min.js",
 		"public/js/lib/datepicker/locale-all.js",
-		"public/js/lib/jquery.jrumble.min.js"
+		"public/js/lib/jquery.jrumble.min.js",
+		"public/js/lib/webcam.min.js"
 	],
 	"js/desk.min.js": [
 		"public/js/frappe/class.js",
@@ -169,6 +178,9 @@
 		"public/js/frappe/form/link_selector.js",
 		"public/js/frappe/form/multi_select_dialog.js",
 		"public/js/frappe/ui/dialog.js",
+
+		"public/js/frappe/ui/camera.js",
+
 		"public/js/frappe/ui/app_icon.js",
 
 		"public/js/frappe/model/model.js",
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 00af468754..3a82a7af6d 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -7,6 +7,19 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 		this.setup_image_dialog();
 		this.setting_count = 0;
 	},
+	render_camera_button: (context) => {
+		var ui     = $.summernote.ui;
+		var button = ui.button({
+			contents: '<i class="fa fa-camera"/>',
+			tooltip: 'Camera',
+			click: () => {
+				const camera = new frappe.ui.Camera();
+				camera.show();
+			}
+		});
+
+		return button.render();
+	},
 	make_editor: function() {
 		var me = this;
 		this.editor = $("<div>").appendTo(this.input_area);
@@ -25,9 +38,12 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 				['color', ['color']],
 				['para', ['ul', 'ol', 'paragraph', 'hr']],
 				//['height', ['height']],
-				['media', ['link', 'picture', 'video', 'table']],
+				['media', ['link', 'picture', 'camera', 'video', 'table']],
 				['misc', ['fullscreen', 'codeview']]
 			],
+			buttons: {
+				camera: this.render_camera_button,
+			},
 			keyMap: {
 				pc: {
 					'CTRL+ENTER': ''
@@ -80,6 +96,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 				'outdent': 'fa fa-outdent',
 				'arrowsAlt': 'fa fa-arrows-alt',
 				'bold': 'fa fa-bold',
+				'camera': 'fa fa-camera',
 				'caret': 'caret',
 				'circle': 'fa fa-circle',
 				'close': 'fa fa-close',
diff --git a/frappe/public/js/frappe/ui/camera.js b/frappe/public/js/frappe/ui/camera.js
new file mode 100644
index 0000000000..733471d86e
--- /dev/null
+++ b/frappe/public/js/frappe/ui/camera.js
@@ -0,0 +1,67 @@
+frappe.ui.Camera      = class
+{
+    constructor (options)
+    {
+        this.dialog   = new frappe.ui.Dialog();
+
+        this.template =
+        `
+            <div id="frappe-camera">
+
+            </div>
+        `
+
+        this.show     = this.show.bind(this);
+        this.hide     = this.hide.bind(this);
+        this.on       = this.on.bind(this);
+        this.attach   = this.attach.bind(this);
+
+        Webcam.set({
+            width: 320,
+            height: 240,
+            flip_horiz: true,
+        })
+    }
+
+    show ( )
+    {
+        this.attach((err) => {
+            if ( err )
+                throw Error('Unable to attach webcamera.');
+            
+            this.dialog.set_primary_action(__('Click'), () => {
+                this.click();
+            });
+            
+            this.dialog.show();
+        });
+    }
+
+    hide ( )
+    {
+        this.dialog.hide();
+    }
+
+    on (event, callback)
+    {
+        if ( event == 'attach' ) {
+            this.attach(callback);
+        }
+    }
+
+    click (callback)
+    {
+        Webcam.snap((data) => {
+            console.log(data);
+        });
+    }
+
+    attach (callback)
+    {
+        $(this.dialog.body).append(this.template);
+
+        Webcam.attach('#frappe-camera');
+
+        callback();
+    }
+};
\ No newline at end of file
diff --git a/frappe/public/js/lib/webcam.min.js b/frappe/public/js/lib/webcam.min.js
new file mode 100644
index 0000000000..3325ccfd05
--- /dev/null
+++ b/frappe/public/js/lib/webcam.min.js
@@ -0,0 +1,2 @@
+// WebcamJS v1.0.22 - http://github.com/jhuckaby/webcamjs - MIT Licensed
+(function(e){var t;function a(){var e=Error.apply(this,arguments);e.name=this.name="FlashError";this.stack=e.stack;this.message=e.message}function i(){var e=Error.apply(this,arguments);e.name=this.name="WebcamError";this.stack=e.stack;this.message=e.message}IntermediateInheritor=function(){};IntermediateInheritor.prototype=Error.prototype;a.prototype=new IntermediateInheritor;i.prototype=new IntermediateInheritor;var Webcam={version:"1.0.22",protocol:location.protocol.match(/https/i)?"https":"http",loaded:false,live:false,userMedia:true,iOS:/iPad|iPhone|iPod/.test(navigator.userAgent)&&!e.MSStream,params:{width:0,height:0,dest_width:0,dest_height:0,image_format:"jpeg",jpeg_quality:90,enable_flash:true,force_flash:false,flip_horiz:false,fps:30,upload_name:"webcam",constraints:null,swfURL:"",flashNotDetectedText:"ERROR: No Adobe Flash Player detected.  Webcam.js relies on Flash for browsers that do not support getUserMedia (like yours).",noInterfaceFoundText:"No supported webcam interface found.",unfreeze_snap:true,iosPlaceholderText:"Click here to open camera.",user_callback:null,user_canvas:null},errors:{FlashError:a,WebcamError:i},hooks:{},init:function(){var t=this;this.mediaDevices=navigator.mediaDevices&&navigator.mediaDevices.getUserMedia?navigator.mediaDevices:navigator.mozGetUserMedia||navigator.webkitGetUserMedia?{getUserMedia:function(e){return new Promise(function(t,a){(navigator.mozGetUserMedia||navigator.webkitGetUserMedia).call(navigator,e,t,a)})}}:null;e.URL=e.URL||e.webkitURL||e.mozURL||e.msURL;this.userMedia=this.userMedia&&!!this.mediaDevices&&!!e.URL;if(navigator.userAgent.match(/Firefox\D+(\d+)/)){if(parseInt(RegExp.$1,10)<21)this.userMedia=null}if(this.userMedia){e.addEventListener("beforeunload",function(e){t.reset()})}},exifOrientation:function(e){var t=new DataView(e);if(t.getUint8(0)!=255||t.getUint8(1)!=216){console.log("Not a valid JPEG file");return 0}var a=2;var i=null;while(a<e.byteLength){if(t.getUint8(a)!=255){console.log("Not a valid marker at offset "+a+", found: "+t.getUint8(a));return 0}i=t.getUint8(a+1);if(i==225){a+=4;var s="";for(n=0;n<4;n++){s+=String.fromCharCode(t.getUint8(a+n))}if(s!="Exif"){console.log("Not valid EXIF data found");return 0}a+=6;var r=null;if(t.getUint16(a)==18761){r=false}else if(t.getUint16(a)==19789){r=true}else{console.log("Not valid TIFF data! (no 0x4949 or 0x4D4D)");return 0}if(t.getUint16(a+2,!r)!=42){console.log("Not valid TIFF data! (no 0x002A)");return 0}var o=t.getUint32(a+4,!r);if(o<8){console.log("Not valid TIFF data! (First offset less than 8)",t.getUint32(a+4,!r));return 0}var h=a+o;var l=t.getUint16(h,!r);for(var c=0;c<l;c++){var d=h+c*12+2;if(t.getUint16(d,!r)==274){var f=t.getUint16(d+2,!r);var m=t.getUint32(d+4,!r);if(f!=3&&m!=1){console.log("Invalid EXIF orientation value type ("+f+") or count ("+m+")");return 0}var p=t.getUint16(d+8,!r);if(p<1||p>8){console.log("Invalid EXIF orientation value ("+p+")");return 0}return p}}}else{a+=2+t.getUint16(a+2)}}return 0},fixOrientation:function(e,t,a){var i=new Image;i.addEventListener("load",function(e){var s=document.createElement("canvas");var r=s.getContext("2d");if(t<5){s.width=i.width;s.height=i.height}else{s.width=i.height;s.height=i.width}switch(t){case 2:r.transform(-1,0,0,1,i.width,0);break;case 3:r.transform(-1,0,0,-1,i.width,i.height);break;case 4:r.transform(1,0,0,-1,0,i.height);break;case 5:r.transform(0,1,1,0,0,0);break;case 6:r.transform(0,1,-1,0,i.height,0);break;case 7:r.transform(0,-1,-1,0,i.height,i.width);break;case 8:r.transform(0,-1,1,0,0,i.width);break}r.drawImage(i,0,0);a.src=s.toDataURL()},false);i.src=e},attach:function(a){if(typeof a=="string"){a=document.getElementById(a)||document.querySelector(a)}if(!a){return this.dispatch("error",new i("Could not locate DOM element to attach to."))}this.container=a;a.innerHTML="";var s=document.createElement("div");a.appendChild(s);this.peg=s;if(!this.params.width)this.params.width=a.offsetWidth;if(!this.params.height)this.params.height=a.offsetHeight;if(!this.params.width||!this.params.height){return this.dispatch("error",new i("No width and/or height for webcam.  Please call set() first, or attach to a visible element."))}if(!this.params.dest_width)this.params.dest_width=this.params.width;if(!this.params.dest_height)this.params.dest_height=this.params.height;this.userMedia=t===undefined?this.userMedia:t;if(this.params.force_flash){t=this.userMedia;this.userMedia=null}if(typeof this.params.fps!=="number")this.params.fps=30;var r=this.params.width/this.params.dest_width;var o=this.params.height/this.params.dest_height;if(this.userMedia){var n=document.createElement("video");n.setAttribute("autoplay","autoplay");n.style.width=""+this.params.dest_width+"px";n.style.height=""+this.params.dest_height+"px";if(r!=1||o!=1){a.style.overflow="hidden";n.style.webkitTransformOrigin="0px 0px";n.style.mozTransformOrigin="0px 0px";n.style.msTransformOrigin="0px 0px";n.style.oTransformOrigin="0px 0px";n.style.transformOrigin="0px 0px";n.style.webkitTransform="scaleX("+r+") scaleY("+o+")";n.style.mozTransform="scaleX("+r+") scaleY("+o+")";n.style.msTransform="scaleX("+r+") scaleY("+o+")";n.style.oTransform="scaleX("+r+") scaleY("+o+")";n.style.transform="scaleX("+r+") scaleY("+o+")"}a.appendChild(n);this.video=n;var h=this;this.mediaDevices.getUserMedia({audio:false,video:this.params.constraints||{mandatory:{minWidth:this.params.dest_width,minHeight:this.params.dest_height}}}).then(function(t){n.onloadedmetadata=function(e){h.stream=t;h.loaded=true;h.live=true;h.dispatch("load");h.dispatch("live");h.flip()};n.src=e.URL.createObjectURL(t)||t}).catch(function(e){if(h.params.enable_flash&&h.detectFlash()){setTimeout(function(){h.params.force_flash=1;h.attach(a)},1)}else{h.dispatch("error",e)}})}else if(this.iOS){var l=document.createElement("div");l.id=this.container.id+"-ios_div";l.className="webcamjs-ios-placeholder";l.style.width=""+this.params.width+"px";l.style.height=""+this.params.height+"px";l.style.textAlign="center";l.style.display="table-cell";l.style.verticalAlign="middle";l.style.backgroundRepeat="no-repeat";l.style.backgroundSize="contain";l.style.backgroundPosition="center";var c=document.createElement("span");c.className="webcamjs-ios-text";c.innerHTML=this.params.iosPlaceholderText;l.appendChild(c);var d=document.createElement("img");d.id=this.container.id+"-ios_img";d.style.width=""+this.params.dest_width+"px";d.style.height=""+this.params.dest_height+"px";d.style.display="none";l.appendChild(d);var f=document.createElement("input");f.id=this.container.id+"-ios_input";f.setAttribute("type","file");f.setAttribute("accept","image/*");f.setAttribute("capture","camera");var h=this;var m=this.params;f.addEventListener("change",function(e){if(e.target.files.length>0&&e.target.files[0].type.indexOf("image/")==0){var t=URL.createObjectURL(e.target.files[0]);var a=new Image;a.addEventListener("load",function(e){var t=document.createElement("canvas");t.width=m.dest_width;t.height=m.dest_height;var i=t.getContext("2d");ratio=Math.min(a.width/m.dest_width,a.height/m.dest_height);var s=m.dest_width*ratio;var r=m.dest_height*ratio;var o=(a.width-s)/2;var n=(a.height-r)/2;i.drawImage(a,o,n,s,r,0,0,m.dest_width,m.dest_height);var h=t.toDataURL();d.src=h;l.style.backgroundImage="url('"+h+"')"},false);var i=new FileReader;i.addEventListener("load",function(e){var i=h.exifOrientation(e.target.result);if(i>1){h.fixOrientation(t,i,a)}else{a.src=t}},false);var s=new XMLHttpRequest;s.open("GET",t,true);s.responseType="blob";s.onload=function(e){if(this.status==200||this.status===0){i.readAsArrayBuffer(this.response)}};s.send()}},false);f.style.display="none";a.appendChild(f);l.addEventListener("click",function(e){if(m.user_callback){h.snap(m.user_callback,m.user_canvas)}else{f.style.display="block";f.focus();f.click();f.style.display="none"}},false);a.appendChild(l);this.loaded=true;this.live=true}else if(this.params.enable_flash&&this.detectFlash()){e.Webcam=Webcam;var l=document.createElement("div");l.innerHTML=this.getSWFHTML();a.appendChild(l)}else{this.dispatch("error",new i(this.params.noInterfaceFoundText))}if(this.params.crop_width&&this.params.crop_height){var p=Math.floor(this.params.crop_width*r);var u=Math.floor(this.params.crop_height*o);a.style.width=""+p+"px";a.style.height=""+u+"px";a.style.overflow="hidden";a.scrollLeft=Math.floor(this.params.width/2-p/2);a.scrollTop=Math.floor(this.params.height/2-u/2)}else{a.style.width=""+this.params.width+"px";a.style.height=""+this.params.height+"px"}},reset:function(){if(this.preview_active)this.unfreeze();this.unflip();if(this.userMedia){if(this.stream){if(this.stream.getVideoTracks){var e=this.stream.getVideoTracks();if(e&&e[0]&&e[0].stop)e[0].stop()}else if(this.stream.stop){this.stream.stop()}}delete this.stream;delete this.video}if(this.userMedia!==true&&this.loaded&&!this.iOS){var t=this.getMovie();if(t&&t._releaseCamera)t._releaseCamera()}if(this.container){this.container.innerHTML="";delete this.container}this.loaded=false;this.live=false},set:function(){if(arguments.length==1){for(var e in arguments[0]){this.params[e]=arguments[0][e]}}else{this.params[arguments[0]]=arguments[1]}},on:function(e,t){e=e.replace(/^on/i,"").toLowerCase();if(!this.hooks[e])this.hooks[e]=[];this.hooks[e].push(t)},off:function(e,t){e=e.replace(/^on/i,"").toLowerCase();if(this.hooks[e]){if(t){var a=this.hooks[e].indexOf(t);if(a>-1)this.hooks[e].splice(a,1)}else{this.hooks[e]=[]}}},dispatch:function(){var t=arguments[0].replace(/^on/i,"").toLowerCase();var s=Array.prototype.slice.call(arguments,1);if(this.hooks[t]&&this.hooks[t].length){for(var r=0,o=this.hooks[t].length;r<o;r++){var n=this.hooks[t][r];if(typeof n=="function"){n.apply(this,s)}else if(typeof n=="object"&&n.length==2){n[0][n[1]].apply(n[0],s)}else if(e[n]){e[n].apply(e,s)}}return true}else if(t=="error"){if(s[0]instanceof a||s[0]instanceof i){message=s[0].message}else{message="Could not access webcam: "+s[0].name+": "+s[0].message+" "+s[0].toString()}alert("Webcam.js Error: "+message)}return false},setSWFLocation:function(e){this.set("swfURL",e)},detectFlash:function(){var t="Shockwave Flash",a="ShockwaveFlash.ShockwaveFlash",i="application/x-shockwave-flash",s=e,r=navigator,o=false;if(typeof r.plugins!=="undefined"&&typeof r.plugins[t]==="object"){var n=r.plugins[t].description;if(n&&(typeof r.mimeTypes!=="undefined"&&r.mimeTypes[i]&&r.mimeTypes[i].enabledPlugin)){o=true}}else if(typeof s.ActiveXObject!=="undefined"){try{var h=new ActiveXObject(a);if(h){var l=h.GetVariable("$version");if(l)o=true}}catch(e){}}return o},getSWFHTML:function(){var t="",i=this.params.swfURL;if(location.protocol.match(/file/)){this.dispatch("error",new a("Flash does not work from local disk.  Please run from a web server."));return'<h3 style="color:red">ERROR: the Webcam.js Flash fallback does not work from local disk.  Please run it from a web server.</h3>'}if(!this.detectFlash()){this.dispatch("error",new a("Adobe Flash Player not found.  Please install from get.adobe.com/flashplayer and try again."));return'<h3 style="color:red">'+this.params.flashNotDetectedText+"</h3>"}if(!i){var s="";var r=document.getElementsByTagName("script");for(var o=0,n=r.length;o<n;o++){var h=r[o].getAttribute("src");if(h&&h.match(/\/webcam(\.min)?\.js/)){s=h.replace(/\/webcam(\.min)?\.js.*$/,"");o=n}}if(s)i=s+"/webcam.swf";else i="webcam.swf"}if(e.localStorage&&!localStorage.getItem("visited")){this.params.new_user=1;localStorage.setItem("visited",1)}var l="";for(var c in this.params){if(l)l+="&";l+=c+"="+escape(this.params[c])}t+='<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" type="application/x-shockwave-flash" codebase="'+this.protocol+'://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+this.params.width+'" height="'+this.params.height+'" id="webcam_movie_obj" align="middle"><param name="wmode" value="opaque" /><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+i+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+l+'"/><embed id="webcam_movie_embed" src="'+i+'" wmode="opaque" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+this.params.width+'" height="'+this.params.height+'" name="webcam_movie_embed" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+l+'"></embed></object>';return t},getMovie:function(){if(!this.loaded)return this.dispatch("error",new a("Flash Movie is not loaded yet"));var e=document.getElementById("webcam_movie_obj");if(!e||!e._snap)e=document.getElementById("webcam_movie_embed");if(!e)this.dispatch("error",new a("Cannot locate Flash movie in DOM"));return e},freeze:function(){var e=this;var t=this.params;if(this.preview_active)this.unfreeze();var a=this.params.width/this.params.dest_width;var i=this.params.height/this.params.dest_height;this.unflip();var s=t.crop_width||t.dest_width;var r=t.crop_height||t.dest_height;var o=document.createElement("canvas");o.width=s;o.height=r;var n=o.getContext("2d");this.preview_canvas=o;this.preview_context=n;if(a!=1||i!=1){o.style.webkitTransformOrigin="0px 0px";o.style.mozTransformOrigin="0px 0px";o.style.msTransformOrigin="0px 0px";o.style.oTransformOrigin="0px 0px";o.style.transformOrigin="0px 0px";o.style.webkitTransform="scaleX("+a+") scaleY("+i+")";o.style.mozTransform="scaleX("+a+") scaleY("+i+")";o.style.msTransform="scaleX("+a+") scaleY("+i+")";o.style.oTransform="scaleX("+a+") scaleY("+i+")";o.style.transform="scaleX("+a+") scaleY("+i+")"}this.snap(function(){o.style.position="relative";o.style.left=""+e.container.scrollLeft+"px";o.style.top=""+e.container.scrollTop+"px";e.container.insertBefore(o,e.peg);e.container.style.overflow="hidden";e.preview_active=true},o)},unfreeze:function(){if(this.preview_active){this.container.removeChild(this.preview_canvas);delete this.preview_context;delete this.preview_canvas;this.preview_active=false;this.flip()}},flip:function(){if(this.params.flip_horiz){var e=this.container.style;e.webkitTransform="scaleX(-1)";e.mozTransform="scaleX(-1)";e.msTransform="scaleX(-1)";e.oTransform="scaleX(-1)";e.transform="scaleX(-1)";e.filter="FlipH";e.msFilter="FlipH"}},unflip:function(){if(this.params.flip_horiz){var e=this.container.style;e.webkitTransform="scaleX(1)";e.mozTransform="scaleX(1)";e.msTransform="scaleX(1)";e.oTransform="scaleX(1)";e.transform="scaleX(1)";e.filter="";e.msFilter=""}},savePreview:function(e,t){var a=this.params;var i=this.preview_canvas;var s=this.preview_context;if(t){var r=t.getContext("2d");r.drawImage(i,0,0)}e(t?null:i.toDataURL("image/"+a.image_format,a.jpeg_quality/100),i,s);if(this.params.unfreeze_snap)this.unfreeze()},snap:function(e,t){if(!e)e=this.params.user_callback;if(!t)t=this.params.user_canvas;var a=this;var s=this.params;if(!this.loaded)return this.dispatch("error",new i("Webcam is not loaded yet"));if(!e)return this.dispatch("error",new i("Please provide a callback function or canvas to snap()"));if(this.preview_active){this.savePreview(e,t);return null}var r=document.createElement("canvas");r.width=this.params.dest_width;r.height=this.params.dest_height;var o=r.getContext("2d");if(this.params.flip_horiz){o.translate(s.dest_width,0);o.scale(-1,1)}var n=function(){if(this.src&&this.width&&this.height){o.drawImage(this,0,0,s.dest_width,s.dest_height)}if(s.crop_width&&s.crop_height){var a=document.createElement("canvas");a.width=s.crop_width;a.height=s.crop_height;var i=a.getContext("2d");i.drawImage(r,Math.floor(s.dest_width/2-s.crop_width/2),Math.floor(s.dest_height/2-s.crop_height/2),s.crop_width,s.crop_height,0,0,s.crop_width,s.crop_height);o=i;r=a}if(t){var n=t.getContext("2d");n.drawImage(r,0,0)}e(t?null:r.toDataURL("image/"+s.image_format,s.jpeg_quality/100),r,o)};if(this.userMedia){o.drawImage(this.video,0,0,this.params.dest_width,this.params.dest_height);n()}else if(this.iOS){var h=document.getElementById(this.container.id+"-ios_div");var l=document.getElementById(this.container.id+"-ios_img");var c=document.getElementById(this.container.id+"-ios_input");iFunc=function(e){n.call(l);l.removeEventListener("load",iFunc);h.style.backgroundImage="none";l.removeAttribute("src");c.value=null};if(!c.value){l.addEventListener("load",iFunc);c.style.display="block";c.focus();c.click();c.style.display="none"}else{iFunc(null)}}else{var d=this.getMovie()._snap();var l=new Image;l.onload=n;l.src="data:image/"+this.params.image_format+";base64,"+d}return null},configure:function(e){if(!e)e="camera";this.getMovie()._configure(e)},flashNotify:function(e,t){switch(e){case"flashLoadComplete":this.loaded=true;this.dispatch("load");break;case"cameraLive":this.live=true;this.dispatch("live");break;case"error":this.dispatch("error",new a(t));break;default:break}},b64ToUint6:function(e){return e>64&&e<91?e-65:e>96&&e<123?e-71:e>47&&e<58?e+4:e===43?62:e===47?63:0},base64DecToArr:function(e,t){var a=e.replace(/[^A-Za-z0-9\+\/]/g,""),i=a.length,s=t?Math.ceil((i*3+1>>2)/t)*t:i*3+1>>2,r=new Uint8Array(s);for(var o,n,h=0,l=0,c=0;c<i;c++){n=c&3;h|=this.b64ToUint6(a.charCodeAt(c))<<18-6*n;if(n===3||i-c===1){for(o=0;o<3&&l<s;o++,l++){r[l]=h>>>(16>>>o&24)&255}h=0}}return r},upload:function(e,t,a){var i=this.params.upload_name||"webcam";var s="";if(e.match(/^data\:image\/(\w+)/))s=RegExp.$1;else throw"Cannot locate image format in Data URI";var r=e.replace(/^data\:image\/\w+\;base64\,/,"");var o=new XMLHttpRequest;o.open("POST",t,true);if(o.upload&&o.upload.addEventListener){o.upload.addEventListener("progress",function(e){if(e.lengthComputable){var t=e.loaded/e.total;Webcam.dispatch("uploadProgress",t,e)}},false)}var n=this;o.onload=function(){if(a)a.apply(n,[o.status,o.responseText,o.statusText]);Webcam.dispatch("uploadComplete",o.status,o.responseText,o.statusText)};var h=new Blob([this.base64DecToArr(r)],{type:"image/"+s});var l=new FormData;l.append(i,h,i+"."+s.replace(/e/,""));o.send(l)}};Webcam.init();if(typeof define==="function"&&define.amd){define(function(){return Webcam})}else if(typeof module==="object"&&module.exports){module.exports=Webcam}else{e.Webcam=Webcam}})(window);
\ No newline at end of file

From 9d43911c8321c6c4e3b22f8b31c93180fbec9c38 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 21:46:58 +0530
Subject: [PATCH 13/31] added shields

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5e3c1f83e0..40d8049c70 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,14 @@
     </h5>
 </div>
 
-[![Build Status](https://travis-ci.org/frappe/frappe.png)](https://travis-ci.org/frappe/frappe)
+<div align="center">
+    <a href="https://travis-ci.org/frappe/frappe">
+        <img src="https://img.shields.io/travis/frappe/frappe.svg?style=flat-square">
+    </a>
+    <a href='https://frappe.io/docs'>
+        <img src='https://img.shields.io/badge/docs-📖-7575FF.svg?style=flat-square'/>
+    </a>
+</div>
 
 Full-stack web application framework that uses Python and MariaDB on the server side and a tightly integrated client side library. Built for [ERPNext](https://erpnext.com)
 

From d58e6b65e9f33a626921b6c4b653a614a5c1eb1e Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Mon, 25 Sep 2017 21:51:25 +0530
Subject: [PATCH 14/31] updated LICENSE, helps to index

---
 LICENSE     | 21 +++++++++++++++++++++
 README.md   |  7 +++++--
 license.txt |  9 ---------
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 LICENSE
 delete mode 100644 license.txt

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..956e51befb
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2016-2017 Frappé Technologies Pvt. Ltd. <developers@frappe.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index 40d8049c70..b8427fc055 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,10 @@
 
 Full-stack web application framework that uses Python and MariaDB on the server side and a tightly integrated client side library. Built for [ERPNext](https://erpnext.com)
 
+### Table of Contents
+* [Installation](#installation)
+* [License](#license)
+
 ### Installation
 
 [Install via Frappé Bench](https://github.com/frappe/bench)
@@ -40,5 +44,4 @@ For details and documentation, see the website
 [https://frappe.io](https://frappe.io)
 
 ### License
-
-MIT License
+This repository has been released under the [MIT License](LICENSE).
diff --git a/license.txt b/license.txt
deleted file mode 100644
index a76f4ef0ba..0000000000
--- a/license.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Frappe Technologies Pvt. Ltd.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From 5713c1454a4a4663e5ecc5ce2d07d02a4d77ba94 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 00:48:58 +0530
Subject: [PATCH 15/31] [MAJOR] functional frappe.ui.Capture :dancer:

---
 frappe/public/build.json                      |  6 +-
 .../js/frappe/form/controls/text_editor.js    |  8 +-
 frappe/public/js/frappe/ui/camera.js          | 67 -------------
 frappe/public/js/frappe/ui/capture.js         | 94 +++++++++++++++++++
 4 files changed, 103 insertions(+), 72 deletions(-)
 delete mode 100644 frappe/public/js/frappe/ui/camera.js
 create mode 100644 frappe/public/js/frappe/ui/capture.js

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 410f398ab2..b70d410f25 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -24,7 +24,7 @@
 	],
 	"js/control.min.js": [
 
-		"public/js/frappe/ui/camera.js",
+		"public/js/frappe/ui/capture.js",
 
 		"public/js/frappe/form/controls/base_control.js",
 		"public/js/frappe/form/controls/base_input.js",
@@ -67,7 +67,7 @@
 		"public/js/frappe/form/multi_select_dialog.js",
 		"public/js/frappe/ui/dialog.js",
 
-		"public/js/frappe/ui/camera.js",
+		"public/js/frappe/ui/capture.js",
 
 		"public/js/frappe/form/controls/base_control.js",
 		"public/js/frappe/form/controls/base_input.js",
@@ -179,7 +179,7 @@
 		"public/js/frappe/form/multi_select_dialog.js",
 		"public/js/frappe/ui/dialog.js",
 
-		"public/js/frappe/ui/camera.js",
+		"public/js/frappe/ui/capture.js",
 
 		"public/js/frappe/ui/app_icon.js",
 
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 3a82a7af6d..5904ae8ec1 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -13,8 +13,12 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 			contents: '<i class="fa fa-camera"/>',
 			tooltip: 'Camera',
 			click: () => {
-				const camera = new frappe.ui.Camera();
-				camera.show();
+				const capture = new frappe.ui.Capture();
+				capture.open();
+
+				capture.click((data) => {
+					context.invoke('editor.insertImage', data);
+				});
 			}
 		});
 
diff --git a/frappe/public/js/frappe/ui/camera.js b/frappe/public/js/frappe/ui/camera.js
deleted file mode 100644
index 733471d86e..0000000000
--- a/frappe/public/js/frappe/ui/camera.js
+++ /dev/null
@@ -1,67 +0,0 @@
-frappe.ui.Camera      = class
-{
-    constructor (options)
-    {
-        this.dialog   = new frappe.ui.Dialog();
-
-        this.template =
-        `
-            <div id="frappe-camera">
-
-            </div>
-        `
-
-        this.show     = this.show.bind(this);
-        this.hide     = this.hide.bind(this);
-        this.on       = this.on.bind(this);
-        this.attach   = this.attach.bind(this);
-
-        Webcam.set({
-            width: 320,
-            height: 240,
-            flip_horiz: true,
-        })
-    }
-
-    show ( )
-    {
-        this.attach((err) => {
-            if ( err )
-                throw Error('Unable to attach webcamera.');
-            
-            this.dialog.set_primary_action(__('Click'), () => {
-                this.click();
-            });
-            
-            this.dialog.show();
-        });
-    }
-
-    hide ( )
-    {
-        this.dialog.hide();
-    }
-
-    on (event, callback)
-    {
-        if ( event == 'attach' ) {
-            this.attach(callback);
-        }
-    }
-
-    click (callback)
-    {
-        Webcam.snap((data) => {
-            console.log(data);
-        });
-    }
-
-    attach (callback)
-    {
-        $(this.dialog.body).append(this.template);
-
-        Webcam.attach('#frappe-camera');
-
-        callback();
-    }
-};
\ No newline at end of file
diff --git a/frappe/public/js/frappe/ui/capture.js b/frappe/public/js/frappe/ui/capture.js
new file mode 100644
index 0000000000..9ce7b8431e
--- /dev/null
+++ b/frappe/public/js/frappe/ui/capture.js
@@ -0,0 +1,94 @@
+frappe.ui.Capture     = class
+{
+    constructor (options)
+    {
+        this.options  = 
+        {
+            width: 480, height: 320, flip_horiz: true
+        };
+
+        this.dialog   = new frappe.ui.Dialog();
+        this.template = 
+        `
+            <div class="text-center">
+                <div class="img-thumbnail" style="border: none;">
+                    <div id="frappe-capture"/>
+                </div>
+            </div>
+
+            <div id="frappe-capture-btn-toolbar" style="padding-top: 15px; padding-bottom: 15px;">
+                <div class="text-center">
+                    <div id="frappe-capture-btn-toolbar-snap">
+                        <a id="frappe-capture-btn-snap">
+                            <i class="fa fa-fw fa-2x fa-circle-o"/>
+                        </a>
+                    </div>
+                    <div class="btn-group" id="frappe-capture-btn-toolbar-knap">
+                        <button class="btn btn-default" id="frappe-capture-btn-discard">
+                            <i class="fa fa-fw fa-arrow-left"/>
+                        </button>
+                        <button class="btn btn-default" id="frappe-capture-btn-accept">
+                            <i class="fa fa-fw fa-arrow-right"/>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        `;
+        $(this.dialog.body).append(this.template);
+
+        this.$btnBarSnap = $(this.dialog.body).find('#frappe-capture-btn-toolbar-snap');
+        this.$btnBarKnap = $(this.dialog.body).find('#frappe-capture-btn-toolbar-knap');
+        this.$btnBarKnap.hide();
+
+        Webcam.set(this.options);
+    }
+
+    open ( )
+    {
+        this.dialog.show();
+
+        Webcam.attach('#frappe-capture');
+    }
+
+    freeze ( )
+    {
+        this.$btnBarSnap.hide();
+        this.$btnBarKnap.show();
+        
+        Webcam.freeze();
+    }
+
+    unfreeze ( )
+    {
+        this.$btnBarSnap.show();
+        this.$btnBarKnap.hide();
+
+        Webcam.unfreeze();
+    }
+
+    click (callback) 
+    {
+        $(this.dialog.body).find('#frappe-capture-btn-snap').click(() => {
+            this.freeze();
+
+            $(this.dialog.body).find('#frappe-capture-btn-discard').click(() => {
+                this.unfreeze();
+            });
+
+            $(this.dialog.body).find('#frappe-capture-btn-accept').click(() => {
+                Webcam.snap((data) => {
+                    callback(data);
+                });
+
+                this.hide();
+            });
+        });
+    }
+
+    hide ( )
+    {
+        Webcam.reset();
+
+        $(this.dialog.$wrapper).remove();
+    }
+};
\ No newline at end of file

From c582e7ae46609c97089f4569505b2e33c11ad5ba Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 09:43:55 +0530
Subject: [PATCH 16/31] fixed codacy

---
 frappe/public/js/frappe/ui/capture.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/ui/capture.js b/frappe/public/js/frappe/ui/capture.js
index 9ce7b8431e..1b1d2ff2f0 100644
--- a/frappe/public/js/frappe/ui/capture.js
+++ b/frappe/public/js/frappe/ui/capture.js
@@ -1,13 +1,9 @@
-frappe.ui.Capture     = class
+frappe.ui.Capture = class
 {
-    constructor (options)
+    constructor (options = { })
     {
-        this.options  = 
-        {
-            width: 480, height: 320, flip_horiz: true
-        };
-
-        this.dialog   = new frappe.ui.Dialog();
+        this.options = Object.assign({}, frappe.ui.Capture.DEFAULT_OPTIONS, options);
+        this.dialog = new frappe.ui.Dialog();
         this.template = 
         `
             <div class="text-center">
@@ -91,4 +87,8 @@ frappe.ui.Capture     = class
 
         $(this.dialog.$wrapper).remove();
     }
-};
\ No newline at end of file
+};
+frappe.ui.Capture.DEFAULT_OPTIONS = 
+{
+    width: 480, height: 320, flip_horiz: true
+}
\ No newline at end of file

From 94133c022e1b464c24ba89afe50536828f46d43a Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 09:51:19 +0530
Subject: [PATCH 17/31] spaces to tabs - codacy

---
 frappe/public/js/frappe/ui/capture.js | 148 +++++++++++++-------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/frappe/public/js/frappe/ui/capture.js b/frappe/public/js/frappe/ui/capture.js
index 1b1d2ff2f0..184d7b10d1 100644
--- a/frappe/public/js/frappe/ui/capture.js
+++ b/frappe/public/js/frappe/ui/capture.js
@@ -1,94 +1,94 @@
 frappe.ui.Capture = class
 {
-    constructor (options = { })
-    {
-        this.options = Object.assign({}, frappe.ui.Capture.DEFAULT_OPTIONS, options);
-        this.dialog = new frappe.ui.Dialog();
-        this.template = 
-        `
-            <div class="text-center">
-                <div class="img-thumbnail" style="border: none;">
-                    <div id="frappe-capture"/>
-                </div>
-            </div>
+	constructor (options = { })
+	{
+		this.options = Object.assign({}, frappe.ui.Capture.DEFAULT_OPTIONS, options);
+		this.dialog = new frappe.ui.Dialog();
+		this.template = 
+		`
+			<div class="text-center">
+				<div class="img-thumbnail" style="border: none;">
+					<div id="frappe-capture"/>
+				</div>
+			</div>
 
-            <div id="frappe-capture-btn-toolbar" style="padding-top: 15px; padding-bottom: 15px;">
-                <div class="text-center">
-                    <div id="frappe-capture-btn-toolbar-snap">
-                        <a id="frappe-capture-btn-snap">
-                            <i class="fa fa-fw fa-2x fa-circle-o"/>
-                        </a>
-                    </div>
-                    <div class="btn-group" id="frappe-capture-btn-toolbar-knap">
-                        <button class="btn btn-default" id="frappe-capture-btn-discard">
-                            <i class="fa fa-fw fa-arrow-left"/>
-                        </button>
-                        <button class="btn btn-default" id="frappe-capture-btn-accept">
-                            <i class="fa fa-fw fa-arrow-right"/>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        `;
-        $(this.dialog.body).append(this.template);
+			<div id="frappe-capture-btn-toolbar" style="padding-top: 15px; padding-bottom: 15px;">
+				<div class="text-center">
+					<div id="frappe-capture-btn-toolbar-snap">
+						<a id="frappe-capture-btn-snap">
+							<i class="fa fa-fw fa-2x fa-circle-o"/>
+						</a>
+					</div>
+					<div class="btn-group" id="frappe-capture-btn-toolbar-knap">
+						<button class="btn btn-default" id="frappe-capture-btn-discard">
+							<i class="fa fa-fw fa-arrow-left"/>
+						</button>
+						<button class="btn btn-default" id="frappe-capture-btn-accept">
+							<i class="fa fa-fw fa-arrow-right"/>
+						</button>
+					</div>
+				</div>
+			</div>
+		`;
+		$(this.dialog.body).append(this.template);
 
-        this.$btnBarSnap = $(this.dialog.body).find('#frappe-capture-btn-toolbar-snap');
-        this.$btnBarKnap = $(this.dialog.body).find('#frappe-capture-btn-toolbar-knap');
-        this.$btnBarKnap.hide();
+		this.$btnBarSnap = $(this.dialog.body).find('#frappe-capture-btn-toolbar-snap');
+		this.$btnBarKnap = $(this.dialog.body).find('#frappe-capture-btn-toolbar-knap');
+		this.$btnBarKnap.hide();
 
-        Webcam.set(this.options);
-    }
+		Webcam.set(this.options);
+	}
 
-    open ( )
-    {
-        this.dialog.show();
+	open ( )
+	{
+		this.dialog.show();
 
-        Webcam.attach('#frappe-capture');
-    }
+		Webcam.attach('#frappe-capture');
+	}
 
-    freeze ( )
-    {
-        this.$btnBarSnap.hide();
-        this.$btnBarKnap.show();
-        
-        Webcam.freeze();
-    }
+	freeze ( )
+	{
+		this.$btnBarSnap.hide();
+		this.$btnBarKnap.show();
+		
+		Webcam.freeze();
+	}
 
-    unfreeze ( )
-    {
-        this.$btnBarSnap.show();
-        this.$btnBarKnap.hide();
+	unfreeze ( )
+	{
+		this.$btnBarSnap.show();
+		this.$btnBarKnap.hide();
 
-        Webcam.unfreeze();
-    }
+		Webcam.unfreeze();
+	}
 
-    click (callback) 
-    {
-        $(this.dialog.body).find('#frappe-capture-btn-snap').click(() => {
-            this.freeze();
+	click (callback) 
+	{
+		$(this.dialog.body).find('#frappe-capture-btn-snap').click(() => {
+			this.freeze();
 
-            $(this.dialog.body).find('#frappe-capture-btn-discard').click(() => {
-                this.unfreeze();
-            });
+			$(this.dialog.body).find('#frappe-capture-btn-discard').click(() => {
+				this.unfreeze();
+			});
 
-            $(this.dialog.body).find('#frappe-capture-btn-accept').click(() => {
-                Webcam.snap((data) => {
-                    callback(data);
-                });
+			$(this.dialog.body).find('#frappe-capture-btn-accept').click(() => {
+				Webcam.snap((data) => {
+					callback(data);
+				});
 
-                this.hide();
-            });
-        });
-    }
+				this.hide();
+			});
+		});
+	}
 
-    hide ( )
-    {
-        Webcam.reset();
+	hide ( )
+	{
+		Webcam.reset();
 
-        $(this.dialog.$wrapper).remove();
-    }
+		$(this.dialog.$wrapper).remove();
+	}
 };
 frappe.ui.Capture.DEFAULT_OPTIONS = 
 {
-    width: 480, height: 320, flip_horiz: true
+	width: 480, height: 320, flip_horiz: true
 }
\ No newline at end of file

From 2816e9f54df609639d349c947778ecba331221c9 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 10:01:40 +0530
Subject: [PATCH 18/31] renamed make_copy_force to reset

---
 frappe/build.py          | 8 ++++----
 frappe/commands/utils.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/build.py b/frappe/build.py
index 9421ca7e47..f33fb560cd 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -26,12 +26,12 @@ def setup():
 		except ImportError: pass
 	app_paths = [os.path.dirname(pymodule.__file__) for pymodule in pymodules]
 
-def bundle(no_compress, make_copy=False, make_copy_force=False, verbose=False):
+def bundle(no_compress, make_copy=False, reset=False, verbose=False):
 	"""concat / minify js files"""
 	# build js files
 	setup()
 
-	make_asset_dirs(make_copy=make_copy, make_copy_force = make_copy_force)
+	make_asset_dirs(make_copy=make_copy, reset = reset)
 
 	# new nodejs build system
 	command = 'node --use_strict ../apps/frappe/frappe/build.js --build'
@@ -61,7 +61,7 @@ def watch(no_compress):
 
 	# 	time.sleep(3)
 
-def make_asset_dirs(make_copy=False, make_copy_force=False):
+def make_asset_dirs(make_copy=False, reset=False):
 	# don't even think of making assets_path absolute - rm -rf ahead.
 	assets_path = os.path.join(frappe.local.sites_path, "assets")
 	for dir_path in [
@@ -83,7 +83,7 @@ def make_asset_dirs(make_copy=False, make_copy_force=False):
 		for source, target in symlinks:
 			source = os.path.abspath(source)
 			if os.path.exists(source):
-				if make_copy_force:
+				if reset:
 					if os.path.exists(target):
 						if os.path.islink(target):
 							os.unlink(target)
diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index 9fa1ff3dbe..fa15e67f9b 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -7,14 +7,14 @@ from frappe.commands import pass_context, get_site
 
 @click.command('build')
 @click.option('--make-copy', is_flag=True, default=False, help='Copy the files instead of symlinking')
-@click.option('--make-copy-force', is_flag=True, default=False, help='Copy the files instead of symlinking with force')
+@click.option('--reset', is_flag=True, default=False, help='Copy the files instead of symlinking with force')
 @click.option('--verbose', is_flag=True, default=False, help='Verbose')
-def build(make_copy=False, make_copy_force = False, verbose=False):
+def build(make_copy=False, reset = False, verbose=False):
 	"Minify + concatenate JS and CSS files, build translations"
 	import frappe.build
 	import frappe
 	frappe.init('')
-	frappe.build.bundle(False, make_copy=make_copy, make_copy_force = make_copy_force, verbose=verbose)
+	frappe.build.bundle(False, make_copy=make_copy, reset = reset, verbose=verbose)
 
 @click.command('watch')
 def watch():

From 6d764e7ac54e5331a92c11cb0edf18c8edc23c34 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 10:03:19 +0530
Subject: [PATCH 19/31] fixed codacy

---
 frappe/public/js/frappe/ui/capture.js | 2 +-
 setup.py                              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/ui/capture.js b/frappe/public/js/frappe/ui/capture.js
index 184d7b10d1..f555243975 100644
--- a/frappe/public/js/frappe/ui/capture.js
+++ b/frappe/public/js/frappe/ui/capture.js
@@ -91,4 +91,4 @@ frappe.ui.Capture = class
 frappe.ui.Capture.DEFAULT_OPTIONS = 
 {
 	width: 480, height: 320, flip_horiz: true
-}
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 87c0116832..466449e956 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,6 @@ class CleanCommand(Clean):
                 if extension in ['.pyc']:
                     abspath = os.path.join(dirpath, filename)
                     os.remove(abspath)
-                
             for dirname in dirnames:
                 if dirname in ['__pycache__']:
                     abspath = os.path.join(dirpath,  dirname)

From e8b6c95a6a4f1007775d6ca3ededb8209b20a7d6 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 10:06:03 +0530
Subject: [PATCH 20/31] [minor] wiggling needs to be falsified when cleared

---
 frappe/core/page/desktop/desktop.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index 2c8210c364..bd3bbfc2f5 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -154,6 +154,8 @@ $.extend(frappe.desktop, {
 			$notis.show();
 
 			$icons.trigger('stopRumble');
+
+			wiggling = false;
 		};
 
 		// initiate wiggling.

From fda767d9af6b2c9c4971ed3d39dc8b3f7af293d5 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 11:50:29 +0530
Subject: [PATCH 21/31] added Webcam to globals

---
 .eslintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc b/.eslintrc
index f94193e00e..4ea7f0edff 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -54,6 +54,7 @@
 		"Taggle": true,
 		"Gantt": true,
 		"Slick": true,
+		"Webcam": true,
 		"PhotoSwipe": true,
 		"PhotoSwipeUI_Default": true,
 		"fluxify": true,

From 9416df270dc9f9920b8c9689be9537c482c9146c Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Tue, 26 Sep 2017 15:44:04 +0530
Subject: [PATCH 22/31] [BUG] fixed, changed to --restore, reset is a flag for
 test_runner

---
 frappe/build.py          | 8 ++++----
 frappe/commands/utils.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/build.py b/frappe/build.py
index f33fb560cd..e0ce46f923 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -26,12 +26,12 @@ def setup():
 		except ImportError: pass
 	app_paths = [os.path.dirname(pymodule.__file__) for pymodule in pymodules]
 
-def bundle(no_compress, make_copy=False, reset=False, verbose=False):
+def bundle(no_compress, make_copy=False, restore=False, verbose=False):
 	"""concat / minify js files"""
 	# build js files
 	setup()
 
-	make_asset_dirs(make_copy=make_copy, reset = reset)
+	make_asset_dirs(make_copy=make_copy, restore=restore)
 
 	# new nodejs build system
 	command = 'node --use_strict ../apps/frappe/frappe/build.js --build'
@@ -61,7 +61,7 @@ def watch(no_compress):
 
 	# 	time.sleep(3)
 
-def make_asset_dirs(make_copy=False, reset=False):
+def make_asset_dirs(make_copy=False, restore=False):
 	# don't even think of making assets_path absolute - rm -rf ahead.
 	assets_path = os.path.join(frappe.local.sites_path, "assets")
 	for dir_path in [
@@ -83,7 +83,7 @@ def make_asset_dirs(make_copy=False, reset=False):
 		for source, target in symlinks:
 			source = os.path.abspath(source)
 			if os.path.exists(source):
-				if reset:
+				if restore:
 					if os.path.exists(target):
 						if os.path.islink(target):
 							os.unlink(target)
diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index fa15e67f9b..c833a5b1a3 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -7,14 +7,14 @@ from frappe.commands import pass_context, get_site
 
 @click.command('build')
 @click.option('--make-copy', is_flag=True, default=False, help='Copy the files instead of symlinking')
-@click.option('--reset', is_flag=True, default=False, help='Copy the files instead of symlinking with force')
+@click.option('--restore', is_flag=True, default=False, help='Copy the files instead of symlinking with force')
 @click.option('--verbose', is_flag=True, default=False, help='Verbose')
-def build(make_copy=False, reset = False, verbose=False):
+def build(make_copy=False, restore = False, verbose=False):
 	"Minify + concatenate JS and CSS files, build translations"
 	import frappe.build
 	import frappe
 	frappe.init('')
-	frappe.build.bundle(False, make_copy=make_copy, reset = reset, verbose=verbose)
+	frappe.build.bundle(False, make_copy=make_copy, restore = restore, verbose=verbose)
 
 @click.command('watch')
 def watch():

From 5ac84f968342b9e820e3aab6c50f57c64cb87871 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Wed, 27 Sep 2017 23:30:00 +0530
Subject: [PATCH 23/31] Update requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 44a441e34d..798933fe25 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ httplib2
 jinja2
 markdown2
 markupsafe
-mysqlclient==1.3.10
+https://github.com/PyMySQL/mysqlclient-python/archive/master.zip
 python-geoip
 python-geoip-geolite2
 python-dateutil

From 65a1cede89b9a8a1cd9f6264a1b79d31e268454a Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 28 Sep 2017 11:49:29 +0530
Subject: [PATCH 24/31] Fixed mysqclient dependency

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 798933fe25..44a441e34d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ httplib2
 jinja2
 markdown2
 markupsafe
-https://github.com/PyMySQL/mysqlclient-python/archive/master.zip
+mysqlclient==1.3.10
 python-geoip
 python-geoip-geolite2
 python-dateutil

From a33512aa38e48425c96a892385fff1ee096d9cd9 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 28 Sep 2017 12:35:52 +0530
Subject: [PATCH 25/31] added node_modules, working on webpack

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4dd4f3f6ce..436a08414e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ dist/
 build/
 frappe/docs/current
 .vscode
+node_modules
\ No newline at end of file

From ea030bcb9eacc4229eae31daefe5042aad4e75ca Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 28 Sep 2017 12:37:16 +0530
Subject: [PATCH 26/31] added setup_wiggle function

---
 frappe/core/page/desktop/desktop.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index bd3bbfc2f5..2e1dc433a5 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -132,6 +132,10 @@ $.extend(frappe.desktop, {
 			}
 		});
 
+		this.setup_wiggle()
+	},
+
+	setup_wiggle: () => {
 		// Wiggle, Wiggle, Wiggle.
 		const DURATION_LONG_PRESS = 1000;
 		// lesser the antidode, more the wiggle (like your drunk uncle)

From ae3099bfe4c1a3b472e3f941861a774e2e8a58d8 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 28 Sep 2017 12:38:41 +0530
Subject: [PATCH 27/31] removed whitespace

---
 frappe/public/build.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frappe/public/build.json b/frappe/public/build.json
index b70d410f25..8d10760cf1 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -23,9 +23,7 @@
 		"public/js/frappe/misc/rating_icons.html"
 	],
 	"js/control.min.js": [
-
 		"public/js/frappe/ui/capture.js",
-
 		"public/js/frappe/form/controls/base_control.js",
 		"public/js/frappe/form/controls/base_input.js",
 		"public/js/frappe/form/controls/data.js",
@@ -59,14 +57,12 @@
 		"public/js/frappe/dom.js",
 		"public/js/frappe/ui/modal.html",
 
-
 		"public/js/frappe/form/formatters.js",
 		"public/js/frappe/form/layout.js",
 		"public/js/frappe/ui/field_group.js",
 		"public/js/frappe/form/link_selector.js",
 		"public/js/frappe/form/multi_select_dialog.js",
 		"public/js/frappe/ui/dialog.js",
-
 		"public/js/frappe/ui/capture.js",
 
 		"public/js/frappe/form/controls/base_control.js",
@@ -178,9 +174,7 @@
 		"public/js/frappe/form/link_selector.js",
 		"public/js/frappe/form/multi_select_dialog.js",
 		"public/js/frappe/ui/dialog.js",
-
 		"public/js/frappe/ui/capture.js",
-
 		"public/js/frappe/ui/app_icon.js",
 
 		"public/js/frappe/model/model.js",

From da76dd5f7a2a42d5667e98baaefb8c85c9af29c7 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 28 Sep 2017 12:42:45 +0530
Subject: [PATCH 28/31] added this.wiggling for scope call

---
 frappe/core/page/desktop/desktop.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index 2e1dc433a5..114dbc97df 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -112,7 +112,7 @@ $.extend(frappe.desktop, {
 	},
 
 	setup_module_click: function() {
-		var wiggling = false; // wiggle, wiggle, wiggle.
+		this.wiggling = false; // wiggle, wiggle, wiggle.
 
 		if(frappe.list_desktop) {
 			frappe.desktop.wrapper.on("click", ".desktop-list-item", function() {
@@ -120,7 +120,7 @@ $.extend(frappe.desktop, {
 			});
 		} else {
 			frappe.desktop.wrapper.on("click", ".app-icon", function() {
-				if ( !wiggling ) {
+				if ( !this.wiggling ) {
 					frappe.desktop.open_module($(this).parent());
 				}
 			});
@@ -159,7 +159,7 @@ $.extend(frappe.desktop, {
 
 			$icons.trigger('stopRumble');
 
-			wiggling = false;
+			this.wiggling = false;
 		};
 
 		// initiate wiggling.
@@ -169,7 +169,7 @@ $.extend(frappe.desktop, {
 
 		frappe.desktop.wrapper.on('mousedown', '.app-icon', () => {
 			timer_id     = setTimeout(() => {
-				wiggling = true;
+				this.wiggling = true;
 				// hide all notifications.
 				$notis.hide();
 				
@@ -231,7 +231,7 @@ $.extend(frappe.desktop, {
 
 		// also stop wiggling if clicked elsewhere.
 		$('body').click((event) => {
-			if ( wiggling ) {
+			if ( this.wiggling ) {
 				const $target = $(event.target);
 				// our target shouldn't be .app-icons or .close
 				const $parent = $target.parents('.case-wrapper');

From aeb00b7afad8fe51264ff03b9b0edb04f9b3ef6e Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Thu, 28 Sep 2017 12:58:39 +0530
Subject: [PATCH 29/31] fixed codacy

---
 frappe/core/page/desktop/desktop.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index 114dbc97df..a0a605c679 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -132,7 +132,7 @@ $.extend(frappe.desktop, {
 			}
 		});
 
-		this.setup_wiggle()
+		this.setup_wiggle();
 	},
 
 	setup_wiggle: () => {

From 0aa0e79aa7570e3e2b0382be24fccc8a654ce841 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Fri, 29 Sep 2017 11:07:42 +0530
Subject: [PATCH 30/31] [fix] wiggling

---
 frappe/core/page/desktop/desktop.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index a0a605c679..f3399cb6d6 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -112,7 +112,7 @@ $.extend(frappe.desktop, {
 	},
 
 	setup_module_click: function() {
-		this.wiggling = false; // wiggle, wiggle, wiggle.
+		frappe.desktop.wiggling = false;
 
 		if(frappe.list_desktop) {
 			frappe.desktop.wrapper.on("click", ".desktop-list-item", function() {
@@ -120,7 +120,7 @@ $.extend(frappe.desktop, {
 			});
 		} else {
 			frappe.desktop.wrapper.on("click", ".app-icon", function() {
-				if ( !this.wiggling ) {
+				if ( !frappe.desktop.wiggling ) {
 					frappe.desktop.open_module($(this).parent());
 				}
 			});
@@ -132,7 +132,7 @@ $.extend(frappe.desktop, {
 			}
 		});
 
-		this.setup_wiggle();
+		frappe.desktop.setup_wiggle();
 	},
 
 	setup_wiggle: () => {
@@ -159,7 +159,7 @@ $.extend(frappe.desktop, {
 
 			$icons.trigger('stopRumble');
 
-			this.wiggling = false;
+			frappe.desktop.wiggling   = false;
 		};
 
 		// initiate wiggling.
@@ -169,7 +169,7 @@ $.extend(frappe.desktop, {
 
 		frappe.desktop.wrapper.on('mousedown', '.app-icon', () => {
 			timer_id     = setTimeout(() => {
-				this.wiggling = true;
+				frappe.desktop.wiggling = true;
 				// hide all notifications.
 				$notis.hide();
 				
@@ -231,7 +231,7 @@ $.extend(frappe.desktop, {
 
 		// also stop wiggling if clicked elsewhere.
 		$('body').click((event) => {
-			if ( this.wiggling ) {
+			if ( frappe.desktop.wiggling ) {
 				const $target = $(event.target);
 				// our target shouldn't be .app-icons or .close
 				const $parent = $target.parents('.case-wrapper');

From e2d87e7887e41adf39eee1df613c66c4efc44881 Mon Sep 17 00:00:00 2001
From: Achilles Rasquinha <achillesrasquinha@gmail.com>
Date: Fri, 29 Sep 2017 13:35:35 +0530
Subject: [PATCH 31/31] fix for mariadb@10.2

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 44a441e34d..0216f85690 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ httplib2
 jinja2
 markdown2
 markupsafe
-mysqlclient==1.3.10
+-e git+https://github.com/frappe/mysqlclient-python.git@1.3.12#egg=mysqlclient
 python-geoip
 python-geoip-geolite2
 python-dateutil
@@ -37,7 +37,7 @@ cryptography
 pyopenssl
 ndg-httpsclient
 pyasn1
-zxcvbn
+zxcvbn-python
 psutil
 unittest-xml-reporting
 oauthlib