vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
33511 commits 1 branch 0 tags 587 MiB
Commit graph

2301 commits

Author SHA1 Message Date
mergify[bot]
6128123eed
Merge pull request #13687 from bhavesh95863/patch-6 
fix: Duplicate if condition removed
 2021-07-13 15:22:34 +00:00
gavin
59f4b4d754
Merge pull request #13554 from gavindsouza/drop-data-import-legacy 
chore: Drop Data Import Legacy
 2021-07-13 20:39:00 +05:30
Sagar Vora
b23dd71116 fix: escape quotes before declaring variables when making a new app 2021-07-13 17:56:47 +05:30
Bhavesh Maheshwari
68930a022a
fix: Duplicate if condition remove 2021-07-13 15:55:24 +05:30
Gavin D'souza
2aa2586a0c fix: Drop deprecated validate_csv_import_file def 2021-07-13 12:04:18 +05:30
Faris Ansari
fd05cf068e fix: Add frappe.rename_doc to Server Scripts 2021-06-22 18:14:15 +05:30
Suraj Shetty
70f5df6a05 chore: debug 2021-06-17 18:50:21 +05:30
Suraj Shetty
7dfced5047 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-17 09:48:50 +05:30
Suraj Shetty
3cbc7dfb92 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-14 12:24:50 +05:30
Gavin D'souza
c489846547 Merge branch 'develop' into unnecessary_comprehensions 2021-06-11 19:30:23 +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
Suraj Shetty
eba4c24503
Merge branch 'develop' into refactor-website 2021-06-04 11:15:12 +05:30
Ankush Menat
327b9669e3
Merge branch 'develop' into sgrep_microtemplate 2021-06-03 12:09:19 +05:30
Suraj Shetty
2d8c6c1710 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-03 11:43:28 +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
Suraj Shetty
62eda3fd6f Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-06-03 09:47:59 +05:30
Ankush Menat
a89ed83c38
Merge branch 'develop' into sgrep_microtemplate 2021-06-02 16:55:29 +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
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
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
Aditya Hase
980f224bba
Merge pull request #13253 from rmehta/safe-json 2021-05-31 10:42:56 +05:30
Aditya Hase
8aff94d514
fix(jinja): Remove frappe.utils.jinja.get_jenv() from jinja globals 2021-05-31 10:37:32 +05:30
Gavin D'souza
165ff8e1bf chore: Update PyJWT dependency 
* Update pinned dep fromm 1.7.1 to 2.0.1
* Updated usages as per changelog

ref: https://python.libhunt.com/pyjwt-changelog
 2021-05-29 17:22:30 +05:30
Gavin D'souza
4e7526066f Merge branch 'develop' into drop-py2-code 2021-05-28 10:51:39 +05:30
Gavin D'souza
72c239342e chore: Remove temporary warnings filter 2021-05-27 16:40:02 +05:30
Suraj Shetty
6c05401495 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-05-27 14:28:33 +05:30
Gavin D'souza
e2ee75e3cb fix: Translate strings passed in frappe.throw 
* Remove trailing whitespaces in translatable strings
* Sort imports appropriately
 2021-05-27 13:47:21 +05:30
Gavin D'souza
793b5638d3 style: Fix E201, E202, E401, E701 
reported by sider: https://sider.review/gh/repos/1864194/pulls/13344?statuses#issues
 2021-05-27 12:48:01 +05:30
Faris Ansari
23406d031a fix: Store assets.json directly in assets folder 
assets.json stores assets of all apps, so doesn't make sense to put it in frappe folder
 2021-05-27 11:50:56 +05:30
Gavin D'souza
88ef41bc58 fix(typo): Let's try executing bound method instead 2021-05-26 19:49:22 +05:30
Gavin D'souza
f6b215938a fix: Use raw string to avoid invalid sequence errors 
Escaped when proven easier
 2021-05-26 19:30:08 +05:30
Gavin D'souza
3adb84eb8d chore: Drop watchdog dependency 
Watchdog isn't used by Frappe, and there wasn't any mechanism to access
it directly either. By default, bench serve (or start) uses
Werkzeug's watchdogreloader
 2021-05-26 17:04:28 +05:30
Gavin D'souza
bd6fcddd04 chore: Drop unreachable code 2021-05-26 16:41:32 +05:30
Gavin D'souza
feea2f3c44 fix: Use raw string to avoid invalid escape sequence errors 2021-05-26 16:32:41 +05:30
Gavin D'souza
1e9b0cf386 fix: Use dict.items instead of six.iteritems 2021-05-26 16:02:27 +05:30
Gavin D'souza
1acb2ddd2f fix: Use context managers to stream data 
While executing git commands in the shell via Frappe processes, use
context managers to ensure files get closed after usage. This fixes the
ResourceWarning errors due to unclosed files.
 2021-05-26 15:54:36 +05:30
Gavin D'souza
d236a93169 chore: Replacing and updating bleach source list 
* The library bleach-whitelist was deprecated and renamed to
bleach-allowlist.
* Updated the usages and requirements for the same.
 2021-05-26 15:45:34 +05:30
Gavin D'souza
e407b78506 chore: Drop dead and deprecated code 
* Remove six for PY2 compatability since our dependencies are not, PY2
  is legacy.
* Removed usages of utils from future/past libraries since they are
  deprecated. This includes 'from __future__ ...' and 'from past...'
  statements.
* Removed compatibility imports for PY2, switched from six imports to
  standard library imports.
* Removed utils code blocks that handle operations depending on PY2/3
  versions.
* Removed 'from __future__ ...' lines from templates/code generators
* Used PY3 syntaxes in place of PY2 compatible blocks. eg: metaclass
 2021-05-26 15:31:29 +05:30
Suraj Shetty
52353d1967 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-05-26 10:21:56 +05:30
mergify[bot]
8ebc251394
Merge pull request #13065 from gavindsouza/api-updates 
fix: Evaluate boolean values better via /api/resource/<doctype>
 2021-05-26 04:41:55 +00:00
Suraj Shetty
96de436219 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-05-25 16:18:41 +05:30
Ankush Menat
faa347461d
chore: fix all findings flaged by ux rule 2021-05-25 13:04:20 +05:30
Kenneth Sequeira
6632b5876a
feat(minor): add number format parameter in fmt_money (#13255) 
* feat: add number format parameter in fmt_money

* review fix: move new parameter at the end

Co-authored-by: Kenneth Sequeira <kenneth@Kenneths-MacBook-Air.local>
 2021-05-24 16:14:56 +00:00
Suraj Shetty
aa6f8b9734 Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website 2021-05-24 11:24:29 +05:30