Commit graph

27852 commits

Author SHA1 Message Date
Faris Ansari
d1b92c66bb fix: eager lookup 2020-10-12 17:36:44 +05:30
Faris Ansari
a113f5c285 fix: add test strings 2020-10-12 17:28:21 +05:30
Faris Ansari
5cf39f746a chore: Check existence of words in translation linter 2020-10-12 17:26:36 +05:30
Suraj Shetty
f2ef686797
Merge pull request #11689 from surajshetty3416/replace-template-syntax-for-translations 2020-10-12 17:18:36 +05:30
Suraj Shetty
198e255710
fix: Replace invalid translations
Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2020-10-12 16:04:27 +05:30
loyapeb-ishan
6b939d7841
fix(translations): Marathi translation correction (#11672)
Correct translation for No vs No. (number) in Marathi
2020-10-12 14:15:20 +05:30
mergify[bot]
d2a37dca0f
Merge pull request #11691 from ruchamahabal/fix-communication
fix: First Response Time not getting set when sender is Administrator
2020-10-12 08:38:48 +00:00
Rucha Mahabal
7c4ce7b6e7 fix: First Response Time not getting set when sender is Administrator 2020-10-12 13:46:24 +05:30
mergify[bot]
3b2de947c5
Merge pull request #11676 from scmmishra/fix-int-validation
fix: int validation
2020-10-12 08:06:44 +00:00
Suraj Shetty
9f8fcfe065
feat(Assignment Rule): Option to set custom due_date for assignments (#11669) 2020-10-12 13:30:04 +05:30
Suraj Shetty
89f97257dd fix: Replace incorrect translation syntax usages 2020-10-12 12:26:38 +05:30
Suraj Shetty
23bbbb1bbd chore: Consider template string as invalid 2020-10-12 11:34:51 +05:30
Suraj Shetty
b2ae8b16ae style: Format capture.js
- Replace one invalid translation syntax usage
2020-10-12 11:32:17 +05:30
mergify[bot]
e16a49f496
Merge pull request #11610 from prssanna/grid-upload
fix: convert float type fields from string to float in grid upload
2020-10-12 05:43:40 +00:00
Suraj Shetty
73d1c249cc
Merge branch 'develop' into grid-upload 2020-10-12 10:57:33 +05:30
Suraj Shetty
c4e119338c
fix(report): Always add name & docstatus field to avoid permission error (#11644) 2020-10-12 09:17:09 +05:30
Suraj Shetty
a147e45d0c fix: Replace incorrect translation syntax usages 2020-10-11 22:08:22 +05:30
Frappe PR Bot
7cfa4d59e9
chore: Update translations (#11681)
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
2020-10-10 22:10:02 +05:30
mergify[bot]
622ef2ce31
Merge pull request #11682 from walstanb/fix-list-sidebar
fix(UI): fixed toggle sidebar on md devices
2020-10-10 13:31:38 +00:00
Walstan
4b4ebf6ab6 fix(UI): fixed toggle sidebar on md devices 2020-10-10 18:25:38 +05:30
gavin
c146363162
Merge pull request #11679 from gavindsouza/db-query-incl
fix: Add provision for quotes in DatabaseQuery.prepare_args
2020-10-09 20:26:50 +05:30
Gavin D'souza
b00a389cfd fix: Add provision for quotes in DatabaseQuery.prepare_args 2020-10-09 19:40:45 +05:30
Shivam Mishra
82dca893ba
Merge pull request #11674 from scmmishra/fix-customizations-saved-twice 2020-10-09 17:08:44 +05:30
Shivam Mishra
4072b69f6e chore: formatting fixes 2020-10-09 14:27:03 +05:30
Shivam Mishra
3886d9cfb7 feat: override validation for Int 2020-10-09 14:26:50 +05:30
Shivam Mishra
7edf72b9b0 chore: formatting fixes 2020-10-09 12:35:38 +05:30
Shivam Mishra
9511fcc002 fix: freeze DOM on call 2020-10-09 12:35:29 +05:30
mergify[bot]
f4aa4bb9ae
Merge pull request #11665 from scmmishra/feat-hide-public-stack-traces
feat: hide public stack traces
2020-10-09 07:05:26 +00:00
Suraj Shetty
948ace900b
style: Use tab instead of spaces 2020-10-09 10:42:10 +05:30
Snyk bot
f004b0592d
chore: Security upgrade rsa from 4.0 to 4.1 (#11671)
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-RSA-570831
2020-10-09 10:26:33 +05:30
Faris Ansari
0bf1c61356
Merge pull request #11663 from netchampfaris/regenerate-theme-on-migrate
fix: Regenerate active theme on migrate
2020-10-08 23:51:52 +05:30
Shivam Mishra
035df47fba feat: show traceback by default for dev server 2020-10-08 14:53:57 +05:30
Shivam Mishra
0a082e2add feat: don't show traceback to users 2020-10-08 14:50:09 +05:30
Snyk bot
b720726207
chore: Update passlib to fix security issue (#11664)
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-PASSLIB-569603

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-10-08 09:59:20 +05:30
Prssanna Desai
9546b58183
fix(Query Report): set df options for custom column (#11612) 2020-10-08 09:57:05 +05:30
Faris Ansari
594abc941d fix: Regenerate active theme on migrate 2020-10-07 21:51:46 +05:30
mergify[bot]
194ac4420e
Merge pull request #11658 from marination/db-query
fix: Provision for 'distinct' keyword in prepare_args
2020-10-07 11:26:27 +00:00
marination
22b013364e fix: Test for 'distinct' keyword 2020-10-07 16:04:29 +05:30
marination
d39216b273 fix: Select only last 3 args 2020-10-07 15:46:39 +05:30
Gavin D'souza
25e8d8f8cc fix(restore): Add option help 2020-10-07 13:31:30 +05:30
Michelle Alva
00ee7f27b0
fix: Allow creation of Energy Point Log (#11651)
* fix: Enable in_create for Energy Point Log

* fix: enable in_create

* fix: remove in_create
2020-10-06 16:16:08 +00:00
mergify[bot]
30eb9f15b1
Merge pull request #11652 from adityahase/fix-pluck
fix(db_query): Allow plucking a field without having to add it to the fields list
2020-10-06 13:20:22 +00:00
Aditya Hase
e6c16f3184
fix(db_query): Allow plucking a field without having to add it to the fields list
e.g.

frappe.get_all("ToDo", pluck="owner")

Didn't work before, instead

frappe.get_all("ToDo", fields=["owner"], pluck="owner")

was needed
2020-10-06 18:32:43 +05:30
Aditya Hase
fa2c320c49
test(db_query): Test for pluck syntax 2020-10-06 18:27:19 +05:30
mergify[bot]
ed69130c9c
Merge pull request #11646 from netchampfaris/context-enhancments
fix: Website context enhancements
2020-10-06 11:41:20 +00:00
Faris Ansari
2f11272308
Merge pull request #11649 from netchampfaris/web-template-empty-value-fix
fix(web-template): handle None values
2020-10-06 15:49:10 +05:30
Faris Ansari
566cceb397 fix(web-template): handle None values 2020-10-06 15:48:30 +05:30
mergify[bot]
c2f780e26e
Merge pull request #11647 from deepeshgarg007/test_fix
fix: Ignore hash collision count limit in tests
2020-10-06 07:47:05 +00:00
Deepesh Garg
7b404a835b fix: Ignore hash collosion count limit in tests 2020-10-06 12:55:09 +05:30
mergify[bot]
d9ea359c02
Merge pull request #11639 from scmmishra/fix-patch-reload
fix: web template field doctype not reloaded
2020-10-06 06:07:21 +00:00