Frappe Bot
94ea028db3
Merge branch 'master' into develop
2019-03-08 09:38:18 +00:00
Frappe Bot
37fa2dc7f6
Merge branch 'hotfix'
2019-03-08 09:00:40 +00:00
Frappe Bot
907aacc1cf
bumped to version 11.1.14
2019-03-08 09:00:40 +00:00
Rushabh Mehta
40dd3eb70f
Merge pull request #7046 from deepeshgarg007/comments
...
fix: Move comments from communication
2019-03-08 12:56:21 +05:30
Rushabh Mehta
67d00d59d9
fix(migration): change user timestamp for reloading
2019-03-08 11:55:58 +05:30
deepeshgarg007
2fac689455
fix: Reload comment doctype
2019-03-07 22:15:04 +05:30
Aditya Hase
703e449cee
fix(hooks): Add missing commas
...
Fixes following scheduler error
ModuleNotFoundError: No module named 'frappe.deferred_insert.save_to_dbfrappe'; 'frappe.deferred_insert' is not a package
2019-03-07 20:29:39 +05:30
deepeshgarg007
2b403c2b31
fix: Datatype for comment
2019-03-07 18:41:38 +05:30
rohitwaghchaure
952dcedcc9
Merge pull request #7042 from rohitwaghchaure/after_bench_migrate_system_uncheck_disable_prepared_report
...
fix: after bench migrate system uncheck Disable Prepared Report in the report
2019-03-07 18:20:38 +05:30
Rohit Waghchaure
80bb7cba8f
fix: after bench migrate system uncheck Disable Prepared Report in the report
2019-03-07 17:33:50 +05:30
Rushabh Mehta
2012068f03
Merge pull request #7041 from frappe/revert-7039-fix-comment
...
Revert "fix: sanitise comments for js events"
2019-03-07 17:18:52 +05:30
Rushabh Mehta
247c968964
Revert "fix: sanitise comments for js events"
2019-03-07 17:18:38 +05:30
Rushabh Mehta
ee9b894a53
Merge pull request #7039 from scmmishra/fix-comment
...
fix: sanitise comments for js events
2019-03-07 17:03:51 +05:30
Rushabh Mehta
d7ebaa07e9
Merge pull request #7038 from rmehta/unassign-rule-fix
...
Unassignment rule
2019-03-07 17:03:28 +05:30
scmmishra
7ef38cb4cc
style: removed comments
2019-03-07 16:55:21 +05:30
scmmishra
c6516f16d0
fix: sanitise comments for js events
2019-03-07 16:40:45 +05:30
Rushabh Mehta
ecf6eedd9e
fix(style): max height for timeline items, incase of long threads
2019-03-07 16:32:59 +05:30
Rushabh Mehta
30f313e513
fix(assignment_rule): only apply unassign rule if assiged by the same rule
2019-03-07 16:31:56 +05:30
Faris Ansari
83101c2682
Merge pull request #7034 from surajshetty3416/refactor-and-fixes
...
fix: Refactor frappe.require(web version) and fix timeline
2019-03-07 14:38:52 +05:30
Sagar Vora
7974880460
fix: remove tag not working for tags with sanitised labels ( #7033 )
...
Fixes https://github.com/frappe/erpnext/issues/12501
Before:
After:
2019-03-07 14:37:28 +05:30
Aditya Hase
5493d1dfa3
fix(test): Remove unused operations from chat tests ( #7028 )
...
Reduces frappe app test time by 20 seconds
2019-03-07 14:36:06 +05:30
Anurag Mishra
cd191439fd
feat: Document subscription ( #6745 )
2019-03-07 14:06:22 +05:30
Rushabh Mehta
313fb361dc
fix(style): max height for timeline items, incase of long threads
2019-03-07 13:21:29 +05:30
sahil28297
7eb94a2d35
Merge pull request #7036 from sahil28297/create_contact_patch
...
fix(patch): ignore mandatory for creating contact through patch
2019-03-07 12:57:08 +05:30
Sahil Khan
964fe26801
fix(patch): ignore mandatory for creating contact through patch
2019-03-07 12:38:53 +05:30
Suraj Shetty
b230b83590
fix: frappe.require style import
2019-03-07 11:04:10 +05:30
Suraj Shetty
ccfc02bcbb
fix: Set owner of doc as 'Guest' if doc.owner is undefined
...
- instead of seting owner as loggedin user
2019-03-07 10:16:41 +05:30
Suraj Shetty
ef0eb75aa7
feat: refactor frappe.require(website version) to add multiple
...
script import
2019-03-07 10:09:13 +05:30
Suraj Shetty
8ae185f7ff
chore: Set ecmaVersion = 8 in eslintrc to allow async await syntax
2019-03-07 10:07:10 +05:30
Suraj Shetty
dcf3d2d061
fix: Avoid default of field if its depends_on field is not set ( #7004 )
...
Avoid default of field if its depends_on field is not set
For example, We have a field **represents_company** in Customer DocType. This field is relevant only if the **Is Internal Customer** checkbox is checked. So the problem is even if **is_internal_customer** is unchecked by default the system sets the default for **represents_company**.
This PR fixes that.
2019-03-07 10:06:00 +05:30
Prateeksha Singh
5a67c57171
Merge pull request #7031 from pratu16x7/desk-use-container
...
fix(desk): use pre-existing container for desk
2019-03-07 08:45:41 +05:30
Prateeksha Singh
85d1b768b9
fix(desk): use pre-existing container for desk
2019-03-07 08:31:17 +05:30
FinByz Tech Pvt. Ltd
245a8186af
fix: Allowed guest to attach files to web forms ( #7017 )
...
Created the fix for the issue [#6774 ](https://github.com/frappe/frappe/issues/6774 ), in which guest can attach files in web forms like job application.
2019-03-06 22:48:11 +05:30
Shivam Mishra
2a40eeb89a
Merge pull request #7023 from scmmishra/web-fixes
...
Web fixes
2019-03-06 19:03:38 +05:30
scmmishra
ad2c192f76
Merge branch 'develop' of https://github.com/frappe/frappe into web-fixes
2019-03-06 17:27:49 +05:30
Shivam Mishra
be3716cec5
Merge pull request #7024 from pratu16x7/remove-desk-test
...
chore(test): remove desk test
2019-03-06 16:46:04 +05:30
Rushabh Mehta
9df07891ff
fix(xmlx): handle unparseable HTML
2019-03-06 16:11:06 +05:30
Prateeksha Singh
a6d5a27de0
chore(test): remove desk test
2019-03-06 15:39:20 +05:30
scmmishra
80ab621073
fix: Minor filter bug
...
Co-authored-by: Deepesh <deepeshgarg6@gmail.com>
2019-03-06 15:00:11 +05:30
scmmishra
a6a4d3c112
style: Fix Codacy
2019-03-06 14:59:23 +05:30
Rushabh Mehta
fd8aad457a
fix(query_report): fix progress bar to be shown only for reports over 5 seconds
2019-03-06 14:52:22 +05:30
scmmishra
0f737d7834
fix: Minor css fix
2019-03-06 14:46:33 +05:30
scmmishra
f69adb4314
style: Fixed button placement in web form page
2019-03-06 14:45:41 +05:30
scmmishra
d97352c7ad
fix (webform): Fixed filters in web_from frid view
2019-03-06 14:45:41 +05:30
scmmishra
fa4f88db07
fix (web form): Fixed link to doc form in form grid
2019-03-06 14:45:41 +05:30
scmmishra
53b97e0fd5
fix (web-form): In form grid
2019-03-06 14:45:41 +05:30
scmmishra
8ea272601f
fix: Added from_grid.less to web_form
2019-03-06 14:45:41 +05:30
scmmishra
d484ee2d12
fix: button alignment on web-form
2019-03-06 14:45:41 +05:30
scmmishra
f4efb7df0a
[fix] Awesomeplete breaking on web forms
...
- Added variables.less to awesomeplete
- Added awesompelete to web_form.css in build.json
2019-03-06 14:45:41 +05:30
Rushabh Mehta
a9db41aaf2
Merge pull request #7018 from rmehta/fix-db-query-null-fuelds
...
fix(db_query): handle null in fields list
2019-03-06 08:53:38 +05:30
