Commit graph

27287 commits

Author SHA1 Message Date
Gavin D'souza
2a7a3ec6ee feat: Allow setting folder for where all backups can be set
Passing --backup-path {folder_name} to backup will set where the backup
files will be saved
2020-09-07 18:55:11 +05:30
Gavin D'souza
267315f650 fix: Set correct help for options 2020-09-07 18:53:48 +05:30
Gavin D'souza
2339165d75 fix: Add command options and description 2020-09-01 20:51:13 +05:30
Gavin D'souza
bf6baff2e4 fix: Pass conf path via backup command 2020-09-01 20:16:07 +05:30
Gavin D'souza
4792556cc5 fix: Sider 2020-09-01 16:12:26 +05:30
Gavin D'souza
ec9559bf33 Merge branch 'develop' of github.com:frappe/frappe into compress-files 2020-09-01 16:01:24 +05:30
Gavin D'souza
b5252d11b9 feat: Compress private and public files during backup 2020-09-01 15:58:58 +05:30
mergify[bot]
c8016584b0
Merge pull request #11358 from gavindsouza/consistency-is-key
fix(backups): Allow naming conf file via BackupGenerator
2020-09-01 09:52:52 +00:00
mergify[bot]
6da3036181
Merge pull request #11253 from saurabh6790/email-formatting-patch
fix: email formatting in communication and email queue
2020-09-01 08:46:24 +00:00
Shivam Mishra
8a1220dade
Merge pull request #11394 from frappe/revert-11380-fix-child-table-rendering
Revert "fix: child table rendering with escape_html"
2020-09-01 14:07:46 +05:30
Shivam Mishra
7efe1db628
Revert "fix: child table rendering with escape_html" 2020-09-01 14:07:16 +05:30
Shivam Mishra
9b72b19d86
Merge pull request #11340 from Mangesh-Khairnar/fix-dashboard-cards
fix: group dashboard cards based on label
2020-09-01 13:32:01 +05:30
Rushabh Mehta
ed1514c58b
Merge pull request #11393 from rmehta/safe-exec-flags
fix(minor): don't give flags to safe_exec
2020-09-01 12:50:59 +05:30
Rushabh Mehta
f772aee211 fix(minor): don't allow access to global flags 2020-09-01 12:48:26 +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
Gavin D'souza
afe5959963 fix: Unbreaking change for kwarg backup_path_conf 2020-08-31 14:30:33 +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
Faris Ansari
76292f14e9
Update frappe-framework-logo.svg 2020-08-26 12:28:05 +05:30
Gavin D'souza
ae8201cc1c fix: Just copy the contents of the files instead of parsing it 2020-08-26 12:08:51 +05:30
Gavin D'souza
cbaa795c20 fix(backups): Allow naming conf file via BackupGenerator 2020-08-26 11:57:03 +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