Commit graph

27218 commits

Author SHA1 Message Date
Faris Ansari
8143f55166 fix: Bundle minified version of vue in libs.min.js 2020-08-24 22:22:18 +05:30
mergify[bot]
0a7d93a1de
Merge pull request #11301 from scmmishra/fix-custom-columns
fix: handle both list and dict results
2020-08-24 14:25:12 +00:00
Prssanna Desai
d4ae883007
fix: remove print statement 2020-08-24 19:40:57 +05:30
Rushabh Mehta
f2fe49b5e1
Merge pull request #11328 from rmehta/safe-exec-sql
feat(server script): Allow frappe.db.sql for read
2020-08-24 17:46:09 +05:30
Saurabh
534cf5c512
fix: Handle empty conditions in s3 backup (#11258) 2020-08-24 16:38:51 +05:30
Shivam Mishra
9ba45f0360 fix: handle tuple and list 2020-08-24 13:59:28 +05:30
mergify[bot]
03fedd0994
Merge pull request #11304 from scmmishra/fix-perm-duplication-issue
fix: DocPerm duplication
2020-08-24 08:17:41 +00:00
mergify[bot]
552ca066f2
Merge pull request #11260 from scmmishra/allow-get-print
feat: allow get_print and attach print in server scripts
2020-08-24 08:12:41 +00:00
Shivam Mishra
42274039aa Merge branch 'develop' of https://github.com/frappe/frappe into fix-custom-columns 2020-08-24 13:22:57 +05:30
Shivam Mishra
96a3d35d6c fix: add custom_column_names 2020-08-24 13:22:11 +05:30
Shivam Mishra
246938f779
fix: use list
Co-authored-by: Rohan <Alchez@users.noreply.github.com>
2020-08-24 07:47:32 +00:00
Shivam Mishra
65165b6be6 fix: translation syntax 2020-08-24 13:09:20 +05:30
mergify[bot]
0d3610213c
Merge pull request #11317 from revant/fix-browserlite-caniuse-lite-upgrade
fix: browserslist caniuse-lite is outdated
2020-08-24 07:18:15 +00:00
Suraj Shetty
80565dad6a
Merge branch 'develop' into fix-browserlite-caniuse-lite-upgrade 2020-08-24 12:32:59 +05:30
mergify[bot]
60d9667a8e
Merge pull request #11223 from gwhitney/ragged_child_tables
fix(Data Import): Allow parent with differing child table lengths
2020-08-24 06:45:28 +00:00
Saurabh
df7a575295
fix: Sanitize 2FA response (#11263)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-24 11:55:28 +05:30
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
253d23cc42
Merge branch 'develop' into fix-browserlite-caniuse-lite-upgrade 2020-08-24 11:35:24 +05:30
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
Rushabh Mehta
275a70e9d0 feat(minor): allow frappe.db.sql for read in server script 2020-08-20 18:33:29 +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
ecf1944ed9
Merge branch 'develop' into fix-custom-columns 2020-08-20 08:59:15 +00:00
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
Shivam Mishra
c2500f0593
Merge branch 'develop' into allow-get-print 2020-08-20 08:41:52 +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
Suraj Shetty
1cfda34d8e
Merge branch 'develop' into fix-browserlite-caniuse-lite-upgrade 2020-08-20 10:58:27 +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
Revant Nandgaonkar
1545d5fc9f fix: browserslist caniuse-lite is outdated 2020-08-19 20:13:35 +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