Commit graph

26781 commits

Author SHA1 Message Date
Rucha Mahabal
a11496f05c fix: translation syntax 2020-07-27 23:35:19 +05:30
Rucha Mahabal
c8817e5221 fix: check for empty report filters while creating report type dashboard chart 2020-07-27 21:39:00 +05:30
Prssanna Desai
2792a1cac9
Merge pull request #11074 from prssanna/dashboard-fixes 2020-07-27 12:26:44 +05:30
Prssanna Desai
342f9e31af
Merge pull request #11063 from prssanna/filter-depends-on-fix 2020-07-27 12:24:37 +05:30
Mangesh-Khairnar
32a9c3a83f
Merge pull request #9955 from Mangesh-Khairnar/paytm-integration 2020-07-25 14:46:06 +05:30
Mangesh-Khairnar
ab8a63d6fe fix: minor changes 2020-07-24 22:59:16 +05:30
Mangesh-Khairnar
bc56a59671 fix(paytm-integration): simplify code and remove additional loop 2020-07-24 20:19:35 +05:30
Wolfram Schmidt
35f3b5b405
fix: Allowing to rename DocType Tag (#11100) 2020-07-24 17:41:24 +05:30
Prssanna Desai
9e88b7c28d
Merge pull request #11086 from gavindsouza/fetch-backups-api 2020-07-24 13:06:29 +05:30
Suraj Shetty
227f49110a
Merge branch 'develop' into filter-depends-on-fix 2020-07-24 11:55:32 +05:30
Suraj Shetty
875cfd8789
Merge branch 'develop' into dashboard-fixes 2020-07-24 11:54:15 +05:30
gavin
047280013d
fix: Fetch latest files filtered by names (#11056) 2020-07-23 18:42:44 +05:30
Prssanna Desai
160a84cee4
fix: use correct variable 2020-07-23 17:55:23 +05:30
prssanna
b95d28d5f1 fix: remove unused style 2020-07-23 17:43:01 +05:30
prssanna
771feca073 feat: remove restricted button in dashboard 2020-07-23 17:41:55 +05:30
prssanna
5f5facfb0a fix: set frm.filters to empty array for number card 2020-07-23 17:40:51 +05:30
Suraj Shetty
24adc8c362
fix: Use find instead of filter 2020-07-23 17:34:18 +05:30
mergify[bot]
c9dbf9c45d
Merge pull request #10999 from scmmishra/fix-remove-id-column
fix: don't allow users to remove ID column from report view
2020-07-23 11:57:05 +00:00
mergify[bot]
74b2ffbc4e
Merge pull request #11057 from DeeMysterio/dev-grid-onchange
fix(grid): trigger onchange on field
2020-07-23 11:54:07 +00:00
Gavin D'souza
2c07502878 Merge branch 'develop' of github.com:frappe/frappe into fetch-backups-api 2020-07-23 11:30:34 +05:30
prssanna
6187de8e3d fix: make is_standard read only if not in developer mode 2020-07-23 11:12:13 +05:30
mergify[bot]
e43e4ebed8
Merge pull request #10904 from Thunderbottom/whitelist-query
fix: add search queries to whitelist
2020-07-23 02:52:41 +00:00
mergify[bot]
99c0c2df51
Merge pull request #11077 from deepeshgarg007/child-table-checkbox
fix: Margin top for child table index checkboxes
2020-07-22 16:42:15 +00:00
Deepesh Garg
51a473336a fix: Margin top for child table index checkboxes 2020-07-22 21:55:56 +05:30
Prssanna Desai
8524b7cea6
Merge pull request #10260 from hrwX/web_feedback 2020-07-22 21:37:58 +05:30
Shivam Mishra
ba7067f50a
Merge pull request #11082 from frappe/revert-11069-fix-set-page-action
Revert "fix: set page actions after setting read only"
2020-07-22 19:31:17 +05:30
Shivam Mishra
b541ffac68
Revert "fix: set page actions after setting read only" 2020-07-22 19:30:11 +05:30
prssanna
c64df2787f fix: use get_filter_value in filter_list 2020-07-22 16:51:17 +05:30
mergify[bot]
45b5d61e5a
Merge pull request #11078 from scmmishra/footer-signup-fix
feat: always render footer links layout
2020-07-22 11:07:23 +00:00
Gavin D'souza
0ba3fb5a92 fix: proper sequence of backups 2020-07-22 15:53:10 +05:30
Shivam Mishra
64a0312546 feat: always render footer links layout 2020-07-22 15:51:07 +05:30
mergify[bot]
ff54ff13f3
Merge pull request #11067 from surajshetty3416/fix-website
fix(website): Properly load colocated javascript and style
2020-07-22 09:58:29 +00:00
prssanna
0c475792cd refactor: delete unused file filters.js 2020-07-22 14:55:02 +05:30
prssanna
95aa4a72dc fix: reduce code complexity 2020-07-22 14:53:03 +05:30
Deepesh Garg
19ff07b53b fix: Margin top for child table index checkboxes 2020-07-22 14:27:18 +05:30
Himanshu
1f2cf12503
Update frappe/website/doctype/help_article/templates/help_article.html
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-07-22 14:14:05 +05:30
Himanshu Warekar
98f0b43b5d Merge branch 'web_feedback' of https://github.com/hrwx/frappe into web_feedback 2020-07-22 14:13:19 +05:30
Himanshu Warekar
20c5724b3f Merge branch 'develop' of https://github.com/frappe/frappe into web_feedback 2020-07-22 14:11:40 +05:30
prssanna
c25100cb47 style: fix formatting 2020-07-22 11:59:17 +05:30
prssanna
1bd610f858 fix: separate patch to rename is_custom field 2020-07-22 11:53:01 +05:30
prssanna
dd6a361058 fix: don't show is_standard if not in developer mode 2020-07-22 11:53:01 +05:30
prssanna
7f1a5adb0e fix: disable dashboard form only if doc is standard 2020-07-22 11:53:01 +05:30
prssanna
cdd7cb2f17 fix: filter out standard dashboards while creating from reports 2020-07-22 11:53:01 +05:30
prssanna
1e56fcc857 fix: filter out standard dashboards if not in developer mode 2020-07-22 11:53:01 +05:30
mergify[bot]
59072daa4f
Merge pull request #11069 from scmmishra/fix-set-page-action
fix: set page actions after setting read only
2020-07-22 06:03:09 +00:00
Suraj Shetty
8f6329de49
refactor: Simplify code 2020-07-22 11:23:35 +05:30
Shivam Mishra
2a068bad19 fix: set page actions after setting read only 2020-07-22 11:17:04 +05:30
Suraj Shetty
2bf77cd82a
style: Fix sider 2020-07-22 10:32:12 +05:30
Suraj Shetty
06788762d6 fix(website): Properly load colocated javascript and style 2020-07-22 10:09:58 +05:30
Mangesh-Khairnar
3c4e1ea3a5 fix: add pycryptodome for checksum generation 2020-07-21 22:20:27 +05:30