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
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
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
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
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
Faris Ansari
16ff2de946
fix: Make bundled asset URL absolute always
2021-05-20 20:22:14 +05:30
Gavin D'souza
10fe05da29
Merge branch 'develop' into api-updates
2021-05-20 17:11:43 +05:30
Gavin D'souza
33ba6494f8
Merge branch 'develop' into deprecation-warnings
2021-05-19 13:18:13 +05:30
Gavin D'souza
8cc6804850
fix: Show deprecation warnings only if DEV_SERVER is set
...
This will show warnings in bench start commands by default as this
envvar is set.
2021-05-19 13:16:16 +05:30
Gavin D'souza
2dde3a9b01
fix: Hide all warnings in frappe commands
...
Hide all warnings when triggered via frappe.utils.bench_helper
2021-05-19 12:47:57 +05:30
Rushabh Mehta
2b8aaa5375
fix(minor): expose limited methods of json module
2021-05-18 21:12:45 +05:30
Faris Ansari
792dd70730
fix: Handle AttributeError
2021-05-18 14:05:56 +05:30
Faris Ansari
f234761755
fix: Translate error message
2021-05-18 13:45:15 +05:30
Faris Ansari
dc04fe9ed6
fix: Handle decode error when getting value from cache
2021-05-18 13:40:47 +05:30
Suraj Shetty
a54411750f
Merge branch 'develop' into esbuild
2021-05-17 22:10:46 +05:30
Suraj Shetty
8c8291ae38
fix: Delete duplicate validate_url method
2021-05-17 22:09:19 +05:30
Nabin Hait
75ea09f9df
fix: Resolved conflict issue
2021-05-17 11:35:48 +05:30
Nabin Hait
6d7a852351
Merge branch 'version-13' into develop
2021-05-17 11:21:46 +05:30
Faris Ansari
f8ca990a83
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-16 11:26:43 +05:30
Joseph Marie Alba
62d81b7610
Python 3 issue with re
...
Python 3 interprets string literals as Unicode strings, and therefore \s is treated as an escaped Unicode character.
Declare RegEx pattern as a raw string instead by prepending r
2021-05-16 05:59:47 +08:00
Gavin D'souza
e0be2cc535
Merge branch 'develop' into misc-fixes-py3-1
2021-05-12 21:02:26 +05:30
Suraj Shetty
4d61098d67
Merge pull request #13165 from surajshetty3416/python-distributed-testing
2021-05-12 18:08:46 +05:30
Suraj Shetty
0f94407e6d
Merge pull request #12969 from surajshetty3416/fix-sqli-report-get
2021-05-12 12:57:17 +05:30
Faris Ansari
d4b0be789f
Merge branch 'develop' into esbuild
2021-05-11 17:33:31 +05:30
Gavin D'souza
e7d089d1cb
Merge branch 'develop' of github.com:frappe/frappe into misc-fixes-py3-1
2021-05-11 13:03:56 +05:30
Suraj Shetty
be9b18191b
refactor: Resolve deprecation warnings
2021-05-11 09:50:58 +05:30
Suraj Shetty
3c4306c87a
refactor: Fix regex to avoid deprecation warnings
2021-05-10 09:18:50 +05:30
Gavin D'souza
b3af9f0c72
fix: Use raw strings for strings with \
...
Avoid DeprecationWarning which will turn into SyntaxError in later
Python versions
2021-05-07 17:59:20 +05:30
Leela vadlamudi
9d3b993b71
Merge pull request #13144 from ankush/test_create_app
...
test: add unittest for creating new app using boilerplate
2021-05-07 13:39:24 +05:30
Gavin D'souza
d43046a4cb
fix: any takes an iterable not multi args
2021-05-07 13:24:48 +05:30
Faris Ansari
add84065ad
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 12:55:04 +05:30
Gavin D'souza
983e29d666
chore(cli): Add pending deprecation warning
...
* Add PDW for --as-dict in command set-config
* Move all top level imports inside each util to optimize imports for
CLI
* Set always show filter for DeprecationWarning, PendingDeprecationWarning via frappe module
(cherry picked from commit bf9fcb3https://github.com/frappe/frappe/pull/13125
2021-05-07 12:30:15 +05:30
Gavin D'souza
855efcfd59
style: Trim whitespace and remove unnecessary parenthesis
2021-05-07 12:15:32 +05:30
Gavin D'souza
1752e5b0e5
feat(cli): Show progress bar for website search index building
2021-05-07 12:14:00 +05:30
leela
72ca7e9753
refactor: remove six dependency
2021-05-07 07:42:04 +05:30
Ankush Menat
c48a8e933f
fix: remove six.moves.input and use builtin.input
...
reason: py2 support no longer required and six makes mocking/testing
complicated.
2021-05-06 19:26:06 +05:30
Ankush Menat
2548bca187
fix: hook format for user_data_fields
2021-05-06 16:48:59 +05:30
mergify[bot]
585b123bd7
Merge pull request #13134 from ankush/hooks_template_fixes
...
fix: missing comma and uncommented code in hooks.py template
2021-05-06 09:32:55 +00:00
Ankush Menat
9e39249059
fix: comment user_data_fields and fix structure
2021-05-06 14:01:56 +05:30
Ankush Menat
aba315daf8
fix: missing comma in hooks template
2021-05-06 14:01:39 +05:30
mergify[bot]
aad9189e1e
Merge pull request #13102 from gavindsouza/show-config-enhancements
...
refactor(CLI): Show config
2021-05-05 12:30:43 +00:00
Gavin D'souza
bf9fcb3ff6
chore(cli): Add pending deprecation warning
...
* Add PDW for --as-dict in command set-config
* Move all top level imports inside each util to optimize imports for
CLI
* Set always show filter for DeprecationWarning, PendingDeprecationWarning via frappe module
2021-05-05 15:33:44 +05:30
Leela vadlamudi
3875004d7e
Merge pull request #13057 from leela/email-refactoring
...
refactor: Email Module - 1
2021-05-05 11:45:04 +05:30
Ankush Menat
6e0b256afa
chore: remove py2 specific code from boilerplate
...
(cherry picked from commit a617348a79
2021-05-04 05:11:20 +00:00
mergify[bot]
52a3f2f5df
Merge pull request #13103 from ankush/clean_boilerplate
...
chore: remove py2 specific code from boilerplate
2021-05-04 05:09:00 +00:00
