Nabin Hait
f28eb5ac1e
Merge branch 'develop' into staging
2018-08-21 12:47:58 +05:30
rohitwaghchaure
a5d7182817
[Fix] Ascii code issue while downloading report ( #5990 )
2018-08-21 11:21:40 +05:30
Prateeksha Singh
67c9f94470
[refactor] Dialog to ES6 class, secondary/hide action ( #5987 )
...
* [refactor] Dialog to ES6 class, secondary/hide action
* [flex] add utility classes
2018-08-21 11:09:34 +05:30
Prateeksha Singh
5769af1d72
Merge pull request #5991 from pratu16x7/heatmap-fix
...
[fix][heatmap] pass data array in dashboard
2018-08-20 21:01:23 +05:30
Prateeksha Singh
02a1990844
[fix][heatmap] pass data array in dashboard
2018-08-20 20:40:28 +05:30
Nabin Hait
dc782ecfb2
Fieldtype changed for filters in prepared report
2018-08-20 16:59:18 +05:30
Nabin Hait
dd38ab3a4c
Fieldtype changed for filters in prepared report
2018-08-20 16:58:46 +05:30
Zarrar
c5ffec6c69
fix argument pass to class ( #5989 )
2018-08-20 12:38:10 +05:30
Mohamed_Alsum
893b7e0980
remove duplicate error mgs on submit web_form ( #5972 )
...
* remove dublicate error mgs on submit web_form
* show side-bar in RTL lang
2018-08-20 10:39:54 +05:30
Faris Ansari
3be33b8854
fix(handler): check if data is None explicitly ( #5982 )
...
If the returned data is empty list or string it was a failed response.
But these are all valid responses, so now we check explicitly for None.
2018-08-20 10:39:24 +05:30
Neil Trini Lasrado
6177c1f4ad
Changed email domain to example.com ( #5985 )
2018-08-20 10:36:58 +05:30
Himanshu Mishra
10361383c1
[fix]: use is_async in background jobs instead of async ( #5986 )
2018-08-20 10:36:26 +05:30
Nabin Hait
e6718b0980
Merge branch 'develop' into staging
2018-08-17 17:45:37 +05:30
rohitwaghchaure
5ae255405a
Merge pull request #5981 from rohitwaghchaure/prepared_export_report_not_working
...
[Fix] Prepared report is not able to export
2018-08-17 13:22:32 +05:30
rohitwaghchaure
d13afe3e79
Merge pull request #5980 from rohitwaghchaure/download_report_not_working
...
[Fix] Download report not working
2018-08-17 13:22:17 +05:30
Ameya Shenoy
2d62d12521
Merge pull request #5979 from pratu16x7/webform-delete
...
[webform-list] add delete multiple to list table
2018-08-17 11:29:08 +05:30
Prateeksha Singh
23ca07769d
[webform-list] add delete multiple to list table
2018-08-17 11:27:24 +05:30
Rohit Waghchaure
c197ae6278
[Fix] Download report not working
2018-08-17 11:10:51 +05:30
Rohit Waghchaure
97ae49dc47
[Fix] Prepared report is not able to export
2018-08-17 11:06:46 +05:30
Ameya Shenoy
6cc5547eca
Merge pull request #5975 from codingCoffee/csvutils
...
[fix] error while importing csv file
2018-08-16 18:11:24 +05:30
Ameya Shenoy
5cee74e8db
python 2/3 fixes
2018-08-16 12:28:59 +00:00
rohitwaghchaure
297c14a123
Merge pull request #5978 from rohitwaghchaure/minor_prepared_report_issue
...
[minor] Visible show report button when prepared report status is completed
2018-08-16 16:58:17 +05:30
Rohit Waghchaure
fa0657ed6e
[minor] Visible show report button when prepared report status is completed
2018-08-16 16:53:22 +05:30
Rushabh Mehta
445e2bd9b8
fix(image): chat room image hidden, finally had to do it in spite of reminding @achillesrasquinha 14 times to do it!
2018-08-16 14:46:46 +05:30
Ameya Shenoy
453ace7931
Merge pull request #5977 from codingCoffee/stack
...
web form allow others
2018-08-16 13:47:45 +05:30
Ameya Shenoy
e0853af409
web form allow others
2018-08-16 13:45:05 +05:30
Rushabh Mehta
67688c0583
layout(website theme): make a cleaner layout
2018-08-16 10:42:57 +05:30
Rushabh Mehta
98e1e16fb7
fixes(various): macro in web.html, show saving message in quick entry
2018-08-16 09:20:24 +05:30
Prateeksha Singh
f39f435a9b
Merge pull request #5971 from codingCoffee/webformlink
...
Enable link fields in webform by turning them into Autocomplete fields
2018-08-15 16:49:23 +05:30
Prateeksha Singh
37b4bd7b74
[prepared-report] intuitive first time UI ( #5973 )
2018-08-15 11:27:21 +05:30
Prateeksha Singh
d0a1565aa8
[csv-utils] don't decode when you've encoded special chars ( #5970 )
...
* [csv-utils] don't decode when you've encoded special chars
* Update csvutils.py
2018-08-15 11:25:56 +05:30
Ameya Shenoy
8d0212464e
Enable link fields in webform
2018-08-14 12:15:54 +00:00
Prateeksha Singh
36e39203fa
Merge pull request #5963 from Alsum/develop
...
showing-table-header-in-webform
2018-08-14 16:26:54 +05:30
Rushabh Mehta
98ac8b007a
fix(dialog): no submit in msgprint
2018-08-14 15:58:52 +05:30
Shreya Shah
3134060d80
Uncheck select all if no documents are selected ( #5966 )
2018-08-14 15:31:02 +05:30
Prateeksha Singh
512924a28e
[web_form_class] style cleanup
2018-08-14 14:34:49 +05:30
Faris Ansari
9025a0d765
Update frappe-datatable to 1.2.0 ( #5965 )
2018-08-14 14:34:13 +05:30
Prateeksha Singh
2c0abc3656
add notation for server-side get_in_list_view_fields()
2018-08-14 12:55:07 +05:30
sivankar
a48b76b940
refactored code to add support in filters to get descendant or ancest… ( #5847 )
...
* refactored code to add support in filters to get descendant or ancestor for tree type documents
* added semicolon and comments to imporve code quality
* refactored code to add not ancestor and not descendants of filters
* added test cases for ancestors of and descendants of
* Translate labels
2018-08-14 12:19:18 +05:30
Prateeksha Singh
213279ec87
Merge pull request #5783 from szuyxy/global_search_support_and
...
[Enhance] Global search multi key words to pin point search result
2018-08-14 12:09:29 +05:30
Zarrar
d3eb8c7abd
closing chat popper in mobile view ( #5964 )
2018-08-14 11:31:51 +05:30
alsum
c967767b7a
showing-table-header-in-webform
2018-08-13 17:20:46 +02:00
alsum
bb7a6ed82e
Merge branch 'develop' of https://github.com/frappe/frappe into develop
2018-08-13 17:14:53 +02:00
Mohamed_Alsum
364b09e3d6
adding time to total_row in reports ( #5961 )
...
* allow null when time field is not required
* Update base_document.py
* adding time to total_row
2018-08-13 10:31:38 +05:30
alsum
9ba9468c50
adding time to total_row
2018-08-12 11:30:05 +02:00
alsum
cb4e4505ad
Merge branch 'develop' of https://github.com/frappe/frappe into develop
2018-08-12 11:22:16 +02:00
Faris Ansari
bf6e589e44
Merge pull request #5958 from chdecultot/print_format_builder
...
Print format builder translations
2018-08-11 12:18:02 +05:30
Charles-Henri Decultot
1e5edc9a11
Print format builder translations
2018-08-10 16:49:57 +00:00
Nabin Hait
2f49806cec
fix(init): get_cached_value ( #5956 )
2018-08-10 19:01:35 +05:30
Zarrar
146c795496
minor dialog button fix ( #5955 )
2018-08-10 18:17:43 +05:30
