Commit graph

25549 commits

Author SHA1 Message Date
SDLyu
3e9d8d05e9
Wrappe frappe._dict
`frappe.get_attr(hook)(data=data)` return dict. But function `get_open_count` will access `fieldname` attribute in notifications.py.
 I will cause error `'dict' object has no attribute 'fieldname'`.
2020-05-21 18:47:00 +08:00
mergify[bot]
4e197c56d6
Merge pull request #10430 from scmmishra/fix-relative-filter-test
test: fix flaky tests relative filter and control link
2020-05-21 10:00:38 +00:00
mergify[bot]
3a52fe8949
Merge pull request #10434 from adityahase/fix-recorder-sensible-defaults
fix(recorder): Use sane defaults for sorting
2020-05-21 09:45:57 +00:00
mergify[bot]
b424a340a9
Merge pull request #10439 from frappe/sahil28297-patch-3
chore: pin redis version to 3.5.1
2020-05-21 09:42:11 +00:00
sahil28297
53f6404604
chore: pin redis version to 3.5.1 2020-05-21 14:36:19 +05:30
Aditya Hase
1abf265451 fix(recorder): Use sane defaults for sorting 2020-05-21 11:01:42 +05:30
mergify[bot]
55a3e959f2
Merge pull request #10424 from gavindsouza/recorder-css
fix(recorder): reduce z index to avoid overlap
2020-05-21 05:13:54 +00:00
Himanshu
066ecb44cc
fix(Query Report): column reordering bug (#10270) 2020-05-21 10:31:26 +05:30
mergify[bot]
0b22139e82
Merge pull request #10120 from prssanna/chart-dates-fix
fix: Calculation of dates and values for dashboard charts
2020-05-21 04:21:47 +00:00
mergify[bot]
89080f8b1d
Merge pull request #10411 from netchampfaris/move-address-contact-templates-from-erpnext-2020-05-18
fix: Move address and contact templates from ERPNext
2020-05-21 04:05:46 +00:00
mergify[bot]
46e52d7d77
Merge pull request #10206 from Anurag810/multi_select_dialog_redesign
feat: Redesign Multiselect Dialog
2020-05-20 18:48:45 +00:00
Shivam Mishra
e33bcfa6bd style: fix linting issue 2020-05-21 00:03:46 +05:30
mergify[bot]
98050bc6b7
Merge pull request #10371 from scmmishra/web-page-builder-enhancements
fix: Web page builder enhancements
2020-05-20 18:27:36 +00:00
mergify[bot]
4f6f9f3293
fix: check for self linking (bp #10181) (#10426) 2020-05-20 23:30:27 +05:30
Shivam Mishra
53855cad1d fix (cypress): set default command timeout to 20 seconds 2020-05-20 23:29:30 +05:30
Shivam Mishra
5d5cb26143 fix: add delay in typing 2020-05-20 23:28:40 +05:30
Shivam Mishra
7a1cb7fa00 refactor: don't login before each test 2020-05-20 23:28:26 +05:30
Shivam Mishra
d6e0cdb4fe fix (test): fix flaky relative filter test 2020-05-20 22:45:29 +05:30
Shivam Mishra
49f9447627 fix: apply rule on image 2020-05-20 21:48:38 +05:30
mergify[bot]
326d6a57fc
Merge pull request #10412 from prssanna/multiselect-pills-fix
fix(MultiSelectPills): get_data doesn't take input value
2020-05-20 16:09:46 +00:00
mergify[bot]
0826a9db45
fix: check for self linking and circular linking while getting submitted linked docs (bp #10179) (#10425) 2020-05-20 21:24:09 +05:30
mergify[bot]
f0e08d5784
Merge pull request #10423 from frappe/backups-fix
fix: Allow verbose flag in BackupGenerator
2020-05-20 15:36:50 +00:00
Gavin D'souza
62b2c034ae fix(recorder): reduce z index to avoid overlap 2020-05-20 19:49:05 +05:30
Shivam Mishra
2328fe5aa3 style: linting fixes from sider 2020-05-20 19:07:05 +05:30
Gavin D'souza
716ae57b29 style: sort imports and spacing 2020-05-20 18:01:32 +05:30
Gavin D'souza
931e35b554 fix: handle verbose kwarg in BackupGenerator 2020-05-20 17:59:08 +05:30
mergify[bot]
9920937b45
Merge pull request #10403 from frappe/mergify/bp/develop/pr-10394
fix: keyboard shortcut for toggle sidebar in report view (bp #10394)
2020-05-20 12:06:28 +00:00
Faris Ansari
2f5ff98240 fix: web_blocks global method to render web blocks 2020-05-20 16:35:23 +05:30
Shivam Mishra
66df42b281 refactor: show sections with values 2020-05-20 15:34:13 +05:30
Shivam Mishra
0a8506da87 feat: remove subnav 2020-05-20 15:16:28 +05:30
mergify[bot]
a57a82c134
Merge pull request #10405 from frappe/gavindsouza-patch-1
fix: remove markdown conversion
2020-05-20 09:31:55 +00:00
Faris Ansari
8e87734ff9 fix: Move address and contact from ERPNext 2020-05-20 14:54:15 +05:30
prssanna
952c384014 fix: get_data takes input value 2020-05-20 14:46:42 +05:30
mergify[bot]
b6b2e4ecbf
Merge pull request #10262 from prssanna/permissions-fix
fix: Consider permissions for Dashboard Charts and Number Cards
2020-05-20 08:58:46 +00:00
Suraj Shetty
fb1ce4c111
Merge branch 'develop' into permissions-fix 2020-05-20 14:09:52 +05:30
mergify[bot]
2c8f1b5e1d
Merge pull request #10406 from scmmishra/wfrom-events
feat: trigger events in web forms
2020-05-20 08:34:18 +00:00
mergify[bot]
e6efd9960f
Merge pull request #10407 from abhishekbalam/blog-type-error
fix: Type error when empty "Rich Text" content saved in Blog Post
2020-05-20 08:04:07 +00:00
Gavin D'souza
f3ccdd9ebc fix: dont convert from md if html 2020-05-20 13:18:19 +05:30
Gavin D'souza
c8aed039bd Revert "fix: remove markdown conversion"
This reverts commit 3fd8a15412.
2020-05-20 13:17:59 +05:30
Anurag Mishra
c9642949af style: fixed indentation 2020-05-20 13:11:02 +05:30
Anurag Mishra
6f31827c80 chore: removed unwanted code 2020-05-20 13:05:40 +05:30
mergify[bot]
3baf0b511b
Merge pull request #10264 from Mangesh-Khairnar/add-sm-icons-in-abt
feat(blog): add social media share
2020-05-20 07:29:16 +00:00
Anurag Mishra
69b1ee5ab9 fix: remove auto scroll from result area 2020-05-20 12:20:49 +05:30
Abhishek Balam
f4cd72c792 fix: Type error when empty 'Rich Text' content saved in Blog Post 2020-05-20 12:14:03 +05:30
mergify[bot]
66a63bbc99
Merge pull request #10391 from abhishekbalam/patch-2
fix: Console error in Blog Post when route is not set
2020-05-20 06:23:27 +00:00
Faris Ansari
3d9e647015 fix: Commit auto-updated files 2020-05-19 22:54:03 +05:30
Faris Ansari
01dfd23c66 fix: Set default font properties to all weights 2020-05-19 22:53:32 +05:30
Faris Ansari
17c5a64e8e fix: Sidebar
- Fix sidebar items styling
- Support sidebar on right
2020-05-19 22:53:11 +05:30
Faris Ansari
4b8927af17 fix: Remove section with left image 2020-05-19 22:52:07 +05:30
Faris Ansari
7234b4b7fa fix: Add Split Section template 2020-05-19 22:51:48 +05:30