Commit graph

25723 commits

Author SHA1 Message Date
prssanna
f7f2be5926 fix: rename function 2020-06-01 10:51:38 +05:30
prssanna
17bb72d234 fix: check if filter config exists 2020-06-01 10:51:38 +05:30
prssanna
2ebf67af39 fix: remove freeze 2020-06-01 10:51:38 +05:30
prssanna
548813af69 fix: fieldtype doesn't change on condition change 2020-06-01 10:51:38 +05:30
prssanna
4b2d730a8c fix: variable naming 2020-06-01 10:51:38 +05:30
prssanna
6495ee2426 style: fix formatting 2020-06-01 10:51:38 +05:30
prssanna
2fcd8c2905 fix: move timespan function to data.py 2020-06-01 10:51:38 +05:30
prssanna
f0d62d4007 fix: all periods in timespan filter 2020-06-01 10:51:38 +05:30
prssanna
4c16b2a608 feat: api to get additional filters 2020-06-01 10:51:38 +05:30
prssanna
53e2e60cab feat: filter for current timespan 2020-06-01 10:51:38 +05:30
Mathieu Brunot
c8928aa774
fix: File upload fallback (#10163)
Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
2020-06-01 10:14:04 +05:30
mergify[bot]
62f1d92966
Merge pull request #10233 from gavindsouza/site-wise-logging
feat: Site wise logging
2020-06-01 03:49:29 +00:00
mergify[bot]
ab9566c6ff
Merge pull request #10473 from prssanna/workflow-action-fix
fix: add update_after_submit to actions while setting workflow state
2020-06-01 03:32:02 +00:00
Suraj Shetty
9cc1589926
Merge branch 'develop' into workflow-action-fix 2020-06-01 08:50:39 +05:30
sahil28297
1026272328
Merge pull request #10541 from scmmishra/breadcrumb-fix-desk
fix: breadcrumb routing bug for desk pages
2020-05-31 13:54:11 +05:30
mergify[bot]
1df1abf4f9
Merge pull request #10540 from gavindsouza/dont-always-be-runnin-travis
perf: We don't need to run Cypress tests for a README update
2020-05-30 15:30:06 +00:00
mergify[bot]
33882c0bf2
Merge pull request #10547 from theopen-institute/oi-custom-field-warning
fix(custom): Added warning if field with same fieldname already exists
2020-05-30 10:46:06 +00:00
mergify[bot]
57431df6d1
Merge pull request #10537 from scmmishra/fix-apply-filter-when-routing
fix: shortcut routing and filters
2020-05-30 09:54:05 +00:00
theopen-institute
e8a0b5b873
Update frappe/custom/doctype/custom_field/custom_field.py
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-05-30 14:34:27 +05:45
theopen-institute
b1dd6f8545 Added warning if field with same fieldname already exists in doctype when creating custom field 2020-05-30 07:34:51 +05:45
Gavin D'souza
a3d64fb4c5 fix: use fallback attr for web logging 2020-05-29 16:51:07 +05:30
Gavin D'souza
d13a217db8 fix: check if request status code is ok instead of specific codes 2020-05-29 16:46:13 +05:30
Gavin D'souza
fe387a24d8 fix: synatx errors from manual bash script runs 2020-05-29 16:31:49 +05:30
Gavin D'souza
000864b12c chore: travis builds as needed
Co-authored-by Suraj Shetty <surajshetty3416@gmail.com>
2020-05-29 16:16:40 +05:30
Shivam Mishra
71442033c4 fix: breadcrumb routing bug for desk pages 2020-05-29 15:14:18 +05:30
Gavin D'souza
f71585ec74 Merge branch 'develop' of github.com:frappe/frappe into site-wise-logging 2020-05-29 14:56:29 +05:30
Faris Ansari
a7f941bcd9
fix: Better logging if form script handler throws (#10536) 2020-05-29 13:17:14 +05:30
Shivam Mishra
a6bf1bd979 fix: don't show count for empty filter 2020-05-29 13:14:40 +05:30
Shivam Mishra
5793be6565
chore: cleanup website desk pages (#10519) 2020-05-29 13:11:26 +05:30
Shivam Mishra
447b3f65c8 feat: minor linting fixes 2020-05-29 13:05:51 +05:30
Shivam Mishra
b3e22411b9 fix: save filter JSON only if it is not empty 2020-05-29 13:01:01 +05:30
Shivam Mishra
2e0c8ed069 fix: set route options before navigating 2020-05-29 12:56:07 +05:30
Mangesh-Khairnar
7a6746bf32
fix(google-contacts): add additional params to prevent rate limiting (#10491) 2020-05-29 11:42:34 +05:30
Himanshu
560e1f2c1d
Merge pull request #10256 from hrwX/dont_create_contacts
fix(Communication): do not create contacts if unchecked
2020-05-29 11:11:54 +05:30
mergify[bot]
08eb3fc991
Merge pull request #10410 from netchampfaris/commit-auto-updated-files
fix: Commit auto-updated files
2020-05-29 04:03:08 +00:00
Prssanna Desai
b6011e752b
fix(Email): include Text in fieldtypes to sanitize (#10525) 2020-05-29 09:12:24 +05:30
sahil28297
04c9f58e02
Merge pull request #10523 from frappe/mergify/bp/develop/pr-10522
refactor: handle exception in syncing dashboard (bp #10522)
2020-05-28 18:43:50 +05:30
Prssanna Desai
18c2944c25
Merge pull request #10527 from prssanna/report-charts-fix
fix: check chart type before setting report object
2020-05-28 18:41:14 +05:30
prssanna
ed139a3b1d fix: check chart type before setting report object 2020-05-28 18:26:13 +05:30
Shivam Mishra
073c5379d3 refactor: handle exception in syncing dashboard (#10522)
(cherry picked from commit e222961b33)
2020-05-28 09:46:12 +00:00
mergify[bot]
4fbdc8621c
Merge pull request #10521 from prssanna/user-profile-chart-fix
fix: don't include review type energy points in chart
2020-05-28 09:23:34 +00:00
prssanna
6ff529d0b1 fix: don't include review type energy points in chart 2020-05-28 14:18:33 +05:30
rohitwaghchaure
f804773e10
Merge pull request #10507 from prssanna/dynamic-date-chart-filters
fix: set default values for report chart date filters
2020-05-28 12:54:07 +05:30
prssanna
1515465df3 fix: don't show dynamic filters in dialog 2020-05-28 12:37:02 +05:30
prssanna
f8b3b818df fix: also set required filters 2020-05-28 12:36:34 +05:30
mergify[bot]
adabe61220
Merge pull request #10505 from frappe/barredterra-patch-1
fix: localize display of duration
2020-05-28 06:07:14 +00:00
Suraj Shetty
04c22e99bc
Merge branch 'develop' into barredterra-patch-1 2020-05-28 10:58:09 +05:30
Suraj Shetty
08ccc4eb2d
Merge branch 'develop' into workflow-action-fix 2020-05-28 10:09:53 +05:30
Suraj Shetty
273c132e07
Merge branch 'develop' into commit-auto-updated-files 2020-05-28 10:09:35 +05:30
mergify[bot]
a4a49664a4
fix: driver find element by fieldname (bp #10494) (#10500)
(cherry picked from commit e3e7d67844)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2020-05-28 10:08:59 +05:30