Commit graph

26122 commits

Author SHA1 Message Date
Himanshu
16f5e48fcb
Update calendar.js 2020-06-17 14:12:44 +05:30
Anupam K
443edf209a calendar view fix 2020-06-17 14:02:30 +05:30
Anupam K
a3ab33f4da sider fix 2020-06-17 13:44:51 +05:30
Anupam K
57f4c63252 calendar view allDay fix 2020-06-15 12:34:12 +05:30
rohitwaghchaure
517a3f5e32
Merge pull request #10679 from surajshetty3416/fix-query-report-filter-random-failure
fix: Refactor report settings selection to avoid random failure
2020-06-15 10:42:55 +05:30
Suraj Shetty
2bbe449717 fix: Refactor report settings selection to avoid random failure 2020-06-14 19:16:17 +05:30
mergify[bot]
035b31c4c4
Merge pull request #10675 from ruchamahabal/fix-dashboard-chart-permission-query
fix: permission query for dashboard chart and number card
2020-06-14 10:47:37 +00:00
Rucha Mahabal
db4166279e fix: permission query for number card 2020-06-14 15:20:53 +05:30
mergify[bot]
a9cf1634b6
Merge pull request #10624 from prssanna/list-view-scroll
fix: disable scroll to top for list view
2020-06-13 15:09:24 +00:00
Suraj Shetty
280e86a446
Merge branch 'develop' into list-view-scroll 2020-06-13 20:22:46 +05:30
Suraj Shetty
62661704d3
feat: Show phone icon if phone call handler is available (#10626) 2020-06-13 20:21:09 +05:30
Rucha Mahabal
fa7faf4fe6 fix: permission query for dashboard chart 2020-06-13 18:23:23 +05:30
mergify[bot]
02e2a3abc3
Merge pull request #10662 from scmmishra/fix-get-config
fix: catch all exception in get_config
2020-06-13 12:28:03 +00:00
mergify[bot]
807c9d9da0
Merge pull request #10640 from scmmishra/fix-button-layout
fix: button layout for hero
2020-06-13 12:27:09 +00:00
mergify[bot]
7ba2ec8f93
Merge pull request #10665 from gavindsouza/update-google-auth
chore: update google-auth deps to avoid pinning indirect ones
2020-06-13 06:42:13 +00:00
mergify[bot]
d0b2cac0d3
Merge pull request #10672 from ruchamahabal/fix_email_error
fix: attribute error while handling email exception
2020-06-13 06:38:55 +00:00
Rucha Mahabal
e37cc9809d fix: attribute error while handling email exception 2020-06-13 11:43:50 +05:30
Gavin D'souza
979d917113 chore: update google-auth deps to avoid pinning indirect
deps

https://github.com/frappe/frappe/pull/10660
2020-06-12 16:45:30 +05:30
Shivam Mishra
a4e4b8ba26 fix: catch all exception in get_config 2020-06-12 15:54:24 +05:30
Faris Ansari
742d90a74e
fix: Reduce button top margin 2020-06-12 13:59:13 +05:30
Shivam Mishra
b8be8c3802 refactor: use styles instead of utilities 2020-06-12 13:05:31 +05:30
gavin
a95aa7adf1
fix: travis builds checks (via Python instead) (#10659) 2020-06-12 10:07:11 +05:30
mergify[bot]
3c630bf884
Merge pull request #10644 from scmmishra/notification-cascading-errors
fix: catch exceptions when sending notification
2020-06-12 04:01:08 +00:00
mergify[bot]
f70024e4b1
Merge pull request #10655 from AminovE99/feat/json_render
feat: Add json as a non-static format
2020-06-11 16:56:06 +00:00
mergify[bot]
1f973d6c30
Merge pull request #10658 from deepeshgarg007/custom_field_check
fix: Duplicate custom field check
2020-06-11 15:50:40 +00:00
Deepesh Garg
9a2a9555f7 fix: Duplicate custom field check 2020-06-11 21:00:17 +05:30
mergify[bot]
3a2ee06624
Merge pull request #10459 from hrwX/table_multiselect_filter
fix: filter table multiselect datalist
2020-06-11 13:39:05 +00:00
Shivam Mishra
7aa02b9ad4
fix: remove stray frappe.throw 2020-06-11 19:01:47 +05:30
Shivam Mishra
68c0450ac7
fix: better error title
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-06-11 13:30:39 +00:00
AminovE99
80678534f2
Add json render
Implemented opportunity to use jinja code inside json files.
2020-06-11 16:01:55 +03:00
mergify[bot]
2f14adb0b5
Merge pull request #10533 from netchampfaris/dib-fixes-2020-05-18
refactor: Data Import Beta
2020-06-11 12:20:47 +00:00
Suraj Shetty
6397af4e3c
Merge branch 'develop' into dib-fixes-2020-05-18 2020-06-11 15:59:41 +05:30
mergify[bot]
015ef15c77
Merge pull request #10647 from netchampfaris/fix-event-producer-test
test: Simplify Event Producer test
2020-06-11 10:26:35 +00:00
Rucha Mahabal
4135791e51 fix: reload doc after incoming change from consumer 2020-06-11 15:30:00 +05:30
Rucha Mahabal
5c7a9d28b8 fix: set send_welcome_email as 0 for user creation 2020-06-11 15:29:23 +05:30
Himanshu Warekar
25f09a87cb fix: check if custom filter exists 2020-06-11 14:43:11 +05:30
Himanshu Warekar
9e75cd246b Merge branch 'develop' of https://github.com/frappe/frappe into table_multiselect_filter 2020-06-11 14:30:44 +05:30
Rucha Mahabal
60dbf657f7 test: producer url 2020-06-11 14:11:03 +05:30
Rucha Mahabal
34704a2362 fix: reset configurations in Event Producer tests 2020-06-11 14:07:29 +05:30
Shivam Mishra
5f6a24b0af
fix: set default template for list (#10648) 2020-06-11 10:15:47 +05:30
Faris Ansari
2ec31e3f01 Merge branch 'develop' of https://github.com/frappe/frappe into dib-fixes-2020-05-18 2020-06-10 21:26:54 +05:30
Faris Ansari
44e67d0fac Merge branch 'develop' of https://github.com/frappe/frappe into fix-event-producer-test 2020-06-10 21:25:48 +05:30
Faris Ansari
3c8ba15bf6 test: Simplify Event Producer test 2020-06-10 21:23:55 +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
Shivam Mishra
6cbd5b6adc fix: catch exceptions when sending notification 2020-06-10 16:46:28 +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