Commit graph

1913 commits

Author SHA1 Message Date
Rucha Mahabal
175c2fdb65
Merge branch 'develop' into fix-duration-control-import-export 2020-09-23 09:39:32 +05:30
Rushabh Mehta
70baf49c6e fix(data): dont try casting if doctype is missing 2020-09-21 10:28:11 +05:30
Rushabh Mehta
334ae82e52 fix(naming): added multiple rules for naming series 2020-09-21 10:28:11 +05:30
Faris Ansari
bbdbc0d947 Merge remote-tracking branch 'upstream/develop' into aaaa-website-enhancements-for-redesign 2020-09-18 16:17:15 +05:30
Rucha Mahabal
29fc0a8c0c fix: validate duration value while converting to seconds 2020-09-17 11:47:39 +05:30
Gavin D'souza
bbdb05378b fix: Deprecate site_config_backup_path in favour of backup_path_conf 2020-09-15 17:30:26 +05:30
Afshan
5377d65cad fix: removed print statements 2020-09-15 16:40:24 +05:30
Afshan
772153da11 fix: setting "self.setting site_config_backup_path" 2020-09-15 16:20:58 +05:30
gavin
f710ad095f
Merge pull request #11436 from gavindsouza/build-assets
feat: Ship built assets
2020-09-15 13:01:38 +05:30
Faris Ansari
8f0f17eb7e fix: Render web blocks using web_template.render
- web_block object need not be a WebPageBlock instance
2020-09-14 15:23:14 +00:00
Faris Ansari
627aff4bb8 fix: Handle jpe files in image_to_base64 2020-09-14 15:21:22 +00:00
Saurabh
ae31f08f42
feat(user): Add hourly limit for password reset requests (#11371)
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-09-14 12:19:06 +05:30
mergify[bot]
ebcc23591a
Merge pull request #11469 from adityahase/fix-pdf
fix(pdf): Restrict cookies to the host domain
2020-09-13 03:55:16 +00:00
Faris Ansari
7a31983c90 fix: Succinct syntax for rendering web templates 2020-09-11 19:49:20 +05:30
Faris Ansari
cc9fdd690a fix: Check if file exists before generating base64 2020-09-11 19:22:34 +05:30
Faris Ansari
4a58f2224c fix: Ignore SVG images 2020-09-10 15:33:57 +05:30
Aditya Hase
3c9f265091
fix(pdf): Restrict cookies to the host domain
Use wkhtmltopdf's cookie-jar options to set domain
Reference: 7952b0f3e7/src/lib/multipageloader.cc (L532-L536)
Cookie format Reference: https://doc.qt.io/qt-5/qnetworkcookie.html#parseCookies

Also, werkzeug 0.16.x shows port in the host attribute.
https://werkzeug.palletsprojects.com/en/0.16.x/wrappers/#werkzeug.wrappers.BaseRequest.host
2020-09-09 20:58:42 +05:30
Aditya Hase
8feba5fa9b
fix(pdf): Cleanup temporary files after pdf generation
This was removed in https://github.com/frappe/frappe/pull/7358
2020-09-09 20:52:45 +05:30
Faris Ansari
ee7d119546 fix: Escape invalid email in throw 2020-09-09 14:03:56 +05:30
Gavin D'souza
a7e0e96e49 chore: Drop dead code 2020-09-07 15:16:00 +05:30
Aditya Hase
3349c9f942
fix(minor): Prevent path traversal 2020-09-04 16:31:10 +05:30
Rushabh Mehta
8c8f7313f4
fix(minor): make utils explicit in safe_globals (#11408)
* fix(minor): make utils explicit in safe_globals

* fix(minor): import subprocess

* fix(minor): fix globals in safe_eval;

* fix(minor): import subprocess

* fix(minor): add test

* fix(minor): webhook.py

* fix(minor): document_type_mapping.py
2020-09-03 14:26:01 +05:30
Faris Ansari
58a819c305 fix: import 2020-09-03 13:59:20 +05:30
Faris Ansari
8c905437e6 fix: Add template validation in web_blocks 2020-09-03 13:58:22 +05:30
Rushabh Mehta
38e024ebbb
Merge pull request #11306 from rmehta/system-console
feat(system console): Added a System Console to help in debugging and Console Log
2020-09-03 11:12:23 +05:30
Rushabh Mehta
9eb9030381 fix(minor): move get_source_value to data_migration_mapper 2020-09-03 08:42:42 +05:30
Rucha Mahabal
c0b4532ea5 fix: Handle duration fieldtype for Data Import 2020-09-02 15:58:08 +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
Rushabh Mehta
c53813950f fix(minor): Server Script can return values in frappe.flags 2020-09-01 12:59:22 +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]
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]
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
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
Rushabh Mehta
079a0e4af0 wip: refactor System Console 2020-08-31 11:29:18 +05:30
Rushabh Mehta
1b73602a17 feat(system console): Added a System Console to help in debugging and Console Log 2020-08-31 11:29:18 +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]
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
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
KanchanChauhan
613b91735e
fix: Image shown as broken in comment if private 2020-08-21 17:58:37 +05:30
Rushabh Mehta
275a70e9d0 feat(minor): allow frappe.db.sql for read in server script 2020-08-20 18:33:29 +05:30
Shivam Mishra
c2500f0593
Merge branch 'develop' into allow-get-print 2020-08-20 08:41:52 +00:00
Gavin D'souza
cdc521ee04 Merge branch 'develop' of github.com:frappe/frappe into safe-take-backups 2020-08-19 15:17:10 +05:30
Gavin D'souza
022b6e356b fix: Create backups folder if doesn't exist
Backups fail silently if the default `backups` folder doesn't exist
under private
2020-08-19 15:11:39 +05:30
Suraj Shetty
e929c9a053
Merge branch 'develop' into redirect_url 2020-08-17 21:18:06 +05:30
Rushabh Mehta
137df8290b fix(sider): fix sider issues 2020-08-17 09:41:54 +05:30
Rushabh Mehta
b0b5a56566 fix(minor): in install, load doctype_action and doctype_link before doctype 2020-08-17 09:41:54 +05:30
Rushabh Mehta
77018fc9d6 fix(cleanup): cleanup layout of doctype, user, role, add home_page to Portal Settings, Role 2020-08-17 09:41:54 +05:30