Prateeksha Singh
a25e8ca570
Merge pull request #7071 from adityahase/desk-fix
...
fix(desk): Set routes for unhandled shortcut tags
2019-03-14 08:48:28 +05:30
Aditya Hase
6b3c1b33e1
fix(desk): Set routes for unhandled shortcut tags
...
Route for shortcut tags like Chart of Accounts and
Gantt Chart aren't set properly, handle them
2019-03-13 19:32:46 +05:30
Prateeksha Singh
92a74537de
Merge pull request #7069 from pratu16x7/desk-fixes
...
fix(desk): check if settings not found for home
2019-03-13 15:03:50 +05:30
Prateeksha Singh
b6b4aa2cb0
fix(desk): check if not settings found for home
2019-03-13 15:01:34 +05:30
Shivam Mishra
c2ff91b6e9
fix: editor does not allow html rendering ( #7061 )
...
Port of https://github.com/frappe/frappe/pull/7062
2019-03-13 13:59:53 +05:30
Prateeksha Singh
77a03b3caf
Merge pull request #7065 from pratu16x7/desk-fixes
...
fix(desk): Add default value for custom settings in utility
2019-03-12 19:27:13 +05:30
Prateeksha Singh
e24a2afa47
fix(desk): Add default value for custom setting in utility
2019-03-12 19:24:35 +05:30
Anurag Mishra
99c0388ae7
fix: Reload doc for Document Follow ( #7053 )
2019-03-12 18:05:54 +05:30
Prateeksha Singh
41d9ee873b
Merge pull request #7064 from pratu16x7/desk-fixes
...
fix(desk): check for no settings data
2019-03-12 15:56:23 +05:30
Prateeksha Singh
c9ade7ea68
fix(desk): check for no settings data
2019-03-12 15:54:11 +05:30
Prateeksha Singh
5536f2d48f
Merge pull request #7060 from pratu16x7/desk-custom-settings
...
feat(desk): Overlay customizations over default settings
2019-03-12 15:02:28 +05:30
Prateeksha Singh
3f519de474
feat(desk): Overlay customizations over default settings
2019-03-12 12:58:45 +05:30
Prateeksha Singh
6fd3c811ac
fix(desk): build default settings
2019-03-12 12:32:03 +05:30
Faris Ansari
44f52aa5a4
Merge pull request #7051 from netchampfaris/desktop-boot-fix
...
fix: Use .get instead of box accessor
2019-03-11 16:14:56 +05:30
Suraj Shetty
9ef188cb7d
Merge pull request #7052 from netchampfaris/v12-patch-fixes
...
fix: Miscellaneous fixes for v12
2019-03-11 12:14:54 +05:30
Faris Ansari
9f9a579b0a
fix: Revert auto-commit
2019-03-11 12:00:54 +05:30
Faris Ansari
5ac4a34f24
fix: Update modified to pick up field change
...
- Default Print Language is not picked up in some migrations
2019-03-11 05:32:03 +00:00
Faris Ansari
015937f334
fix: Error log link when error in notification
2019-03-11 05:31:23 +00:00
Faris Ansari
2c2ca66cfd
fix: Always commit error logs
2019-03-11 05:30:24 +00:00
Faris Ansari
f9b3a6c242
fix: Minor changes for smooth migration to v12
2019-03-11 05:29:50 +00:00
Faris Ansari
c735f60d95
fix: Use .get instead of box accessor
2019-03-11 10:21:04 +05:30
Rushabh Mehta
af605948bc
fix(document_follow): ignore column missing if in patch
2019-03-11 08:55:12 +05:30
Faris Ansari
2fa90a29b5
Merge pull request #7026 from adityahase/fast-list
...
feat(desk): List View Settings
2019-03-09 10:38:24 +05:30
Faris Ansari
095067f11f
Merge branch 'develop' into fast-list
2019-03-08 21:10:06 +05:30
Faris Ansari
b61a37a233
fix: Notification test in Postgres ( #7044 )
2019-03-08 20:47:21 +05:30
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
Aditya Hase
b40be61a4c
fix(cypress): Check everything in one test
2019-03-07 22:43:01 +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
