Commit graph

33051 commits

Author SHA1 Message Date
Gavin D'souza
e5db89dd4d fix: commit for postgres db_type before each TestAPI test 2021-06-14 13:44:20 +05:30
Gavin D'souza
3b310afc68 Revert "fix(test): Retry flaky test"
This reverts commit 7a30b2455e.
2021-06-14 13:43:52 +05:30
Gavin D'souza
7a30b2455e fix(test): Retry flaky test
test_update_document test randomly breaks in Postgres CI. The remedy right now is to re-run the builds until the success checks come up. This change retries the specific test 2 more times before failing the build
2021-06-09 13:09:24 +05:30
Leela vadlamudi
8b85ac6cf4
Merge pull request #13441 from PMojito/patch-3
fix:check is_submittable attr exists in meta before accessing
2021-06-08 06:28:26 +05:30
Brian Pond
d8113698d1
bug: db_query.py
The object 'meta' does not always have the attribute 'is_submittable.'
This extra syntax checks for existence first.
2021-06-07 16:15:59 -07:00
gavin
513871d8f9
Merge pull request #13432 from gavindsouza/doc.get_url
chore: Use get_absolute_url to doc.get_url
2021-06-07 17:03:52 +05:30
gavin
928de48d9c
Merge pull request #13434 from gavindsouza/rm-frappe-reqstxt
fix: Remove frappe from boilerplate requirements.txt
2021-06-07 17:01:57 +05:30
Gavin D'souza
8e8490976c fix: Remove frappe from boilerplate requirements.txt
Remove frappe from new app boilerplates to avoid possible supply chain attacks. Don't make pip fetch frappe from PyPI
2021-06-07 14:10:49 +05:30
Gavin D'souza
674c8cf77b chore: Use get_absolute_url to doc.get_url
Avoid re-implementation to reduce interfaces for possible bugs/fixes
2021-06-07 12:09:22 +05:30
Sagar Vora
02765c98c9
fix: ensure Page.add_dropdown_item returns link even if it already exists (#13420) 2021-06-06 13:47:17 +05:30
Leela vadlamudi
ce26ad2aef
Merge pull request #13421 from leela/fix-pop-inbound-mails
fix: inbound mail handling for pop3 protocol
2021-06-04 07:11:01 +05:30
leela
70a1cfb1ab fix: inbound mail handling for pop3 protocol 2021-06-04 06:55:17 +05:30
Gavin D'souza
a3b68cbc2e chore(cov): Drop duplicate pattern in omit list 2021-06-03 21:46:39 +05:30
Suraj Shetty
3b32f542a7
Merge pull request #13417 from gavindsouza/patch-tests 2021-06-03 21:32:59 +05:30
Gavin D'souza
9b164571c3 fix: Update coverage omit files
Apply 0d8aeba3ee for parrallel test runner
2021-06-03 20:51:28 +05:30
Gavin D'souza
a74ffda29b chore: Drop dead code to handle webnotes frappe naming 2021-06-03 18:59:29 +05:30
Gavin D'souza
0d8aeba3ee fix: Update coverage omit files
Files that don't end with .py or .pyo ot .pyc are automatically
skipped by coveragepy. Updated omit list accordingly to remove non
python importable files.

ref: https://coverage.readthedocs.io/en/coverage-5.5/source.html#execution
2021-06-03 18:59:00 +05:30
Gavin D'souza
5aeef088ad fix: Remove reloading statements for non existing dts 2021-06-03 18:47:31 +05:30
Gavin D'souza
95ab1a60b4 ci: Add frappe patch test
* Generated v10 backup archive
    * used old v7 erpnext backup hosted via build.erpnext.com
    * upgraded to v10 frappe + erpnext
    * uninstalled and deleted erpnext related data
* Hosted backup on https://frappeframework.com/files/v10-frappe.sql.gz
2021-06-03 17:38:03 +05:30
Gavin D'souza
0e811e0193 chore: Drop unlinked patches (pre v10) 2021-06-03 13:24:29 +05:30
Gavin D'souza
73f320ee39 chore: Drop patches before added before v10
* This change will not allow direct upgrade from frappe versions older than v10 to v13 and newer
* Removed patch records and execute commands that could've been
  guessed aren't needed by sleuthing and guessing. since 2017 had 3 major releases: v8, v9 and v10 unsure which execute lines are required so kept all that were last updated in that year
2021-06-03 13:21:04 +05:30
mergify[bot]
56b3eb52bf
Merge pull request #13329 from ankush/sgrep_microtemplate
ci(semgrep): false +ve translation on templates
2021-06-03 07:09:05 +00:00
Ankush Menat
327b9669e3
Merge branch 'develop' into sgrep_microtemplate 2021-06-03 12:09:19 +05:30
Suraj Shetty
4feb1c3bf5
Merge pull request #13409 from surajshetty3416/fix-dropdown-content 2021-06-03 11:59:51 +05:30
gavin
f36513d186
Merge pull request #13344 from gavindsouza/drop-py2-code
chore: Dead dependencies and code cleanup
2021-06-03 11:34:34 +05:30
Gavin D'souza
2ad9d202cb Merge branch 'develop' of github.com:frappe/frappe into drop-py2-code 2021-06-03 11:21:55 +05:30
mergify[bot]
099c2f0f0e
Merge pull request #13410 from resilient-tech/fix-customize-form
fix: removed duplicate fields from Customize Form
2021-06-02 12:51:37 +00:00
Ankush Menat
a89ed83c38
Merge branch 'develop' into sgrep_microtemplate 2021-06-02 16:55:29 +05:30
walstanb
a457501422 fix: removed duplicate fields from Customize Form 2021-06-02 16:20:51 +05:30
Nabin Hait
e489c1b594 fix: Added select permission for Module Def doctype to All role 2021-06-02 13:05:24 +05:30
Suraj Shetty
ae85e3c1fd
Merge branch 'develop' into fix-dropdown-content 2021-06-02 12:17:50 +05:30
Suraj Shetty
0e3d8626c4 fix: Remove ellipsis to avoid cliping of useful content 2021-06-02 12:15:58 +05:30
Leela vadlamudi
b40a82a659
Merge pull request #13393 from leela/email-queue
refactor: build Email queue from send mail request
2021-06-01 21:56:35 +05:30
leela
8e3b358b9f refactor: email queue builder is added
replaced queue.send function with Queue builder.
Queue builder builds a queue from sendmail request and sends the mail
if requested to send mail immediately.
2021-06-01 21:39:02 +05:30
Abhishek Balam
464e93a405
fix: Allow only use of Fernet generated key for using custom encryption_key (#13399)
* fix: only allow keys generated by fernet in encrypt()/decrypt()

* fix: sider and semgrep fixes
2021-06-01 21:32:32 +05:30
Abhishek Balam
2da53b652b Merge branch 'develop' of https://github.com/frappe/frappe into develop 2021-06-01 19:42:12 +05:30
Abhishek Balam
f15edd21d1 feat: enable use of custom encryption_key in encrypt()/decrypt() 2021-06-01 19:41:18 +05:30
Suraj Shetty
a0bd52b02b
Merge pull request #13397 from surajshetty3416/fix-awesomeplete-width
fix: Add min-width for dropdown list
2021-06-01 19:04:31 +05:30
Suraj Shetty
39eee3e5c8 fix: Add min-width for awesomplete class 2021-06-01 19:02:01 +05:30
Aditya Hase
1d7b72b75d
Merge pull request #13383 from adityahase/fix-server-script-getattr
fix(server scripts): Restrict access to python's internal attributes
2021-06-01 10:54:43 +05:30
Aditya Hase
c033e0d34d
fix(server scripts): Restrict access to python's internal attributes 2021-05-31 19:24:36 +05:30
Gavin D'souza
8558116c70 Merge branch 'develop' of github.com:frappe/frappe into drop-py2-code 2021-05-31 18:28:28 +05:30
mergify[bot]
e82c9edc12
Merge pull request #13176 from shariquerik/grid-row-deletion-fix
fix: Grid row deletion fix
2021-05-31 11:38:38 +00:00
mergify[bot]
89feae785f
Merge pull request #13301 from resilient-tech/fix-grid-nav
fix: Grid navigation with keyboard on multiple pages
2021-05-31 11:28:52 +00:00
Suraj Shetty
f42f93fa65
Merge branch 'develop' into grid-row-deletion-fix 2021-05-31 16:46:43 +05:30
getsali
0afe774ddb
fix: Select appropriate email template response (#13051)
* Update email_group.py

Fix: Select appropriate email template response, Welcome email template can be either html or rich text

* refactor: Simpify code

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-05-31 16:32:58 +05:30
Fisher Yu
872299b3f3
fix: Translate Strings (#13277) 2021-05-31 16:31:42 +05:30
dependabot[bot]
7759018492
chore(deps): bump ws from 7.4.2 to 7.4.6 (#13369)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-31 16:26:38 +05:30
leela
384d875b62 refactor: smtp session creation cleanup 2021-05-31 15:42:45 +05:30
Faris Ansari
49901ac239
Merge pull request #13373 from adityahase/fix-jinja-globals
fix(jinja): Remove frappe.utils.jinja.get_jenv() from jinja globals
2021-05-31 11:27:41 +05:30