Mangesh-Khairnar
|
0781d048d1
|
fix: add docs link to the settings page dashboard
|
2020-06-02 12:33:01 +05:30 |
|
Suraj Shetty
|
06c54f5322
|
Merge branch 'develop' into paytm-integration
|
2020-05-30 21:08:47 +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
|
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 |
|
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
|
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 |
|
mergify[bot]
|
1f01e4aba1
|
Merge pull request #10501 from karthikeyan5/develop-dropbox-large-file-fix
fix(dropbox): dropbox timeout for large files
|
2020-05-28 03:25:58 +00:00 |
|
rohitwaghchaure
|
43302171e5
|
Merge pull request #10509 from scmmishra/route-hook-after-submit-fix
fix: trigger after submit route hook after on_submit
|
2020-05-27 21:18:19 +05:30 |
|
Shivam Mishra
|
07df8b1083
|
fix: trigger after submit route hook after on_submit
|
2020-05-27 21:13:01 +05:30 |
|
prssanna
|
702268767d
|
fix: fetch date filters with default values set dynamically
|
2020-05-27 17:06:56 +05:30 |
|
Raffael Meyer
|
0396fd01dc
|
fix: write out abbreviation
|
2020-05-27 13:14:45 +02:00 |
|
Raffael Meyer
|
6fd172c8f3
|
fix: localize display of duration
Use [contextual translations](https://frappe.io/docs/user/en/translations#5-adding-context-for-a-string), so that d, h, m, s make any sense to translators.
|
2020-05-27 13:11:05 +02:00 |
|
mergify[bot]
|
5a0eceff46
|
Merge pull request #10498 from surajshetty3416/fix-shared-translation-bug-2
fix(translation): Update translation_map with user translation
|
2020-05-27 09:18:39 +00:00 |
|
mergify[bot]
|
fd8f781a54
|
Merge pull request #10502 from scmmishra/scroll-fix
fix (UX): set scrollbar to thin
|
2020-05-27 06:58:05 +00:00 |
|
mergify[bot]
|
4a56ae4557
|
Merge pull request #10248 from ruchamahabal/duration-control
feat: Duration Control
|
2020-05-27 06:53:46 +00:00 |
|
Shivam Mishra
|
30a8472140
|
feat: set scrollbar to thin
|
2020-05-27 12:03:47 +05:30 |
|
karthikeyan5
|
bba7336b6c
|
fix(dropbox): dropbox timeout for large files
|
2020-05-27 08:39:50 +05:30 |
|
Suraj Shetty
|
17963e9d71
|
Merge branch 'develop' into commit-auto-updated-files
|
2020-05-26 23:31:13 +05:30 |
|
Suraj Shetty
|
dcf83b8645
|
fix: Update translation_map with user translation
- Even while returning from cache
|
2020-05-26 23:03:59 +05:30 |
|
Shivam Mishra
|
366bffe3dc
|
Merge pull request #10493 from surajshetty3416/fix-shared-translation-bug
|
2020-05-26 14:27:03 +00:00 |
|
Suraj Shetty
|
55bdc08ddb
|
fix(translation): Do not share user translations
|
2020-05-26 19:23:03 +05:30 |
|
mergify[bot]
|
19c08eae14
|
Merge pull request #10490 from scmmishra/onb-delete
feat: patch to delete onboarding slide doctype
|
2020-05-26 07:15:27 +00:00 |
|
Shivam Mishra
|
84011d0bb7
|
feat: patch to delete onboarding slide doctype
|
2020-05-26 12:30:29 +05:30 |
|
mergify[bot]
|
3a76445892
|
Merge pull request #10486 from gavindsouza/new-site-cleanup-fix
fix: run cleanup only after new-site
|
2020-05-26 06:17:21 +00:00 |
|