Himanshu Warekar
9e75cd246b
Merge branch 'develop' of https://github.com/frappe/frappe into table_multiselect_filter
2020-06-11 14:30:44 +05:30
Shivam Mishra
5f6a24b0af
fix: set default template for list ( #10648 )
2020-06-11 10:15:47 +05:30
Shivam Mishra
2f134ae358
Merge pull request #10646 from scmmishra/fix-login
...
fix: show login dropdown if already logged on
2020-06-10 14:09:36 +00:00
Shivam Mishra
8ba041565b
fix: show login dropdown if already logged on
2020-06-10 19:36:57 +05:30
gavin
6401bf6890
Merge pull request #10633 from gavindsouza/doctor-fix
...
fix(doctor): update broken command behaviour
2020-06-10 17:16:02 +05:30
Himanshu
d831ba0852
Merge pull request #10566 from fumin/patch-6
...
fix: show label for table fields
2020-06-10 15:52:23 +05:30
Himanshu
1ba65acb1f
fix: Add label for Text Editor
2020-06-10 15:09:59 +05:30
mergify[bot]
11dcec81fa
Merge pull request #10638 from Thunderbottom/total-user-fix
...
fix: return 0 if no users are found
2020-06-10 09:25:39 +00:00
Chinmay Pai
fa14e47413
chore: use flt instead of cint
2020-06-10 14:15:53 +05:30
mergify[bot]
3199183c94
Merge pull request #10374 from scmmishra/no-ammend
...
fix: amended doc already exists bug
2020-06-10 08:21:06 +00:00
Chinmay D. Pai
ef9327c99f
fix: return 0 if no users are found
...
if no users are present in the system, get_total_users returns None
instead of 0 causing comparison issues
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-06-10 13:23:39 +05:30
mergify[bot]
174ab8e71a
Merge pull request #10628 from vishdha/web_form_file_attachment_v13
...
fix(web_form): web form file attachment link to specific doctype
2020-06-10 06:59:43 +00:00
mergify[bot]
4f3786a758
Merge pull request #10620 from scmmishra/fix-toggle-chart
...
fix: hidden chart show on refresh
2020-06-10 06:56:13 +00:00
mergify[bot]
a913db5851
Merge pull request #10621 from scmmishra/fix-none-type-get-workflow
...
fix: don't send total row in checked items
2020-06-10 06:53:14 +00:00
mergify[bot]
1752924d2b
Merge pull request #10549 from Alchez/dev-mapper-method-override
...
feat: allow mapper functions to be overriden
2020-06-10 06:52:30 +00:00
Suraj Shetty
d8810e5cff
Merge branch 'develop' into no-ammend
2020-06-10 12:19:54 +05:30
Suraj Shetty
9f4651540a
Merge branch 'develop' into web_form_file_attachment_v13
2020-06-10 12:11:23 +05:30
Suraj Shetty
97d3ae06eb
Merge branch 'develop' into fix-toggle-chart
2020-06-10 12:11:00 +05:30
Suraj Shetty
c39cb0cfca
Merge branch 'develop' into dev-mapper-method-override
2020-06-10 12:09:48 +05:30
Suraj Shetty
a12c97c4f8
Merge branch 'develop' into fix-none-type-get-workflow
2020-06-10 12:08:05 +05:30
Gavin D'souza
cfa7afb08c
fix(doctor): update broken command behaviour
2020-06-10 11:34:20 +05:30
mergify[bot]
6135dece3d
Merge pull request #10576 from ruchamahabal/fix-duration-options
...
fix: Change 'show' to 'hide' in Duration field properties
2020-06-10 05:59:59 +00:00
Suraj Shetty
432bb7478b
Merge branch 'develop' into dev-mapper-method-override
2020-06-10 11:27:11 +05:30
Suraj Shetty
e4a5138c71
Merge branch 'develop' into fix-toggle-chart
2020-06-10 11:17:57 +05:30
Suraj Shetty
74d8cce698
Merge branch 'develop' into web_form_file_attachment_v13
2020-06-10 11:04:45 +05:30
mergify[bot]
1c5da28a40
Merge pull request #10596 from ruchamahabal/set-avg-response-time
...
feat(Communication): set average response time in parent
2020-06-10 05:27:35 +00:00
mergify[bot]
cfdb39c208
Merge pull request #10632 from ruchamahabal/fix-web-form
...
fix(web_form): set only_select property for link fields in child table
2020-06-10 05:18:02 +00:00
Suraj Shetty
075c07852c
Merge branch 'develop' into set-avg-response-time
2020-06-10 10:45:35 +05:30
Suraj Shetty
5710d107e1
chore: Update website links
2020-06-10 01:45:23 +05:30
Rucha Mahabal
b34c14cde3
fix: run handle_hold_time method in parent
2020-06-09 23:19:11 +05:30
mergify[bot]
fd1453860c
Merge pull request #10630 from scmmishra/test-grid-pagination
...
feat: remove flaky test for grid-pagination
2020-06-09 14:49:14 +00:00
Rucha Mahabal
aa5b526fa7
fix(web_form): set only_select for Link fields in child table
2020-06-09 20:11:38 +05:30
Shivam Mishra
3db3e073aa
feat: remove flaky test for grid-pagination
2020-06-09 19:15:53 +05:30
Shivam Mishra
2be2c1b627
Merge pull request #10629 from scmmishra/router-source-fix
2020-06-09 13:44:51 +00:00
Vishal Dhayagude
df1d3be9fb
fix(web_form) : web form file attachment link to specific doctype ( #222 )
2020-06-09 18:50:29 +05:30
Shivam Mishra
529a2eb808
fix: condition for rendering source
2020-06-09 17:50:41 +05:30
mergify[bot]
835c882656
Merge pull request #10575 from deepeshgarg007/import_fixtures_fix
...
fix: Ignore doc validations while importing docs from fixtures
2020-06-09 10:11:39 +00:00
mergify[bot]
06d9ac60e0
Merge pull request #10538 from Thunderbottom/dropbox-email-fix
...
fix: send email for successful backup only if checked
2020-06-09 02:58:10 +00:00
Suraj Shetty
f322a7a4a8
Merge branch 'develop' into dropbox-email-fix
2020-06-09 08:15:48 +05:30
Faris Ansari
6b2d62273e
Merge pull request #10563 from scmmishra/blog-imporv
2020-06-08 19:32:06 +05:30
Faris Ansari
c31dc9ae22
test: fix blog test
2020-06-08 19:18:10 +05:30
Shivam Mishra
8bfdc2696a
Merge pull request #10622 from netchampfaris/page-builder-fixes-2020-06-08
...
fix: Page builder styling fixes
2020-06-08 13:45:52 +00:00
Shivam Mishra
3a24e384a5
Merge pull request #10591 from scmmishra/page-switcher
2020-06-08 13:44:31 +00:00
Faris Ansari
4d5927218c
Merge branch 'blog-imporv' of https://github.com/scmmishra/frappe into blog-imporv
2020-06-08 19:05:58 +05:30
Faris Ansari
ed5d657a62
fix: Smaller blog title and hr above content
2020-06-08 19:05:44 +05:30
Faris Ansari
c0e94e7e38
fix: Add anchored headings only on doc content
2020-06-08 19:05:18 +05:30
Faris Ansari
9a4fe0f0c3
fix: Add anchored headings only on doc content
2020-06-08 18:56:46 +05:30
Faris Ansari
53c1845ae5
fix: Blog styles
...
- Use markdown styles for blog content
2020-06-08 18:56:30 +05:30
Faris Ansari
44fc9c57e2
fix: Set source only if raw content
2020-06-08 18:55:58 +05:30
Rucha Mahabal
8bf3c30d4d
fix: set duration options in patch
2020-06-08 18:04:17 +05:30
