Anupam K
|
aecb77ce9b
|
fix: removing condition
|
2020-09-02 12:19:34 +05:30 |
|
Anupam K
|
431596cccf
|
fix: conflict resolved
|
2020-09-01 12:46:40 +05:30 |
|
Anupam K
|
8f819da4ff
|
fix: failed test case
|
2020-09-01 12:43:58 +05:30 |
|
mergify[bot]
|
64fbad9103
|
Merge pull request #11342 from Mangesh-Khairnar/enable-disable-custom-script
feat: add option to disable custom script
|
2020-09-01 06:11:41 +00:00 |
|
mergify[bot]
|
204c5c8424
|
Merge pull request #11337 from frappe/image-in-comment-fix
fix: Image shown as broken in comment
|
2020-08-31 17:20:36 +00:00 |
|
mergify[bot]
|
c12eb3c093
|
Merge pull request #11386 from marination/query-report-status
feat: Show Status Section in Query Report
|
2020-08-31 15:02:07 +00:00 |
|
Marica
|
04dbb4c261
|
fix: Spacing
|
2020-08-31 20:16:02 +05:30 |
|
marination
|
1eb1cba666
|
feat: Show Status Section in Query Report
|
2020-08-31 19:54:19 +05:30 |
|
Shivam Mishra
|
1d39b699cc
|
Merge pull request #11380 from scmmishra/fix-child-table-rendering
|
2020-08-31 17:16:34 +05:30 |
|
Rushabh Mehta
|
6e3d3c5b74
|
fix(minor): allow tags in markdown
|
2020-08-31 16:56:41 +05:30 |
|
mergify[bot]
|
16e3cb9f9e
|
Merge pull request #11314 from gavindsouza/safe-take-backups
fix: Create backups folder if doesn't exist
|
2020-08-31 10:48:24 +00:00 |
|
mergify[bot]
|
a9ae71ec15
|
Merge pull request #11376 from michellealva/print-format-fix
fix: Typo in Print Format Help
|
2020-08-31 10:12:55 +00:00 |
|
gavin
|
e860ac1108
|
fix: Don't raise FileExistsError if directory already exists
Co-authored-by: Aditya Hase <aditya@adityahase.com>
|
2020-08-31 15:14:20 +05:30 |
|
Anupam K
|
c3c2edd660
|
Merge branch 'newsletter-fix' of https://github.com/anupamvs/frappe into newsletter-fix
|
2020-08-31 11:56:31 +05:30 |
|
Anupam K
|
dcce45b558
|
fix: test case
|
2020-08-31 11:54:56 +05:30 |
|
mergify[bot]
|
e62e895c6e
|
Merge pull request #11316 from gavindsouza/connect-db
fix: Re-connect to database in case connection is closed
|
2020-08-31 06:19:45 +00:00 |
|
Shivam Mishra
|
a5959df752
|
fix: don't override column (#11374)
|
2020-08-31 11:44:37 +05:30 |
|
Shivam Mishra
|
11a8f759f1
|
chore: format functions
|
2020-08-31 11:32:18 +05:30 |
|
Shivam Mishra
|
a360d0e806
|
feat: escape html before rendering
|
2020-08-31 11:31:13 +05:30 |
|
michellealva
|
9605e828b1
|
fix: Change link text
|
2020-08-29 11:45:53 +05:30 |
|
michellealva
|
6067751e5f
|
fix: Typo in Print Format Help
|
2020-08-29 11:39:46 +05:30 |
|
Wolfram Schmidt
|
3c57041f74
|
fix(User): merge sections "Email Settings" and "Email Inbox" into "Email"
|
2020-08-28 18:06:43 +02:00 |
|
mergify[bot]
|
491a26f6be
|
Merge pull request #11367 from gavindsouza/be-safer
fix: Safer is_downgrade checks
|
2020-08-28 16:00:47 +00:00 |
|
mergify[bot]
|
e252312e02
|
Merge pull request #11372 from ruchamahabal/fix-link-preview
fix: skip table fields in link preview
|
2020-08-28 12:18:57 +00:00 |
|
Nabin Hait
|
1637c787e0
|
Reload module def
|
2020-08-28 14:51:04 +05:30 |
|
Rucha Mahabal
|
cff99e8158
|
fix: show 'In Preview' option only if fieldtype is not table field
|
2020-08-28 11:44:41 +05:30 |
|
Rucha Mahabal
|
458087b3ea
|
fix: skip table fields in link preview
|
2020-08-28 11:31:51 +05:30 |
|
Gavin D'souza
|
a4217f2e38
|
fix: Safer is_downgrade checks
|
2020-08-27 15:28:47 +05:30 |
|
mergify[bot]
|
bc320acdab
|
Merge pull request #11363 from AfshanKhan/fix-contact-query
fix: contact not showing in form
|
2020-08-27 06:23:08 +00:00 |
|
Afshan
|
ce161b37f8
|
fix: contact not showing in form
|
2020-08-26 22:32:46 +05:30 |
|
mergify[bot]
|
78a9e0ca78
|
Merge pull request #11360 from gavindsouza/docs-update
chore: frappe.io => frappeframework.com
|
2020-08-26 12:27:50 +00:00 |
|
Gavin D'souza
|
f8dcc60bb6
|
chore: frappe.io => frappeframework.com
|
2020-08-26 17:32:58 +05:30 |
|
Prssanna Desai
|
f5871a8d76
|
Merge branch 'develop' into newsletter-fix
|
2020-08-26 16:45:08 +05:30 |
|
Faris Ansari
|
76292f14e9
|
Update frappe-framework-logo.svg
|
2020-08-26 12:28:05 +05:30 |
|
mergify[bot]
|
bd372a9cd1
|
Merge pull request #11353 from scmmishra/fix-web-form-parent-evaluation
refactor: use this.doc if this.frm is not available
|
2020-08-25 15:13:23 +00:00 |
|
Shivam Mishra
|
5a6bacf43f
|
refactor: use this.doc if this.frm is not available
|
2020-08-25 18:31:54 +05:30 |
|
mergify[bot]
|
c8776e4994
|
Merge pull request #11345 from frappe/snyk-fix-ccdd0a50ae9fe6dbedb87ca2dfde98c3
fix(snyk): Fix for 1 vulnerabilities
|
2020-08-25 12:41:24 +00:00 |
|
Gavin D'souza
|
8b35a5f5bf
|
fix: Update yarn.lock
|
2020-08-25 15:57:40 +05:30 |
|
Rushabh Mehta
|
938b87ee46
|
fix(minor): rename field, ignore for single doctype
|
2020-08-25 15:44:08 +05:30 |
|
Rushabh Mehta
|
4fe9eb7b13
|
fix(patch): reload report
|
2020-08-25 15:32:00 +05:30 |
|
Rushabh Mehta
|
394088008a
|
fix(minor): rename_field - show message before ignoring
|
2020-08-25 15:20:12 +05:30 |
|
Rushabh Mehta
|
58e9c074c9
|
fix(rename_field): skip if old fieldname does not exist
|
2020-08-25 14:43:50 +05:30 |
|
Rushabh Mehta
|
5d2a1ea47a
|
fix(minor): handle importing of doctype when links are missing
|
2020-08-25 14:29:08 +05:30 |
|
Rushabh Mehta
|
ebc961cf84
|
fix(debug): print error before it breaks
|
2020-08-25 14:12:30 +05:30 |
|
Rushabh Mehta
|
737c033803
|
fix(minor): fix patch that breaks in erpnext
|
2020-08-25 13:56:57 +05:30 |
|
mergify[bot]
|
7ce4013068
|
fix: if db_type is not defined then set default to 'mariadb' (bp #11346) (#11349)
(cherry picked from commit 927cd03341c33ffb82e5db373066a7ba239c1491)
Co-authored-by: Saurabh <saurabh@erpnext.com>
|
2020-08-25 13:05:49 +05:30 |
|
mergify[bot]
|
31f8f6e26a
|
Merge pull request #11344 from Alchez/fix-preload-url
fix: preload URLs breaking for external requests
|
2020-08-25 04:58:57 +00:00 |
|
snyk-bot
|
c12668ecbf
|
fix: package.json, yarn.lock & .snyk to reduce vulnerabilities
The following vulnerabilities are fixed with a Snyk patch:
- https://snyk.io/vuln/SNYK-JS-LODASH-567746
|
2020-08-24 23:07:36 +00:00 |
|
Rohan
|
1c5cff7746
|
fix: preload URLs breaking for external requests
|
2020-08-24 23:45:12 +05:30 |
|
Mangesh-Khairnar
|
1c56732de5
|
feat: add option to disable custom script
|
2020-08-24 22:07:41 +05:30 |
|