Commit graph

27190 commits

Author SHA1 Message Date
mergify[bot]
6032d91c1d
Merge pull request #11122 from netchampfaris/attach-files-to-doc-on-update
fix: Attach files to the document if they are set programmatically
2020-08-24 06:22:08 +00:00
Suraj Shetty
0263d3fae1
Merge branch 'develop' into attach-files-to-doc-on-update 2020-08-24 10:43:09 +05:30
mergify[bot]
ce642dbffd
Merge pull request #10820 from ronelvcabrera/resize-image-editor
feat(controls/text_editor): resize image for markdown editor
2020-08-24 05:12:26 +00:00
Suraj Shetty
fba109a7ec
Merge branch 'develop' into resize-image-editor 2020-08-24 09:33:11 +05:30
mergify[bot]
a921988625
Merge pull request #11322 from deepeshgarg007/navbar_item_fix
fix: Duplicate Toggle width button in Navbar Settings
2020-08-24 03:35:20 +00:00
Suraj Shetty
4482094089
Merge branch 'develop' into navbar_item_fix 2020-08-23 17:35:50 +05:30
Rushabh Mehta
b82aeee80a
Merge pull request #11338 from rmehta/client-get-value-single
fix(minor): client.get_value fix for single
2020-08-23 13:43:13 +05:30
Rushabh Mehta
07f5484ef2 fix(test): attempt to fix recorder test 2020-08-23 13:19:38 +05:30
Rushabh Mehta
7895ddf865 fix(minor): client.get_value fix for single 2020-08-22 21:18:38 +05:30
Rushabh Mehta
2b80e710bc fix(minor): client.get_value fix for single 2020-08-22 21:15:45 +05:30
mergify[bot]
2d074541f8
Merge pull request #11332 from Mangesh-Khairnar/add-dashbord-changes
fix: Add validation for twilio sid and token
2020-08-21 15:32:46 +00:00
mergify[bot]
03b2ca9697
Merge pull request #11277 from mujeerhashmi/fix_numcard
fix: Numcard shows a incorrect number after >1.0e+5
2020-08-21 13:39:22 +00:00
Saurabh
fa1e8aef02
fix: upload file backup on S3 (#11326)
1. if file backup is scheduled, and system not have file backup tar t…hen prepare files bakcup before uploading it to s3

2. fix regex for public files
2020-08-21 15:58:32 +05:30
Rushabh Mehta
4fcf314e60
Merge pull request #11334 from rmehta/fix-client-get-value
fix(client.py): fix get_value for name
2020-08-21 15:15:58 +05:30
Rushabh Mehta
ffa785bb47 fix(client.py): fix get_value for name 2020-08-21 15:14:59 +05:30
Faris Ansari
891456e1e6
Merge branch 'develop' into attach-files-to-doc-on-update 2020-08-21 13:33:41 +05:30
Faris Ansari
85cac9122e test: For file attachment on update 2020-08-21 13:31:07 +05:30
Faris Ansari
eb87e6b773 fix: Set fieldname when attaching to field 2020-08-21 13:30:20 +05:30
Suraj Shetty
1a50b594dd
fix: Re-run reload_countries_and_currencies patch (#11327)
- to create newly introduced currency on existing sites
2020-08-20 18:45:18 +05:30
mergify[bot]
5a74047ca3
Merge pull request #11212 from saurabh6790/email-append-fix
fix: handle encoding exceptions while appending email to sent email f…
2020-08-20 09:34:34 +00:00
Suraj Shetty
b39bc162bd
Merge branch 'develop' into email-append-fix 2020-08-20 14:38:59 +05:30
Shivam Mishra
44ed71fd76
Merge pull request #11299 from scmmishra/fix-query-report-route
fix: set is_query_report for custom reports
2020-08-20 08:43:21 +00:00
Deepesh Garg
c2f3b11848 fix: Typo 2020-08-20 11:48:45 +05:30
Deepesh Garg
f4bdf61a67 fix: Duplicate Toggle width button in Navbar Settings 2020-08-20 11:42:12 +05:30
Rushabh Mehta
e504eeb5fb
Merge pull request #11287 from rmehta/report-cleanup
feat(reports): Add columns and filters via configuration (doctype)
2020-08-20 09:30:16 +05:30
Mangesh-Khairnar
0631055369 feat: add validation for twilio credentials 2020-08-19 22:32:45 +05:30
mergify[bot]
c5b46a182e
Merge pull request #11315 from alyf-de/fix_website_generator
fix: website generator
2020-08-19 10:24:17 +00:00
mergify[bot]
4ebfff8e07
Merge pull request #11313 from rmehta/fix-api-get-value
fix(minor): use get_list in client.get_value for tighter checks
2020-08-19 10:07:22 +00:00
barredterra
c72b68d0fb fix: remove obsolete argument 2020-08-19 11:53:13 +02:00
Rushabh Mehta
89717b0060 fix(tests): test_insert_many 2020-08-19 15:03:17 +05:30
Rushabh Mehta
a4dfac507b fix(minor): use get_list in client.get_value for tighter checks 2020-08-19 14:57:59 +05:30
Mangesh-Khairnar
b83e0b9abd
fix: add an explicit check for schedule sending (#11291) 2020-08-18 17:54:27 +05:30
Rushabh Mehta
9786485f70 fix(minor): report.py: adapt recent group_by changes 2020-08-18 17:35:00 +05:30
Rushabh Mehta
6100169233 fix(minor): report.py: adapt recent group_by changes 2020-08-18 17:16:31 +05:30
Rushabh Mehta
5aea22eb33 fix(minor): report.py: adapt recent group_by changes 2020-08-18 17:05:19 +05:30
Shivam Mishra
a15e54aec4 fix: set is_query_report for custom reports 2020-08-18 15:23:21 +05:30
Rushabh Mehta
6bd38fd00a fix(minor): report.py 2020-08-18 14:52:37 +05:30
Rushabh Mehta
e3f686276e fix(minor): pass columns to build_data_dict in report.py 2020-08-18 14:52:37 +05:30
Rushabh Mehta
b6cd4330f2 feat(reports): add columns and filters via configuration 2020-08-18 14:52:37 +05:30
Prssanna Desai
1ca8800162
Merge branch 'develop' into fix_numcard 2020-08-18 12:42:34 +05:30
mergify[bot]
11b54c304d
Merge pull request #10959 from prssanna/group-by-email-report
fix: auto email report for group by reports
2020-08-18 06:03:59 +00:00
mergify[bot]
7f14c29911
Merge pull request #9751 from prssanna/prepared-report-button
feat(Prepared Report): System Setting to automatically delete old prepared reports
2020-08-18 05:50:39 +00:00
Rushabh Mehta
8e7ac836b8
Merge pull request #11290 from rmehta/multiple-set-value
fix(minor): frappe.db.set_value to allow multiple values
2020-08-18 10:46:17 +05:30
Rushabh Mehta
0192bcf45f fix(minor): frappe.db.set_value to allow multiple values 2020-08-17 22:19:44 +05:30
mergify[bot]
aeeb3a2eff
Merge pull request #11118 from deepeshgarg007/redirect_url
fix: OAUTH redirect fixes
2020-08-17 16:01:03 +00:00
Suraj Shetty
e929c9a053
Merge branch 'develop' into redirect_url 2020-08-17 21:18:06 +05:30
mergify[bot]
ab642fe120
Merge pull request #11288 from netchampfaris/remove-form-scroll-to
fix: Remove scroll to top in form on save
2020-08-17 13:19:53 +00:00
Faris Ansari
53e1701b42 fix: Remove scroll to top in form on save 2020-08-17 17:59:39 +05:30
Rushabh Mehta
445061f59d
Merge pull request #11241 from netchampfaris/invalid-sidebar-json
fix: Show message for invalid _sidebar.json
2020-08-17 17:47:42 +05:30
Rushabh Mehta
1cf071deca
Merge pull request #11167 from gwhitney/doctype_shortcut_options
feat(Desktop): additional options for Desk Shortcuts to DocTypes
2020-08-17 17:46:31 +05:30