Commit graph

26759 commits

Author SHA1 Message Date
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
gavin
047280013d
fix: Fetch latest files filtered by names (#11056) 2020-07-23 18:42:44 +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
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
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
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
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
Gavin D'souza
220b56f0a0 feat: API to fetch the latest backup available
Take a backup if it doesnt exist with the required expiry
2020-07-21 21:20:06 +05:30
Diksha Jadhav
061c8d9088 fix(grid): trigger onchange on field 2020-07-21 19:14:07 +05:30
Suraj Shetty
547bd77c20
fix: Do not check all attachments on adding new (#10926) 2020-07-21 18:46:51 +05:30
Suraj Shetty
48b835c1dc
fix: Text editor content style in email and website (#11003) 2020-07-21 18:26:42 +05:30
Prssanna Desai
33be0b023f
Merge pull request #11055 from prssanna/dashboard-fixes 2020-07-21 17:22:24 +05:30
prssanna
e3ce17a0c9 fix: check if dynamic filters exists 2020-07-21 17:16:19 +05:30
Chinmay Pai
02fa765dcc
Merge pull request #11041 from abhishekbalam/prevent_autoreply_inital_sync 2020-07-21 16:58:54 +05:30
Prssanna Desai
502f0ebad5
Merge pull request #11052 from marination/dashboard-chart-fixes 2020-07-21 16:53:45 +05:30
prssanna
6e9fe40b0e style: fix formatting 2020-07-21 16:41:01 +05:30
prssanna
c709ebc9f1 fix: set report name as mandatory 2020-07-21 16:39:58 +05:30
prssanna
660d27389c fix: get_all_filters for number cards 2020-07-21 16:39:26 +05:30
marination
e3e94a5430 fix: Rename pending 'is_custom' usage to 'use_report_chart' 2020-07-21 16:22:19 +05:30
Suraj Shetty
146762767d
refactor: Rename is_custom to use_report_chart (#11051)
* refactor: Rename is_custom to use_report_chart

* fix: Patch to move is_custom data to use_report_chart

* fix: Import rename_field

* fix: Rename is_custom in depends_on

* fix: Reload doc before renaming field
2020-07-21 15:49:44 +05:30
Abhishek Balam
2083224609
fix: add a confirmation dialog on enabling auto reply
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-21 12:37:33 +05:30
Mangesh-Khairnar
48e6f8999d
Merge branch 'develop' into paytm-integration 2020-07-21 00:13:59 +05:30
Mangesh-Khairnar
158da07c6a fix: make the checkout page responsive for mobile view 2020-07-21 00:12:06 +05:30
Mangesh-Khairnar
0ae7d40ebe fix(paytm-integration): use checksum library to generate/verify checksum 2020-07-20 23:08:50 +05:30
mergify[bot]
3769a8bbe9
Merge pull request #11048 from scmmishra/feat-compress-css
build: compress build from theme generator
2020-07-20 17:21:53 +00:00
Shivam Mishra
a3cc30437f feat: compress build from theme generator 2020-07-20 21:03:38 +05:30
mergify[bot]
0319dca6e4
Merge pull request #11014 from prssanna/read-only-share-perm
fix: Add share perm in set_read_only
2020-07-20 14:31:59 +00:00
Prssanna Desai
fc3816d2de
fix: update all required perms form doc perms
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-07-20 19:42:21 +05:30