Commit graph

19609 commits

Author SHA1 Message Date
Himanshu
59c945bb84 fix(communication): Make optimizations to the patch
* use batches to move Timeline and Links to Timeline Links doctype
2019-05-21 00:00:57 +05:30
Rushabh Mehta
b8508de933
Merge pull request #7520 from ElasticRun/develop
Fix related to Merge request #7228
2019-05-20 19:09:55 +05:30
Sachin Mane
90c62d0c99 .get() does not work in JavaScript. 2019-05-20 18:55:33 +05:30
Sachin Mane
b1c63dbe95 Merge branch 'develop' of https://github.com/frappe/frappe into develop 2019-05-20 18:51:39 +05:30
Rushabh Mehta
28ed21b94c
Merge pull request #7419 from josejibin/fix/postgres-compatible
fix(postgres): Make db queries postgres compatible
2019-05-20 18:02:30 +05:30
Rushabh Mehta
91ce69b58b
Merge pull request #7228 from ElasticRun/develop
feat: Add frappe cmd and doctype to request headers for analytics and load balancing
2019-05-20 17:59:38 +05:30
Faris Ansari
cf8a53e433
feat(Communication): Move Timeline DocType and Name to Dynamic Links (#7467)
feat(Communication): Move Timeline DocType and Name to Dynamic Links
2019-05-20 15:12:32 +05:30
Himanshu Warekar
4946c1559f Merge develop in comm_ref 2019-05-20 14:40:59 +05:30
Himanshu Warekar
81d314bf10 fix: typo fixes 2019-05-20 14:40:20 +05:30
Himanshu Warekar
b4e561c047 tests: fix test cases 2019-05-20 14:15:57 +05:30
Himanshu Warekar
c86ba03632 tests: fix test cases 2019-05-20 13:38:01 +05:30
Himanshu Warekar
127cf29a20 tests: added new test cases 2019-05-20 13:04:16 +05:30
jibin jose
480f1794d3 Make db query postgres compatible 2019-05-20 12:31:30 +05:30
jibin jose
1a58c13966 fix(postgres): Make db queries postgres compatible 2019-05-20 12:31:30 +05:30
Deepesh Garg
a873340d4e fix: Create new button for dynamic links (#7511)
* fix: Create new button for dynamic links

* fix: Use get_options for fetching options
2019-05-20 12:19:42 +05:30
Suraj Shetty
78da23a7a1
Merge pull request #7516 from deepeshgarg007/moduleview_develop
fix: Module view fix for custom query reports
2019-05-20 10:25:11 +05:30
deepeshgarg007
ba7af52caa fix: Module view fix for custom reports 2019-05-19 17:56:41 +05:30
Rushabh Mehta
5865eb1538
Merge pull request #7507 from prssanna/link-preview-fixes
fix(Link Preview): Allow popover to be hovered on and other fixes
2019-05-19 09:31:38 +05:30
Himanshu Warekar
05b3050b63 patch: batch 10000 query for patch 2019-05-19 00:39:11 +05:30
Himanshu Warekar
c52c1611cb patch: optimisations 2019-05-18 19:17:00 +05:30
Himanshu Warekar
6403cf45ae patch: optimisations 2019-05-18 18:54:47 +05:30
Faris Ansari
6c3130dc77
fix: Allow variables to be overridden using theme (#7514) 2019-05-18 16:42:56 +05:30
Himanshu Warekar
defe1b2eef fix: miscellaneous changes 2019-05-18 13:37:00 +05:30
Prssanna Desai
d6d0bc1cb3 Allow popover to be hovered on and other fixes 2019-05-18 12:48:53 +05:30
Himanshu Warekar
0050fb58ff fix: remove clear reference links from delete doc 2019-05-18 10:40:55 +05:30
Himanshu Warekar
9f02f4284d patch: optimisations 2019-05-18 00:35:17 +05:30
Himanshu Warekar
dbd0a79ffc patch: move timeline and link to dynamic links 2019-05-17 14:26:53 +05:30
Himanshu Warekar
08fb052334 fix: rename dynamic links to timeline links 2019-05-17 14:21:37 +05:30
Himanshu Warekar
447019b947 Merge develop into comm_ref 2019-05-17 00:25:24 +05:30
Himanshu Warekar
0d9b7048d9 fix: tests for communication 2019-05-17 00:06:38 +05:30
Himanshu Warekar
aa98dd28a6 test: communication tests 2019-05-16 20:04:49 +05:30
Rushabh Mehta
e03539703c
Merge pull request #7502 from rmehta/link-preview-fixes
fix(link-preview): show preview only if setup and cleanup style
2019-05-16 19:32:55 +05:30
Rushabh Mehta
c89185aed8 fix(minor): comments.py 2019-05-16 18:45:41 +05:30
Himanshu Warekar
43bc6ca8d1 fix: missing quotes in where clause 2019-05-16 18:36:10 +05:30
Rushabh Mehta
29c0d6f16a fix(minor): comments.py 2019-05-16 17:58:27 +05:30
Himanshu Warekar
005c1a8de1 fix: use frappe sql for query 2019-05-16 17:40:58 +05:30
Anurag Mishra
e4f70da7cd fix: Report Print format for indented rows (#7505) 2019-05-16 17:37:37 +05:30
Suraj Shetty
da2d538485
Merge pull request #7492 from netchampfaris/allow-multiple-app-installs
feat: Allow multiple apps to be installed to site
2019-05-16 17:29:17 +05:30
Rushabh Mehta
0284b1a965 fix(null-handling): for doctype, doctype, ignore null values 2019-05-16 15:44:46 +05:30
Rushabh Mehta
e2d3b86374 fix(null-handling): for doctype, doctype, ignore null values 2019-05-16 15:20:31 +05:30
Rushabh Mehta
e5b97de255 fix(minor): default check value to 0 and validate 2019-05-16 15:00:14 +05:30
Rushabh Mehta
6403ffa4df
Merge pull request #7443 from saurabh6790/read_from_secondary
fix: naming and provision to use same db credentials for secondary
2019-05-16 14:42:48 +05:30
Himanshu Warekar
d075c3b748 fix: link error while deleting linked doc 2019-05-16 13:26:35 +05:30
Himanshu Warekar
a4478afcd5 Merge branch 'develop' of https://github.com/frappe/frappe into comm_ref 2019-05-16 13:03:46 +05:30
Rushabh Mehta
b19f84120c fix(link-preview): show preview only if setup and cleanup style 2019-05-16 10:24:43 +05:30
Nabin Hait
1a787984f4
fix: get month diff between 2 dates (#7474) (#7500) 2019-05-16 10:16:06 +05:30
Rushabh Mehta
84d6116f0b
Merge pull request #7493 from saurabh6790/permission_fix_for_prepared_report
fix: permission fix for prepared report
2019-05-16 09:09:37 +05:30
Himanshu Warekar
b31070d427 fix: delete_doc for timeline references 2019-05-15 18:00:16 +05:30
Deepesh Garg
f01f36b6e5 fix: Don't show no value type fields in options for custom columns (#7497)
* fix: Don't show no value type fields in options for custom columns

* fix: Use filter instead of pushing in list
2019-05-15 15:41:50 +05:30
Himanshu Warekar
77d009747d fix: remove debug parameter 2019-05-15 14:00:25 +05:30