Commit graph

28858 commits

Author SHA1 Message Date
Prssanna Desai
2f46febe27
Merge pull request #12269 from shariquerik/auto-email-report-fix 2021-02-01 19:04:05 +05:30
Saurabh
d120ca7f9e
fix: validate user perms if user has select perm (#12289) 2021-02-01 17:43:24 +05:30
mergify[bot]
9656ef3940
Merge pull request #12214 from nextchamp-saqib/default-desk-page
feat: ability to set default desk page
2021-02-01 07:22:45 +00:00
Fisher Yu
2b01fb091f
fix: Translation related issues (#11932)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-01 11:06:49 +05:30
Suraj Shetty
19428f2303
chore: Update CODEOWNERS 2021-02-01 10:39:53 +05:30
mergify[bot]
30eadcc55b
Merge pull request #12279 from netchampfaris/homepage-no-cache-dev
fix: Dont cache homepage in development
2021-01-29 03:08:23 +00:00
Faris Ansari
4ffd3c1743 fix: Dont cache homepage in development 2021-01-28 23:41:18 +05:30
Suraj Shetty
6f774d6d0c
fix: Check for fieldlevel permission for report query (#12163)
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2021-01-28 17:14:47 +05:30
shariquerik
57a2597c7e fix: updated the modified timestamp 2021-01-28 15:59:42 +05:30
Deepesh Garg
bcd1ad446d
feat: Module Profiles (#12148)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-28 14:58:49 +05:30
Prssanna Desai
f185d869f3
Merge pull request #12224 from ollyboy/frappe_dev_ob 2021-01-28 14:01:04 +05:30
Prssanna Desai
36fcc1d55b
fix: use frappe.parse_json 2021-01-28 13:58:01 +05:30
mergify[bot]
62d08005aa
Merge pull request #12209 from marination/nested-doc-user-perms
feat: Hide Child Records for a Nested DocType via User Permissions
2021-01-28 05:49:30 +00:00
mergify[bot]
f221e668ed
Merge pull request #12257 from pateljannat/user-mandatory-in-change-user-dialog
fix: user mandatory in change user dialog
2021-01-28 04:55:31 +00:00
shariquerik
a2f91640d9 fix: Auto Email Report Bad UI for Email To 2021-01-27 12:17:49 +05:30
ollyboy
b2fbcacfd4 #12224 improve 2021-01-26 18:32:34 +00:00
mergify[bot]
569995f5a4
Merge pull request #12152 from scmmishra/fix-reset-customizations
fix: Reset customizations don't get committed
2021-01-26 04:52:44 +00:00
Suraj Shetty
c340f17083
Merge branch 'develop' into fix-reset-customizations 2021-01-26 09:56:55 +05:30
Suraj Shetty
0363d787e1
Merge branch 'develop' into default-desk-page 2021-01-26 09:55:18 +05:30
Suraj Shetty
e1c84560dc
Merge branch 'develop' into nested-doc-user-perms 2021-01-26 09:54:55 +05:30
mergify[bot]
8efdc078dd
Merge pull request #12263 from pilou-/travis_fix_regex_sed_command
ci: fix a regex used in Travis config
2021-01-25 10:52:56 +00:00
Pierre-Louis Bonicoli
a4396a83d0
ci: fix a regex used in Travis config
Fix this line in Procfile:

	redis_# socketio: redis-server config/redis_socketio.conf
2021-01-25 11:10:30 +01:00
Suraj Shetty
a2fba77116
fix: Skip translation of gender while creating it (#12260) 2021-01-25 15:37:37 +05:30
mergify[bot]
b4b009326b
Merge pull request #12133 from nextchamp-saqib/email-account-signature-fix
feat: fetch email account signature in email dialog
2021-01-25 07:11:41 +00:00
mergify[bot]
e111f353a4
Merge pull request #12202 from hasnain2808/fix-links-html-report
fix(Auto Email Report): HTML download of auto email report breaks for columns with link field type
2021-01-25 06:20:20 +00:00
pateljannat
e9e99f20c3 fix: user mandatory in change user dialog 2021-01-23 19:11:45 +05:30
mergify[bot]
32d32aed81
Merge pull request #12249 from gavindsouza/get-datetime-in-timezone
feat: Util to get datetime in specific timezone
2021-01-22 08:42:32 +00:00
Saqib
bbc16f5866
fix: error message
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2021-01-22 13:19:32 +05:30
Gavin D'souza
9b59b59e44 test: Update TestNewsletter.test_unsubscribe
* Update selecting email to unsubscribe email logic
* style fixes
2021-01-22 13:13:50 +05:30
Marica
aad9610b78
fix: checkbox label in UP List View Dialog
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-22 12:18:25 +05:30
Prssanna Desai
fe77c3c321
Merge pull request #12240 from shariquerik/collapsible-geolocation-fix 2021-01-22 11:50:41 +05:30
Shariq Ansari
5c9cc655cf
fix: Insufficient Permission for Leads > Dashboard Chart (#12243)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-22 11:50:04 +05:30
mergify[bot]
5461773259
Merge pull request #12248 from frappe/snyk-fix-f40a8131737dbb81805c07d9a1c531e0
fix(Snyk): Security upgrade PyYAML from 5.3.1 to 5.4
2021-01-22 06:18:22 +00:00
Gavin D'souza
0de38fe011 Merge branch 'develop' of github.com:frappe/frappe into get-datetime-in-timezone 2021-01-22 11:24:56 +05:30
Saqib Ansari
98b293b759 fix: validate single default page 2021-01-21 19:02:50 +05:30
marination
4887dd1d5a chore: Rename 'Exclude Descendants' to 'Hide Descendants'
- Rename 'Exclude Descendants' to 'Hide Descendants'
- Rename js trigger to 'toggle_hide_descendants'
2021-01-21 18:48:25 +05:30
Gavin D'souza
16f2b29cb3 style: Trim extra whitespace 2021-01-21 13:19:31 +05:30
Gavin D'souza
33ea496a8b feat: Added get_datetime_in_timezone in frappe.utils to get datetime in specific timezones
* Added util in safe_exec to access via Server Scripts and System
Console
2021-01-21 13:19:31 +05:30
Saqib Ansari
deac394c01 chore: add description 2021-01-21 12:51:31 +05:30
Rucha Mahabal
08b090ed73 Merge branch 'develop' into nested-doc-user-perms 2021-01-21 10:57:45 +05:30
snyk-bot
19c6e0218d
fix: requirements.txt to reduce vulnerabilities
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PYYAML-590151
2021-01-20 22:57:25 +00:00
mergify[bot]
d89ea9ee60
Merge pull request #12176 from nextchamp-saqib/grid-row-refresh-fix
fix: cannot refresh grid_row
2021-01-20 18:08:55 +00:00
Raffael Meyer
f47d2c32b1
feat: Add translation context (#12043)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-01-20 23:14:18 +05:30
Suraj Shetty
723436ca50
Merge branch 'develop' into grid-row-refresh-fix 2021-01-20 23:11:45 +05:30
mergify[bot]
bd20905818
Merge pull request #12188 from prssanna/grid-form-keyboard-nav
fix: grid row index no longer dependant on doc index for keyboard navigation
2021-01-20 17:41:38 +00:00
mergify[bot]
9c214c836b
Merge pull request #12226 from hasnain2808/fix--hide-theme-url
fix: hide theme url
2021-01-20 09:56:12 +00:00
robert kimutai
9591d01c2c
chore: Update CONTRIBUTING.md (#12241) 2021-01-20 15:22:12 +05:30
shariquerik
bddb7034cf fix: Geolocation field with Column Break & Section Break (Collapsible) does not seems to work. 2021-01-19 22:36:33 +05:30
shariquerik
099474a441 Revert "Link Field Validation doesn't use Filter criteria defined for link field"
This reverts commit 962fff15c4.
2021-01-19 22:29:30 +05:30
shariquerik
bcae1cc294 revert 2021-01-19 22:29:23 +05:30