Commit graph

34685 commits

Author SHA1 Message Date
Gavin D'souza
cfa2d65394 refactor(safe_exec): Manage in-safe frappe.db.sql
* Check if flag in_safe_exec to check if SELECT query in frappe.db.sql
* Get rid of read_sql...refactor logic
* Enable frappe.qb just like that ;)
* Add support fro *args in .run
2021-10-11 12:28:36 +05:30
Aradhya-Tripathi
2a241bd2dc style: formatted code 2021-10-05 18:23:46 +05:30
Aradhya-Tripathi
3b25bde3ac feat: Added tests for SafeQB 2021-10-05 18:14:06 +05:30
Aradhya-Tripathi
6c706ec000 fix: fixed multitenancy in safeqb 2021-10-05 18:13:32 +05:30
Aradhya-Tripathi
9c00a28869 feat: Added safe_qb for server scripts 2021-10-05 12:39:22 +05:30
gavin
22876d9803
Merge pull request #14102 from Aradhya-Tripathi/at-refactor
feat: additional filter support
2021-10-05 12:06:04 +05:30
Aradhya-Tripathi
985d3476be ci: trigger build 2021-10-05 11:36:31 +05:30
Suraj Shetty
5fad814863
Merge pull request #14357 from alyf-de/set-filter-context 2021-10-05 11:27:08 +05:30
Aradhya-Tripathi
d7f25ecb24 fix: fixed package_release 2021-10-05 11:23:35 +05:30
barredterra
9b19b41a55 feat: add context for "is (not) set" filter translations 2021-10-04 19:56:59 +02:00
Suraj Shetty
590001d6eb
Merge pull request #14351 from resilient-tech/filter-on-ace-editor-field 2021-10-04 17:31:25 +05:30
Suraj Shetty
8ac7855a4a
Merge branch 'develop' into filter-on-ace-editor-field 2021-10-04 17:14:48 +05:30
Pruthvi Patel
d4b78e18a5 fix: filter on ace editor field 2021-10-04 16:06:47 +05:30
Suraj Shetty
6b3165ffb4
Merge pull request #14328 from shariquerik/webform-file-upload-fix 2021-10-04 16:03:39 +05:30
Suraj Shetty
9729ae708b
Merge pull request #14130 from rohitwaghchaure/user-wise-grid-settings 2021-10-04 13:53:19 +05:30
gavin
1385f9f468
Merge pull request #14342 from gavindsouza/serve-no-redis
fix: Remove Webserver's dependency on Redis
2021-10-04 12:42:46 +05:30
Gavin D'souza
7c6fad09ee fix: NoneType comparison flake8 E711
ref: https://www.flake8rules.com/rules/E711.html
2021-10-04 11:01:56 +05:30
gavin
7ff461603f
Merge pull request #14344 from ankush/install_pycups_failure
fix: remove pycups from requirements
2021-10-04 10:59:47 +05:30
Suraj Shetty
7b539922a0
Merge pull request #14332 from shariquerik/heatmap-legend-color 2021-10-04 10:59:32 +05:30
Suraj Shetty
4c699ec335
Merge pull request #14307 from shariquerik/twice-include-theme-for-apps 2021-10-04 10:57:06 +05:30
Suraj Shetty
fc4a9d2d5a
Merge branch 'develop' into twice-include-theme-for-apps 2021-10-04 10:55:08 +05:30
Ankush Menat
8904a1c7ad
fix: remove pycups from requirements 2021-10-04 10:40:15 +05:30
Suraj Shetty
740485273a
Merge pull request #14226 from pateljannat/discussions 2021-10-04 07:29:29 +05:30
Rohit Waghchaure
d454aaf2f0 chore: added test case 2021-10-03 23:59:06 +05:30
Gavin D'souza
f37b954fbf fix: get_assets_json w/o Redis too ;) 2021-10-03 12:30:52 +05:30
Aradhya-Tripathi
dadd7abad2 Merge branch 'develop' of https://github.com/Aradhya-Tripathi/frappe into at-refactor 2021-10-03 01:21:15 +05:30
Aradhya-Tripathi
b2a79ce91e refactor: removed redundant imports 2021-10-03 01:19:29 +05:30
Rohit Waghchaure
c7d474b3a2 fix: columns width validation 2021-10-02 15:02:47 +05:30
Rohit Waghchaure
3c0d61f198 fix: code cleanup 2021-10-02 15:02:47 +05:30
Rohit Waghchaure
ddb0bef919 feat: user wise configure grid columns 2021-10-02 15:02:47 +05:30
gavin
fe82487c15
Merge pull request #14334 from rohitwaghchaure/errprint-for-server-script
feat: frappe.errprint in the server script for debugging
2021-10-01 15:59:35 +05:30
Rohit Waghchaure
5bd9be2437 feat: frappe.errprint in the server script for debugging 2021-10-01 15:35:28 +05:30
Shariq Ansari
c06194ce91 fix: Heatmap legend color not set when color theme is set 2021-10-01 13:08:52 +05:30
pateljannat
2df2032689 Merge branch 'develop' of https://github.com/frappe/frappe into discussions 2021-10-01 13:07:06 +05:30
pateljannat
fd57185bc9 style: indentation, etc 2021-10-01 13:04:57 +05:30
Suraj Shetty
384ad1ad26
Merge pull request #14327 from shariquerik/leaderboard-load-fix 2021-10-01 12:18:31 +05:30
Shariq Ansari
0fc60c5af7
Merge branch 'frappe:develop' into webform-file-upload-fix 2021-10-01 11:27:55 +05:30
rohitwaghchaure
34c0920747
Merge pull request #14329 from KrithiRamani/new-arg-filename
feat: pass filename as argument to print_by_server
2021-10-01 09:49:15 +05:30
KrithiRamani
0e16fc03ad
Update requirements.txt
Added version no for pycups

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-01 09:44:17 +05:30
KrithiRamani
ad89c1fcd8
Update frappe/utils/print_format.py
As suggested, moved new args to the end for supporting non-kwarg function calls.

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-10-01 09:43:59 +05:30
gavin
fc1891f80b
Merge pull request #14320 from zerodha/save_doc
fix(Razorpay Settings): Save Errored Integration Request
2021-10-01 08:47:17 +05:30
gavin
b158d15c0a
Merge pull request #14310 from nextchamp-saqib/tree-get-node-event
feat: add on_get_node event in treeview
2021-10-01 08:46:36 +05:30
Suraj Shetty
05041ede6e
Merge branch 'develop' into leaderboard-load-fix 2021-10-01 08:12:24 +05:30
Suraj Shetty
e654f9a32f
Merge pull request #14251 from ankush/tag_wise_patch_test 2021-10-01 08:05:14 +05:30
Suraj Shetty
ccc3115cff
Merge pull request #14316 from shariquerik/flaky-ui-tests 2021-09-30 23:11:05 +05:30
Krithi Ramani
78a89fdb99 renamed argument to file_path. Added pycups to requirements.txt 2021-09-30 22:20:42 +05:30
Krithi Ramani
2d018a8591 passed filename as argument 2021-09-30 21:59:29 +05:30
Aradhya-Tripathi
a31f23bee9 Merge branch 'develop' of https://github.com/Aradhya-Tripathi/frappe into at-refactor 2021-09-30 21:42:09 +05:30
Shariq Ansari
01b4717d3e fix: On submitting webform with file, record is created but file is not attached in the attachment section 2021-09-30 20:18:25 +05:30
Shariq Ansari
8f8f80fef7 fix: Leaderboard is not loading for user with language other than en 2021-09-30 19:01:51 +05:30