Commit graph

27248 commits

Author SHA1 Message Date
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
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
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
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