Commit graph

23919 commits

Author SHA1 Message Date
Suraj Shetty
d73f8d85db
style: Fix formatting & remove unnecessary comment 2020-04-01 22:18:23 +05:30
Kenneth Sequeira
1413505422 fix syntax 2020-04-01 20:57:24 +05:30
Kenneth Sequeira
abbd920320 add comments for separation logic 2020-04-01 20:37:00 +05:30
Kenneth Sequeira
27074e95da improve error message for logged out user 2020-04-01 18:56:30 +05:30
mergify[bot]
e61dae862c
Merge pull request #9698 from nabinhait/contact-enqueue-fix
fix: Do not enqueue contact creation if in test
2020-03-23 08:29:08 +00:00
Suraj Shetty
c891eda8c3 style: Fix import issue 2020-03-23 13:46:58 +05:30
Suraj Shetty
699e6f8d4c test: Delete contact phone and and contact email while deleting contact 2020-03-23 13:33:21 +05:30
mergify[bot]
2f24671030
Merge pull request #9711 from scmmishra/cache-fix
refactor: improve caching for desk
2020-03-23 05:15:03 +00:00
Suraj Shetty
f6244d2740
style: Remove unnecessary space 2020-03-23 10:30:10 +05:30
mergify[bot]
e075fd0e97
Merge pull request #9756 from deepeshgarg007/toggle_filter
feat: Utility to toggle filter display in reports
2020-03-23 04:48:44 +00:00
Deepesh Garg
b8e8bbdb9b fix: Use toggle class instead of add and remove class 2020-03-23 08:57:13 +05:30
mergify[bot]
0faadc4126
Merge pull request #9754 from Thunderbottom/redirect-xss-fix
fix: sanitise xss on url redirect-to args
2020-03-21 07:30:38 +00:00
Chinmay D. Pai
d78587e6c5
chore: codacy fixes
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-21 02:00:47 +05:30
Chinmay D. Pai
86c72e0b99
fix: pass all redirect-to args through sanitise_redirect
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-21 01:53:22 +05:30
Chinmay D. Pai
1c56481ce8
fix: sanitise xss on url redirect-to args
add function to sanitise redirect-to url arguments to prevent xss

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-21 01:36:46 +05:30
Deepesh Garg
f7b57994ff feat: Utility to toggle filter display in reports 2020-03-20 22:11:58 +05:30
Prssanna Desai
5eb057f410
Merge pull request #9750 from scmmishra/disable-sorting
feat: disable sortable on dashboard
2020-03-20 20:51:57 +05:30
Shivam Mishra
641892b0cc feat: disable sortable on dashboard 2020-03-20 19:44:14 +05:30
mergify[bot]
1e07ff2c4c
Merge pull request #9749 from scmmishra/res-fix-dash
fix: responsive dashboards
2020-03-20 14:04:45 +00:00
Prssanna Desai
6a4292357e
Merge pull request #9729 from scmmishra/breadcrumb-fix
refactor: Remove modules view
2020-03-20 19:11:12 +05:30
Shivam Mishra
3f1ba29620 fix: responsive chart widget in desk 2020-03-20 19:04:00 +05:30
Shivam Mishra
17f25fafcb fix: responsive dashboards 2020-03-20 19:01:45 +05:30
Prssanna Desai
1c243cd90d
Merge pull request #9693 from scmmishra/dashboard-enhancements
feat: use widgets to make dashboards
2020-03-20 18:30:36 +05:30
mergify[bot]
7ba65ac071
Merge pull request #9748 from sahil28297/fix_gcalendar_develop
fix(patch): delete depricated GCalendar
2020-03-20 12:02:57 +00:00
sahil28297
c615042d25
fix: develop version as 12.0.0.dev instead of 12.1.0 (#9746)
* fix:  develop version as 12.x.x instead of 12.1.0

* fix: develop version as 12.0.0.dev

* fix: develop version as 12.0.0-dev
2020-03-20 16:10:58 +05:30
prssanna
de1d8d0acd fix: hide summary if no data 2020-03-20 15:36:39 +05:30
prssanna
1abc0264c0 fix: missing return statement 2020-03-20 15:32:43 +05:30
Shivam Mishra
f79603e47b refactor: use after_ajax to return filters 2020-03-20 15:27:44 +05:30
prssanna
20994a4e18 fix: ignore prepared report for report type charts 2020-03-20 15:18:34 +05:30
Shivam Mishra
ea9f5dcfc1 fix: after_ajax should resolve the function 2020-03-20 15:14:10 +05:30
Sahil Khan
0e627ab14d fix(patch): delete depricated GCalendar 2020-03-20 15:10:08 +05:30
Shivam Mishra
6afe5552c5 fix (codacy): linitng fixes 2020-03-20 13:23:40 +05:30
Shivam Mishra
0bfcd4d574 fix: better logic for managing UI states 2020-03-20 12:29:11 +05:30
Shivam Mishra
6721a4274d feat: hide title when date range field is shown for half width widget 2020-03-20 11:43:33 +05:30
Shivam Mishra
26d9a378e1 fix: improved grid rules 2020-03-20 11:28:16 +05:30
Shivam Mishra
f8cfe70b30 refactor (style): format code 2020-03-20 11:27:53 +05:30
Shivam Mishra
07f1427bdd fix: default chart label 2020-03-20 11:27:25 +05:30
Shivam Mishra
7f3b14f9f4 refactor (style): format code 2020-03-20 11:27:15 +05:30
Shivam Mishra
52ae6bda7b fix: dashboard filters spacing 2020-03-20 11:17:43 +05:30
Shivam Mishra
9c42d0f5d6 refactor: remove size option 2020-03-20 10:05:15 +05:30
Suraj Shetty
d2ac08531f
Merge branch 'develop' into contact-enqueue-fix 2020-03-19 22:38:22 +05:30
Shivam Mishra
ba10ca1a99 refactor: remove code for loading state 2020-03-19 19:12:13 +05:30
Suraj Shetty
b7b27590e6
Merge pull request #9740 from frappe/revert-9658-customize-form-fix
revert: "feat: change fieldtype in db with customize form"
2020-03-19 13:36:11 +05:30
Suraj Shetty
8c9d55edca
Revert "feat: change fieldtype in db with customize form" 2020-03-19 13:25:54 +05:30
Shivam Mishra
b6e6d274f7 fix (codacy): added semicolon 2020-03-19 10:30:40 +05:30
Marica
ce5eaf9119
fix: Handling datetime objects in Data Import Beta (#9656)
* fix: Handling datetime objects in Data Import

Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>

* fix: Avoid calling parse_date_format if already datetime.

* fix: Changed type check to isinstance and syntactical improvements

* chore: use predefined datetime format

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

* chore: fix deepsource issues

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-03-18 22:02:50 +05:30
Shivam Mishra
5fb0cb3c43 feat: added loading state and empty state 2020-03-18 19:31:37 +05:30
Shivam Mishra
05599645c8 refactor: commonify fetch and render 2020-03-18 18:59:30 +05:30
mergify[bot]
a54a059eb3
Merge pull request #9400 from surajshetty3416/fix-trigger-doc-events
feat: Trigger doc events while updating doc from notification
2020-03-18 13:12:45 +00:00
Shivam Mishra
3ac988441b refactor: better variable names 2020-03-18 18:30:55 +05:30