gavin
dbff1de9ac
Merge pull request #16337 from alyf-de/dont-assign-variable-to-itself
...
refactor: don't assign variable to itself
2022-03-22 12:02:08 +05:30
mergify[bot]
aa42efe1de
Merge pull request #16363 from alyf-de/fullargspec
...
refactor: call getfullargspec only once
2022-03-22 06:24:28 +00:00
mergify[bot]
5e6955ba30
Merge pull request #16358 from shariquerik/attach-on-submitted-doc-fix
...
fix: Attach not working on submitted doc
2022-03-22 06:15:40 +00:00
Shariq Ansari
d30f9e1d78
fix: wait until attach is cleared before saving
2022-03-22 11:23:43 +05:30
Shariq Ansari
2d77379c13
Merge branch 'develop' into attach-on-submitted-doc-fix
2022-03-22 11:21:57 +05:30
mergify[bot]
a4f0344aaf
Merge pull request #16361 from alyf-de/fix-exists-pop
...
fix: copy dict before popping keys
2022-03-22 04:42:02 +00:00
mergify[bot]
d4175f673d
Merge pull request #16362 from alyf-de/delete_doc_if_exists
...
perf: exists is already checked in delete_doc
2022-03-22 04:41:17 +00:00
Suraj Shetty
6de9d13569
Merge pull request #16364 from surajshetty3416/auto-hide-page-head
2022-03-22 09:40:15 +05:30
Suraj Shetty
7a9536332e
feat: Hide page head while scrolling down
...
- To create more reading area in the form
2022-03-22 09:16:39 +05:30
barredterra
8cf2bf8953
refactor: call getfullargspec only once
2022-03-21 23:09:58 +01:00
barredterra
179c9f117c
perf: exists is already called in delete_doc
2022-03-21 21:12:05 +01:00
barredterra
44a7c0dd93
fix: copy dict before popping keys
2022-03-21 20:51:59 +01:00
barredterra
512c622487
test: make sure exists doesn't eat the doctype key
2022-03-21 20:51:35 +01:00
mergify[bot]
6dfd279863
Merge pull request #16336 from hrwX/fix_parse_email_test
...
chore: prefix test for parse_email
2022-03-21 18:17:54 +00:00
Suraj Shetty
a1664330a7
Merge pull request #16344 from frappe/mergify/bp/develop/pr-16239
2022-03-21 20:49:33 +05:30
Shariq Ansari
5c6c9bb5c4
fix: resolved conflicts in database.py
2022-03-21 18:16:54 +05:30
Shariq Ansari
d97c7e7caf
fix: resolved conflicts in permissions.py
2022-03-21 18:05:01 +05:30
Shariq Ansari
aa0d10fe0e
fix: First set in model then save attachment
2022-03-21 17:24:18 +05:30
mergify[bot]
367e3fdb4e
Merge pull request #16357 from tirkarthi/fix-assert-1
...
test: Use assertEqual instead of assertEquals for Python 3.11 compatibility.
2022-03-21 11:43:56 +00:00
Karthikeyan Singaravelan
880832671a
fix: use assertEqual instead of assertEquals for Python 3.11 compatibility
2022-03-21 11:05:43 +00:00
Suraj Shetty
47d9f0573d
Merge pull request #16353 from frappe/mergify/bp/develop/pr-16018
2022-03-21 15:18:55 +05:30
Sagar Vora
810867a0d5
fix: merge conflict
2022-03-21 14:18:58 +05:30
Isaiah Galorport
dbb622fce1
fix: Other user must not able to delete other user's comment except System Manager ( #16018 )
...
* fix: Other user must not able to delete other user's comment except Admin
* Update frappe/public/js/frappe/form/footer/form_timeline.js
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* fix: Close condition scope
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit e4137ca8a1bea4e35358e0ba9844042c3e4d334a)
# Conflicts:
# frappe/public/js/frappe/form/footer/form_timeline.js
2022-03-21 08:45:03 +00:00
mergify[bot]
3c37944f44
Merge pull request #16334 from ankush/exists_go_brrr
...
perf: limit rows to 1 for `get_value` and `exists`
2022-03-21 08:31:50 +00:00
Ankush Menat
1054a1203e
fix: assinging thread locals to global variables
2022-03-21 12:23:47 +05:30
Ankush Menat
a832aa27af
chore: whitespace
2022-03-21 11:26:36 +05:30
Shariq Ansari
fbac6fbfb4
fix: only remove \n\t from start and end
...
(cherry picked from commit 7bb172365f2c9ae6cca98ccc4dfee7714b9c3f0c)
# Conflicts:
# frappe/database/database.py
2022-03-21 05:50:58 +00:00
Shariq Ansari
b2c0bf7a4e
fix: remove tab \t and newlines \n from start of query and remove from middle
...
(cherry picked from commit ac5effc7dd4d876d06daf945f0b8b77ecdd0c05f)
# Conflicts:
# frappe/database/database.py
2022-03-21 05:50:57 +00:00
Shariq Ansari
10fbb4330a
fix: setting permissions to any role of some doctypes is not working
...
(cherry picked from commit 6612232babd61852e90ccfc2ca836397d80506cf)
# Conflicts:
# frappe/permissions.py
2022-03-21 05:50:56 +00:00
Ankush Menat
85428e817d
test: get_value(s) with limits
2022-03-21 11:19:28 +05:30
Ankush Menat
b97cfed6d7
perf: limit rows to 1 for get_value and exists
2022-03-21 11:19:28 +05:30
mergify[bot]
f47331cd1d
Merge pull request #16200 from alyf-de/refactor-db-exists
...
refactor: `frappe.db.exists`
2022-03-21 05:47:27 +00:00
mergify[bot]
9032cb25fe
Merge pull request #16220 from pateljannat/web-form-list-empty-state
...
fix: web form list empty state
2022-03-21 05:42:07 +00:00
mergify[bot]
49621746b7
Merge pull request #16213 from pateljannat/web-form-list-button
...
fix: web form list button
2022-03-21 05:19:43 +00:00
Suraj Shetty
afd5956e31
style: Fix formatting
2022-03-21 10:39:52 +05:30
Jannat Patel
039566a81b
Merge branch 'develop' into web-form-list-button
2022-03-21 10:23:08 +05:30
Jannat Patel
d5b62d4d2d
Merge branch 'develop' into web-form-list-empty-state
2022-03-21 10:22:53 +05:30
mergify[bot]
2c5a0b084e
Merge pull request #16338 from alyf-de/remove-useless-fallback
...
refactor: remove unused fallback value
2022-03-21 04:44:20 +00:00
barredterra
f650408daa
refactor: use frappe.parse_json
2022-03-20 18:02:44 +01:00
mergify[bot]
cf0765916e
Merge pull request #16340 from alyf-de/refactor-backup-utils
...
fix: backup utils
2022-03-20 08:32:52 +00:00
mergify[bot]
5c709b3750
Merge pull request #16341 from alyf-de/remove-useless-pass
...
refactor: remove useless pass, log error
2022-03-20 08:22:57 +00:00
Himanshu
3bab770bec
Merge pull request #16342 from alyf-de/fix-concat
...
fix: use result of `Array.concat()`
2022-03-20 08:22:14 +00:00
barredterra
9a2a2e7abe
fix: assign result of concat
2022-03-20 03:08:23 +01:00
barredterra
8a4f316ec5
refactor: remove useless pass, log error
2022-03-20 02:35:35 +01:00
barredterra
1d3ec42974
fix: send_email doesn't take arguments
2022-03-20 02:20:27 +01:00
barredterra
4b8efc5ebd
fix: typo in parameter name
2022-03-20 02:19:41 +01:00
barredterra
0d8733c462
refactor: remove unused import
2022-03-20 02:19:07 +01:00
barredterra
687ca6972d
refactor: remove unused fallback
2022-03-20 01:53:30 +01:00
barredterra
1934340a1b
refactor: don't assign variable to itself
2022-03-20 01:46:27 +01:00
Himanshu
fd374150fd
Merge branch 'develop' into fix_parse_email_test
2022-03-19 23:52:36 +00:00
