Commit graph

36088 commits

Author SHA1 Message Date
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
Manuel
aae44405b9
Merge branch 'frappe:develop' into develop 2021-10-01 08:28:33 +02:00
Shariq Ansari
38d9d06cd3
Merge branch 'frappe:develop' into modal-scrollbar-fix 2021-10-01 11:29:04 +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
21067dc8d8
Merge branch 'develop' into fix-date-display 2021-10-01 08:11:41 +05:30
Suraj Shetty
c8c12b4d00
Merge branch 'develop' into hide-show-filter 2021-10-01 08:07:57 +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
4d435e271e
Merge branch 'develop' into coverage 2021-09-30 23:11:26 +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
Shariq Ansari
624cd3a04c fix: Scrollbar is hidden when search modal is minimized 2021-09-30 16:21:20 +05:30
MitulDavid
b9d6063755 test: Fix flaky test in timeline.js 2021-09-30 16:17:02 +05:30
MitulDavid
7ee31deaab fix: 'this.dialog.sections[0] is undefined' in communication.js 2021-09-30 15:40:02 +05:30
gavin
6078cbabaa
Merge pull request #14303 from frappe/mergify/bp/develop/pr-13929
fix: handle JSON content in run_doc_method (backport #13929)
2021-09-30 15:34:07 +05:30
gavin
6f4a281b7d
Merge pull request #14323 from gavindsouza/cp38-m1
chore: Bump psycopg2-binary Python client
2021-09-30 15:13:43 +05:30
Gavin D'souza
39d63641f3 chore: Bump psycopg2-binary Python client 2021-09-30 13:35:39 +05:30
Shariq Ansari
efc338a684
Merge branch 'frappe:develop' into twice-include-theme-for-apps 2021-09-30 12:32:26 +05:30
Shariq Ansari
6bbbfe3014
Merge branch 'frappe:develop' into hide-show-filter 2021-09-30 12:31:53 +05:30
MitulDavid
2570098be2 test: Fix flaky test 'enables Actions button' 2021-09-30 09:55:43 +05:30
Shridhar Patil
34f93330e9
fix: Missing save doc. 2021-09-29 16:24:47 +05:30
MitulDavid
400a604f2e test: Fix flaky tests in list_view.js, navigation.js 2021-09-29 13:34:53 +05:30
MitulDavid
58b3cdeb9a test: Fix flaky tests in form.js 2021-09-29 13:34:22 +05:30
MitulDavid
b159037f6a test: Fix flaky tests in dashboard_links.js 2021-09-29 13:34:07 +05:30
Shariq Ansari
83f7baa2fc
Merge branch 'frappe:develop' into flaky-ui-tests 2021-09-29 12:50:53 +05:30
Shariq Ansari
6f5f9ce1c5 test: fixed flaky ui test for folder_navigation 2021-09-29 11:30:49 +05:30
Shariq Ansari
9243e886c8 test: fixed flaky ui test for timeline_email 2021-09-29 11:14:36 +05:30
leela
d333b00904 fix: Get background jobs info 2021-09-28 21:50:04 +05:30
leela
73843b0ab3 fix: include doc details in workflow action email subject 2021-09-28 20:50:31 +05:30
Saqib Ansari
2072726865 feat: add on_get_node event in treeview 2021-09-28 18:02:36 +05:30
Ankush Menat
c1f9231d72
fix: install future and minor changes
minor changes:
1. quitely checkout new tags
2. avoid changing directory
3. use pip instead of bench to install deps.
2021-09-28 17:28:24 +05:30
Shariq Ansari
bfc68bdd95 fix: Hide Show Filter if there is no saved filters 2021-09-28 16:35:13 +05:30
Saqib Ansari
4109caf1bf chore: improve message & title 2021-09-28 16:15:24 +05:30
Shariq Ansari
e83c4ee7d3 fix: Include Theme for Apps section rendered twice 2021-09-28 15:32:31 +05:30
pateljannat
888bff9b1b Merge branch 'develop' of https://github.com/frappe/frappe into discussions 2021-09-28 14:50:41 +05:30